diff --git a/Examples/SEAMS_Case_Study/acamarCluster.resourcelandscape b/Examples/SEAMS_Case_Study/acamarCluster.resourcelandscape index 1db12e90805ac6361cd1fcbfa43ce7733ee9be98..1127c95f32b3f0763aa9f5b8dd22eefcbb9c492f 100644 --- a/Examples/SEAMS_Case_Study/acamarCluster.resourcelandscape +++ b/Examples/SEAMS_Case_Study/acamarCluster.resourcelandscape @@ -1,10 +1,15 @@ <?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"> +<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"> <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="default.containerrepository#2"/> </contains> <template href="default.containerrepository#11"/> diff --git a/Examples/SEAMS_Case_Study/default.adaptationpoints b/Examples/SEAMS_Case_Study/default.adaptationpoints index d88120f24561483dd1b82c2a428415d9914e16ed..f7a8ba086ff8f0201432b43e25cab2fe9729b3f8 100644 --- a/Examples/SEAMS_Case_Study/default.adaptationpoints +++ b/Examples/SEAMS_Case_Study/default.adaptationpoints @@ -8,6 +8,22 @@ <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.resourcelandscape#12"/> + <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="acamarcluster.resourcelandscape#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"/> + </variationPossibility> + <adaptableEntity xsi:type="containerrepository:ContainerTemplate" href="default.containerrepository#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.resourcelandscape#4"/> + <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="acamarcluster.resourcelandscape#5"/> + <variants xsi:type="resourcelandscape:ComputingInfrastructure" href="acamarcluster.resourcelandscape#6"/> + </variationPossibility> + <adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="acamarcluster.resourcelandscape#12"/> </adaptationPoints> </adaptationpoints:AdaptationPointDescriptions> diff --git a/Examples/SEAMS_Case_Study/default.containerrepository b/Examples/SEAMS_Case_Study/default.containerrepository index 0a5139f8492ed7c97e6834d763176991c6032f57..a55242158daf8fe1f6f0d3898b1cc5d757ce380d 100644 --- a/Examples/SEAMS_Case_Study/default.containerrepository +++ b/Examples/SEAMS_Case_Study/default.containerrepository @@ -7,7 +7,7 @@ <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="2"/> </processingResourceSpecifications> </templateConfig> - <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="acamarCluster.resourcelandscape#12"/> + <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="acamarcluster.resourcelandscape#12"/> </templates> <templates id="555" name="DatabaseVmTemplate"> <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="1231231231" name="CpusDatabase">