From 72a8369094c2701baf802f49a66e0616a22d7a20 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Thu, 17 Jan 2013 08:59:57 +0000
Subject: [PATCH] variants of SetOfConfigurations now points only to
core::Entity to restrict possibilities
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9777 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../SEAMS_Case_Study/AdaptationPoints.xmi | 89 ++++++++++++++-----
1 file changed, 68 insertions(+), 21 deletions(-)
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 558a074c..699fab43 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,77 @@
<?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" xsi:schemaLocation="http://www.descartes-research.net/metamodel/adaptationpoints/0.1 ../../../edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore http://www.descartes-research.net/metamodel/containerrepository/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/containerrepository.ecore http://www.descartes-research.net/metamodel/resourceconfiguration/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourceconfiguration.ecore http://www.descartes-research.net/metamodel/resourcelandscape/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore" 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"
+ xsi:schemaLocation="http://www.descartes-research.net/metamodel/adaptationpoints/0.1 ../../../edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore http://www.descartes-research.net/metamodel/containerrepository/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/containerrepository.ecore http://www.descartes-research.net/metamodel/resourceconfiguration/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourceconfiguration.ecore http://www.descartes-research.net/metamodel/resourcelandscape/0.1 ../../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore"
+ 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="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"/>
</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="NumberOfAppServerTemplateInstances">
+ <variationPossibility
+ xsi:type="adaptationpoints:PropertyRange">
+ <minValueConstraint
+ oclString="self.referringContainers->size() >= 1"/>
+ <maxValueConstraint
+ oclString="self.referringContainers->size() <= 10"/>
</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 href="AcamarCluster.xmi#4"/>
- <variants href="AcamarCluster.xmi#5"/>
- <variants href="AcamarCluster.xmi#6"/>
- <variants 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""/>
+ <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"/>
</variationPossibility>
- <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#13"/>
+ <adaptableEntity
+ xsi:type="resourcelandscape:RuntimeEnvironment"
+ href="AcamarCluster.xmi#13"/>
</adaptationPoints>
</adaptationpoints:AdaptationPointDescriptions>
--
GitLab