From 46801b38bd86f7ef154c0adf355a70db21c43b3e Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Sun, 27 Jan 2013 15:15:58 +0000
Subject: [PATCH] minor model changes: + name to OCL constraint + refactored
OCL constraint assuring max number of servers
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10007 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../SEAMS_Case_Study/AcamarCluster.xmi | 92 +++++--------------
.../SEAMS_Case_Study/AdaptationPoints.xmi | 90 +++++++++++++-----
2 files changed, 92 insertions(+), 90 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi
index f3eddf6d..6254ddba 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi
@@ -1,82 +1,36 @@
<?xml version="1.0" encoding="ASCII"?>
-<resourcelandscape:DistributedDataCenter
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1"
- id="1" name="KitDataCenters">
- <consistsOf
- id="2"
- name="AtisDataCenter">
- <contains
- xsi:type="resourcelandscape:CompositeHardwareInfrastructure"
- id="3"
- name="AcamarCluster">
- <contains
- xsi:type="resourcelandscape:ComputingInfrastructure"
- id="4"
- name="ClusterNode20">
- <contains
- id="10"
- name="XenServer">
- <contains
- id="12"
- name="AppServerVM1"
- ofClass="OS VM">
- <template
- href="ContainerTemplateRepo.xmi#2"/>
+<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="KitDataCenters">
+ <consistsOf id="2" name="AtisDataCenter">
+ <contains xsi:type="resourcelandscape:CompositeHardwareInfrastructure" id="3" name="AcamarCluster">
+ <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="4" name="ClusterNode20">
+ <contains id="10" name="XenServer">
+ <contains id="12" name="AppServerVM1" ofClass="OS VM">
+ <template href="ContainerTemplateRepo.xmi#2"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#11"/>
+ <template href="ContainerTemplateRepo.xmi#11"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#5"/>
+ <template href="ContainerTemplateRepo.xmi#5"/>
</contains>
- <contains
- xsi:type="resourcelandscape:ComputingInfrastructure"
- id="5"
- name="ClusterNode19">
- <contains
- id="15"
- name="XenServer">
- <template
- href="ContainerTemplateRepo.xmi#11"/>
+ <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="5" name="ClusterNode19">
+ <contains id="15" name="XenServer">
+ <template href="ContainerTemplateRepo.xmi#11"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#5"/>
+ <template href="ContainerTemplateRepo.xmi#5"/>
</contains>
- <contains
- xsi:type="resourcelandscape:ComputingInfrastructure"
- id="6"
- name="ClusterNode18">
- <contains
- id="25"
- name="XenServer">
- <template
- href="ContainerTemplateRepo.xmi#11"/>
+ <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="6" name="ClusterNode18">
+ <contains id="25" name="XenServer">
+ <template href="ContainerTemplateRepo.xmi#11"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#5"/>
+ <template href="ContainerTemplateRepo.xmi#5"/>
</contains>
- <contains
- xsi:type="resourcelandscape:ComputingInfrastructure"
- id="7"
- name="ClusterNode17">
- <contains
- id="14"
- name="XenServer">
- <contains
- id="33"
- name="DatabaseVM"
- ofClass="OS VM">
- <template
- href="ContainerTemplateRepo.xmi#555"/>
+ <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="7" name="ClusterNode17">
+ <contains id="14" name="XenServer">
+ <contains id="33" name="DatabaseVM" ofClass="OS VM">
+ <template href="ContainerTemplateRepo.xmi#555"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#11"/>
+ <template href="ContainerTemplateRepo.xmi#11"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#5"/>
+ <template href="ContainerTemplateRepo.xmi#5"/>
</contains>
</contains>
</consistsOf>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AdaptationPoints.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AdaptationPoints.xmi
index 57c5b375..7f0e794b 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AdaptationPoints.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AdaptationPoints.xmi
@@ -1,30 +1,78 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="SEAMS-AdaptationPoints">
- <adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfCores" minValue="1.0" maxValue="4.0">
- <adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="ContainerTemplateRepo.xmi#1341341"/>
+<adaptationpoints:AdaptationPointDescriptions
+ xmi:version="2.0"
+ xmlns:xmi="http://www.omg.org/XMI"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1"
+ xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1"
+ xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1"
+ xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1"
+ id="1" name="SEAMS-AdaptationPoints">
+ <adaptationPoints
+ xsi:type="adaptationpoints:ModelVariableConfigurationRange"
+ id="238746123"
+ name="AmountOfCores"
+ minValue="1.0"
+ maxValue="4.0">
+ <adaptableEntity
+ xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits"
+ href="ContainerTemplateRepo.xmi#1341341"/>
</adaptationPoints>
- <adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="12312412412" name="NumberOfAppServerVmInstances">
- <variationPossibility xsi:type="adaptationpoints:PropertyRange">
- <minValueConstraint oclString="self.containedIn.contains -> select( r
 | r.template = self.template)->size() >= 1"/>
- <maxValueConstraint oclString="self.containedIn.contains -> select( r
 | r.template = self.template)->size() <= 4"/>
+ <adaptationPoints
+ xsi:type="adaptationpoints:ModelEntityConfigurationRange"
+ id="12312412412"
+ name="NumberOfAppServerVmInstancesPerPhysicalServer">
+ <variationPossibility
+ xsi:type="adaptationpoints:PropertyRange">
+ <minValueConstraint
+ oclString="RuntimeEnvironment.allInstances()->forAll(self.containedIn.contains->size()>=1)"
+ name="minValueConstraint"/>
+ <maxValueConstraint
+ oclString="RuntimeEnvironment.allInstances()->forAll(self.containedIn.contains->size()<=2)"
+ name="maxValueConstraint"/>
</variationPossibility>
- <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/>
+ <adaptableEntity
+ xsi:type="resourcelandscape:RuntimeEnvironment"
+ href="AcamarCluster.xmi#12"/>
</adaptationPoints>
- <adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="xyz" name="NumberOfAppServerTemplateInstances">
- <variationPossibility xsi:type="adaptationpoints:PropertyRange">
- <minValueConstraint oclString="self.referringContainers->size() >= 1"/>
- <maxValueConstraint oclString="self.referringContainers->size() <= 10"/>
+ <adaptationPoints
+ xsi:type="adaptationpoints:ModelEntityConfigurationRange"
+ id="xyz"
+ name="NumberOfMaxAppServers">
+ <variationPossibility
+ xsi:type="adaptationpoints:PropertyRange">
+ <minValueConstraint
+ oclString="self.referringContainers->size() >= 1"
+ name="minNumberOfAppServersInDataCenter"/>
+ <maxValueConstraint
+ oclString="self.referringContainers->size() <= 8"
+ name="maxNumberOfAppServersInDataCenter"/>
</variationPossibility>
- <adaptableEntity xsi:type="containerrepository:ContainerTemplate" href="ContainerTemplateRepo.xmi#2"/>
+ <adaptableEntity
+ xsi:type="containerrepository:ContainerTemplate"
+ href="ContainerTemplateRepo.xmi#2"/>
</adaptationPoints>
- <adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="123321" name="VmMigration">
- <variationPossibility xsi:type="adaptationpoints:SetOfConfigurations">
- <valueConstraint oclString=""Specify a fancy OCL constraint here""/>
- <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="AcamarCluster.xmi#4"/>
- <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="AcamarCluster.xmi#5"/>
- <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="AcamarCluster.xmi#6"/>
- <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="AcamarCluster.xmi#7"/>
+ <adaptationPoints
+ xsi:type="adaptationpoints:ModelEntityConfigurationRange"
+ id="123321"
+ name="VmMigration">
+ <variationPossibility
+ xsi:type="adaptationpoints:SetOfConfigurations">
+ <valueConstraint
+ oclString=""Specify a fancy OCL constraint here""
+ name="migrationTargetConstraint"/>
+ <variants
+ xsi:type="resourcelandscape:ComputingInfrastructure"
+ href="AcamarCluster.xmi#4"/>
+ <variants
+ xsi:type="resourcelandscape:ComputingInfrastructure"
+ href="AcamarCluster.xmi#5"/>
+ <variants
+ xsi:type="resourcelandscape:ComputingInfrastructure"
+ href="AcamarCluster.xmi#6"/>
</variationPossibility>
- <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#13"/>
+ <adaptableEntity
+ xsi:type="resourcelandscape:RuntimeEnvironment"
+ href="AcamarCluster.xmi#12"/>
</adaptationPoints>
</adaptationpoints:AdaptationPointDescriptions>
--
GitLab