From a620ec06b0a3dfed9f59e7a85265a4e1caa4177f Mon Sep 17 00:00:00 2001 From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de> Date: Tue, 16 Apr 2013 11:15:04 +0000 Subject: [PATCH] git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11233 9e42b895-fcda-4063-8a3b-11be15eb1bbd --- .../SEAMS_Case_Study/AdaptationPoints.xmi | 89 +++++-------------- 1 file changed, 20 insertions(+), 69 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 ead1313a..b8e4b30b 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,78 +1,29 @@ <?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="2.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="2.0" maxValue="4.0"> + <adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="ContainerTemplateRepo.xmi#1341341"/> </adaptationPoints> - <adaptationPoints - xsi:type="adaptationpoints:ModelEntityConfigurationRange" - id="12312412412" - name="NumberOfAppServerVmInstancesPerPhysicalServer"> - <variationPossibility - xsi:type="adaptationpoints:PropertyRange"> - <minValueConstraint - oclString="self.containedIn.contains->size()>=1" - name="minValueConstraint"/> - <maxValueConstraint - oclString="self.containedIn.contains->size()<=2" - name="maxValueConstraint"/> + <adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="12312412412" name="NumberOfAppServerVmInstancesPerPhysicalServer"> + <variationPossibility xsi:type="adaptationpoints:PropertyRange"> + <minValueConstraint oclString="self.containedIn.contains->size()>=1" name="minValueConstraint"/> + <maxValueConstraint oclString="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="NumberOfMaxAppServers"> - <variationPossibility - xsi:type="adaptationpoints:PropertyRange"> - <minValueConstraint - oclString="self.referringContainers->size() >= 1" - name="minNumberOfAppServersInDataCenter"/> - <maxValueConstraint - oclString="self.referringContainers->size() <= 8" - name="maxNumberOfAppServersInDataCenter"/> + <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"" - 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"/> + <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#12"/> + <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/> </adaptationPoints> </adaptationpoints:AdaptationPointDescriptions> -- GitLab