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 d886b86eade95a231a6a45a180611977ec3e32f3..6254ddba3f7696d052a93dd7fb67244bfa43c59b 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,23 +1,10 @@ <?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:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="KitDataCenters"> +<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"> - <configSpec xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer"> - <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0"> - <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="4"/> - </processingResourceSpecifications> - </configSpec> - <template href="ContainerTemplateRepo.xmi#2"/> - </contains> - <contains id="_YMEnRIAmEeKl7vO96mU5Yg" name="AppServerVM1-Copy" ofClass="OS VM"> - <configSpec xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer"> - <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0"> - <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="4"/> - </processingResourceSpecifications> - </configSpec> <template href="ContainerTemplateRepo.xmi#2"/> </contains> <template href="ContainerTemplateRepo.xmi#11"/> @@ -41,14 +28,6 @@ <contains id="33" name="DatabaseVM" ofClass="OS VM"> <template href="ContainerTemplateRepo.xmi#555"/> </contains> - <contains id="_YOH1tIAmEeKl7vO96mU5Yg" name="AppServerVM1-Copy" ofClass="OS VM"> - <configSpec xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer"> - <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0"> - <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="3"/> - </processingResourceSpecifications> - </configSpec> - <template href="ContainerTemplateRepo.xmi#2"/> - </contains> <template href="ContainerTemplateRepo.xmi#11"/> </contains> <template href="ContainerTemplateRepo.xmi#5"/> diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi index 4767509a54641a364c1b08d53acbd7f2b5791872..b8771b32c1e0af9cacfe811ef25e851252a989b7 100644 --- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi +++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi @@ -7,8 +7,6 @@ </processingResourceSpecifications> </templateConfig> <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/> - <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#_YMEnRIAmEeKl7vO96mU5Yg"/> - <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#_YOH1tIAmEeKl7vO96mU5Yg"/> </templates> <templates id="555" name="DatabaseVmTemplate"> <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="1231231231" name="CpusDatabase">