From 6ed52ad800bc1c1cb8cc59fbbbf86995a545c178 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 5 Feb 2013 16:44:01 +0000
Subject: [PATCH] git-svn-id:
https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10169
9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../model/util/DmmModelChangerTest.java | 9 +-
.../SEAMS_Case_Study/AcamarCluster.xmi | 15 +-
.../SEAMS_Case_Study/AdaptationPoints.xmi | 89 ++------
.../ContainerTemplateRepo.xmi | 86 ++-----
.../PerformanceDataRepositoryDummy.xmi | 128 ++---------
.../PushPullAdaptationProcess.xmi | 210 ++++--------------
6 files changed, 126 insertions(+), 411 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChangerTest.java b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChangerTest.java
index 984fc5da..26866444 100644
--- a/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChangerTest.java
+++ b/edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChangerTest.java
@@ -4,6 +4,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
+import org.eclipse.emf.ecore.util.EcoreUtil;
import org.junit.Before;
import org.junit.Test;
@@ -21,7 +22,6 @@ import edu.kit.ipd.descartes.mm.resourceconfiguration.ProcessingResourceSpecific
import edu.kit.ipd.descartes.mm.resourceconfiguration.ResourceconfigurationFactory;
import edu.kit.ipd.descartes.mm.resourcelandscape.Container;
import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapeFactory;
-import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapePackage;
import edu.kit.ipd.descartes.mm.resourcelandscape.RuntimeEnvironment;
public class DmmModelChangerTest extends AbstractTest {
@@ -51,9 +51,9 @@ public class DmmModelChangerTest extends AbstractTest {
template = ContainerrepositoryFactory.eINSTANCE.createContainerTemplate();
original = ResourcelandscapeFactory.eINSTANCE.createRuntimeEnvironment();
adaptableNumberOfCores = ResourceconfigurationFactory.eINSTANCE.createNumberOfParallelProcessingUnits();
- ProcessingResourceSpecification procSpec = ResourceconfigurationFactory.eINSTANCE.createProcessingResourceSpecification();
point = AdaptationpointsFactory.eINSTANCE.createModelVariableConfigurationRange();
spec = ResourceconfigurationFactory.eINSTANCE.createActiveResourceSpecification();
+ ProcessingResourceSpecification procSpec = ResourceconfigurationFactory.eINSTANCE.createProcessingResourceSpecification();
adaptableNumberOfCores.setName(NOC_NAME);
adaptableNumberOfCores.setId(NOC_ID);
@@ -133,13 +133,15 @@ public class DmmModelChangerTest extends AbstractTest {
@Test
public void testScaleOutRuntimeEnvironmentInstance() {
+ original.setTemplate(template);
RuntimeEnvironment copy = DmmModelChanger.scaleOutRuntimeEnvironmentInstance(original);
assertFalse(original.getId().equals(copy.getId()));
assertFalse(original.getName().equals(copy.getName()));
assertEquals(original.getName() + DmmModelChanger.COPY_MARK, copy.getName());
assertEquals(original.getTemplate(), copy.getTemplate());
- assertTrue(copy.getConfigSpec().isEmpty());
+
+ assertTrue(EcoreUtil.equals(original.getTemplate().getTemplateConfig(), copy.getConfigSpec()));
assertTrue(original.getTemplate().getReferringContainers().contains(copy));
@@ -147,6 +149,7 @@ public class DmmModelChangerTest extends AbstractTest {
assertEquals(original, parent.getContains().get(0));
assertEquals(copy, parent.getContains().get(1));
+
}
@Test(expected=OperationNotPerformedException.class)
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 6254ddba..55e7d3f9 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,10 +1,23 @@
<?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" parentResourceSpecification="3xyzActiveResourceTemplate32">
+ <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="4"/>
+ </processingResourceSpecifications>
+ </configSpec>
+ <template href="ContainerTemplateRepo.xmi#2"/>
+ </contains>
+ <contains id="_Un_U5G-xEeKxVq9QW7LJRA" 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" parentResourceSpecification="3xyzActiveResourceTemplate32">
+ <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="3"/>
+ </processingResourceSpecifications>
+ </configSpec>
<template href="ContainerTemplateRepo.xmi#2"/>
</contains>
<template href="ContainerTemplateRepo.xmi#11"/>
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 7f0e794b..32ae49f6 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="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="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"/>
+ <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="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>
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 27c3889d..8bdbf432 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
@@ -1,81 +1,29 @@
<?xml version="1.0" encoding="ASCII"?>
-<containerrepository:ContainerRepository
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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="AcamarClusterContainerTemplates">
- <templates
- id="2"
- name="AppServerVmTemplate">
- <templateConfig
- xsi:type="resourceconfiguration:ActiveResourceSpecification"
- id="3xyzActiveResourceTemplate32"
- name="CpusAppServer">
- <processingResourceSpecifications
- id="235234"
- name="CPU-Spec"
- schedulingPolicy="PROCESSOR_SHARING"
- processingRate="1000.0"
- parentResourceSpecification="3xyzActiveResourceTemplate32">
- <nrOfParProcUnits
- id="1341341"
- name="NumberOfAppServerVmCpus"
- number="2"/>
+<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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="AcamarClusterContainerTemplates">
+ <templates id="2" name="AppServerVmTemplate">
+ <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer">
+ <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="3xyzActiveResourceTemplate32">
+ <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="2"/>
</processingResourceSpecifications>
</templateConfig>
- <referringContainers
- xsi:type="resourcelandscape:RuntimeEnvironment"
- href="AcamarCluster.xmi#12"/>
+ <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/>
+ <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#_Un_U5G-xEeKxVq9QW7LJRA"/>
</templates>
- <templates
- id="555"
- name="DatabaseVmTemplate">
- <templateConfig
- xsi:type="resourceconfiguration:ActiveResourceSpecification"
- id="1231231231"
- name="CpusDatabase">
- <processingResourceSpecifications
- id="51241132"
- name="CPU-Spec"
- schedulingPolicy="PROCESSOR_SHARING"
- processingRate="1000.0"
- parentResourceSpecification="1231231231">
- <nrOfParProcUnits
- id="33"
- name="DatabaseVirtualCpus"
- number="8"/>
+ <templates id="555" name="DatabaseVmTemplate">
+ <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="1231231231" name="CpusDatabase">
+ <processingResourceSpecifications id="51241132" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="1231231231">
+ <nrOfParProcUnits id="33" name="DatabaseVirtualCpus" number="8"/>
</processingResourceSpecifications>
</templateConfig>
</templates>
- <templates
- id="5"
- name="ClusterNodeTemplate">
- <templateConfig
- xsi:type="resourceconfiguration:ActiveResourceSpecification"
- id="123123"
- name="CpusClusterNode">
- <processingResourceSpecifications
- id="123sf"
- name="AmdOpteronCpuSpec"
- schedulingPolicy="PROCESSOR_SHARING"
- processingRate="1000.0"
- parentResourceSpecification="123123">
- <nrOfParProcUnits
- id="23423sad"
- name="AmdOpteron"
- number="8"/>
+ <templates id="5" name="ClusterNodeTemplate">
+ <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="123123" name="CpusClusterNode">
+ <processingResourceSpecifications id="123sf" name="AmdOpteronCpuSpec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="123123">
+ <nrOfParProcUnits id="23423sad" name="AmdOpteron" number="8"/>
</processingResourceSpecifications>
</templateConfig>
</templates>
- <templates
- id="11"
- name="XenServerTemplate">
- <templateConfig
- xsi:type="resourceconfiguration:CustomConfigurationSpecification"
- id="12"
- name="XenServerConfiguration"/>
+ <templates id="11" name="XenServerTemplate">
+ <templateConfig xsi:type="resourceconfiguration:CustomConfigurationSpecification" id="12" name="XenServerConfiguration"/>
</templates>
</containerrepository:ContainerRepository>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PerformanceDataRepositoryDummy.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PerformanceDataRepositoryDummy.xmi
index 27a8a0a9..90f77264 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PerformanceDataRepositoryDummy.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PerformanceDataRepositoryDummy.xmi
@@ -1,111 +1,29 @@
<?xml version="1.0" encoding="ASCII"?>
-<perfdatarepo:PerformanceDataRepository
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1"
- id="1" name="MeasuredPerformanceDataRepository">
- <resultHistory
- id="123"
- name="ResultTactic1-1"
- timestamp="2012-12-12T00:00:00.000+0100">
- <metricValues
- id="224123"
- name="Util"
- metricType="2"
- value="0.4"/>
- <metricValues
- id="213123"
- name="RespTimeGold"
- metricType="3"
- value="150.0"/>
- <metricValues
- id="124124123"
- name="RespTimeSilver"
- metricType="4"
- value="340.0"/>
+<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" id="1" name="MeasuredPerformanceDataRepository">
+ <resultHistory id="123" name="ResultTactic1-1" timestamp="2012-12-12T00:00:00.000+0100">
+ <metricValues id="224123" name="Util" metricType="2" value="0.4"/>
+ <metricValues id="213123" name="RespTimeGold" metricType="3" value="150.0"/>
+ <metricValues id="124124123" name="RespTimeSilver" metricType="4" value="340.0"/>
</resultHistory>
- <resultHistory
- id="assgddfs"
- name="ResultTactic1-2"
- timestamp="2012-12-12T01:00:00.000+0100">
- <metricValues
- id="2241231"
- name="Util"
- metricType="2"
- value="0.6"/>
- <metricValues
- id="2131232"
- name="RespTimeGold"
- metricType="3"
- value="120.0"/>
- <metricValues
- id="1241241233"
- name="RespTimeSilver"
- metricType="4"
- value="300.0"/>
+ <resultHistory id="assgddfs" name="ResultTactic1-2" timestamp="2012-12-12T01:00:00.000+0100">
+ <metricValues id="2241231" name="Util" metricType="2" value="0.6"/>
+ <metricValues id="2131232" name="RespTimeGold" metricType="3" value="120.0"/>
+ <metricValues id="1241241233" name="RespTimeSilver" metricType="4" value="300.0"/>
</resultHistory>
- <resultHistory
- id="234ersdf"
- name="ResultTactic2-1"
- timestamp="2012-12-12T02:00:00.000+0100">
- <metricValues
- id="12343as"
- name="Util"
- metricType="2"
- value="0.7"/>
- <metricValues
- id="sdfsdvc"
- name="RespTimeGold"
- metricType="3"
- value="100.0"/>
- <metricValues
- id="63412412"
- name="RespTimeSilver"
- metricType="4"
- value="280.0"/>
+ <resultHistory id="234ersdf" name="ResultTactic2-1" timestamp="2012-12-12T02:00:00.000+0100">
+ <metricValues id="12343as" name="Util" metricType="2" value="0.7"/>
+ <metricValues id="sdfsdvc" name="RespTimeGold" metricType="3" value="100.0"/>
+ <metricValues id="63412412" name="RespTimeSilver" metricType="4" value="280.0"/>
</resultHistory>
- <resultHistory
- id="_l-JN8WiWEeKyvugiUTWsDg"
- name="ResultTactic2-2"
- timestamp="2012-12-12T03:00:00.000+0100">
- <metricValues
- id="_uSiGAGiWEeKyvugiUTWsDg"
- name="Util"
- metricType="2"
- value="0.8"/>
- <metricValues
- id="_vzap8GiWEeKyvugiUTWsDg"
- name="RespTimeGold"
- metricType="3"
- value="80.0"/>
- <metricValues
- id="_wmMKsGiWEeKyvugiUTWsDg"
- name="RespTimeSilver"
- metricType="4"
- value="260.0"/>
+ <resultHistory id="_l-JN8WiWEeKyvugiUTWsDg" name="ResultTactic2-2" timestamp="2012-12-12T03:00:00.000+0100">
+ <metricValues id="_uSiGAGiWEeKyvugiUTWsDg" name="Util" metricType="2" value="0.8"/>
+ <metricValues id="_vzap8GiWEeKyvugiUTWsDg" name="RespTimeGold" metricType="3" value="80.0"/>
+ <metricValues id="_wmMKsGiWEeKyvugiUTWsDg" name="RespTimeSilver" metricType="4" value="260.0"/>
</resultHistory>
- <metricTypes
- id="2"
- name="Vm1Utilization"/>
- <metricTypes
- id="3"
- name="CV_EJB_AvgResponseTime"/>
- <metricTypes
- id="4"
- name="Purchase_AvgResponseTime"/>
- <impactHistory
- id="_dJhhM2iXEeKyvugiUTWsDg"
- name="Tactic3-AllImproved"
- before="234ersdf"
- after="_l-JN8WiWEeKyvugiUTWsDg"/>
- <impactHistory
- id="3df1q3eq"
- name="Tactic1-AllImproved"
- before="123"
- after="assgddfs"/>
- <impactHistory
- id="232341241"
- name="Tactic2-AllImproved"
- before="assgddfs"
- after="234ersdf"/>
+ <metricTypes id="2" name="Vm1Utilization"/>
+ <metricTypes id="3" name="CV_EJB_AvgResponseTime"/>
+ <metricTypes id="4" name="Purchase_AvgResponseTime"/>
+ <impactHistory id="_dJhhM2iXEeKyvugiUTWsDg" name="Tactic3-AllImproved" before="234ersdf" after="_l-JN8WiWEeKyvugiUTWsDg"/>
+ <impactHistory id="3df1q3eq" name="Tactic1-AllImproved" before="123" after="assgddfs"/>
+ <impactHistory id="232341241" name="Tactic2-AllImproved" before="assgddfs" after="234ersdf"/>
</perfdatarepo:PerformanceDataRepository>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi
index eb59e18a..19cf4d23 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi
@@ -1,185 +1,67 @@
<?xml version="1.0" encoding="ASCII"?>
-<adaptation:AdaptationProcess
- xmi:version="2.0"
- xmlns:xmi="http://www.omg.org/XMI"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1"
- xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1"
- xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1"
- id="q" name="MyTestStaRepo">
- <tactics id="2341234"
- name="increaseResources">
- <implementedPlan
- id="qweqweqwe"
- name="IncreaseResourcesAdaptationPlan">
- <steps
- xsi:type="adaptation:StartAction"
- id="2342623434"
- successor="33eadsea"/>
- <steps
- xsi:type="adaptation:BranchAction"
- id="33eadsea"
- predecessor="2342623434"
- successor="6423423423"
- condition="RuntimeEnvironment.allInstances()->select( re | re.template = self.template )->exists(re | re.configSpec.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number < 4)) and RuntimeEnvironment.allInstances()->select( re | re.template = self.template )->forAll(re | re.template.templateConfig.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number < 4))">
- <context
- xsi:type="resourcelandscape:RuntimeEnvironment"
- href="AcamarCluster.xmi#12"/>
- <conditionTrueBranch
- id="efasfasd"
- name="increaseCores">
- <steps
- xsi:type="adaptation:ActionReference"
- id="35634534"
- predecessor="321321"
- successor="345fdas"
- refersTo="2"/>
- <steps
- xsi:type="adaptation:StartAction"
- id="321321"
- successor="35634534"/>
- <steps
- xsi:type="adaptation:StopAction"
- id="345fdas"
- predecessor="35634534"/>
+<adaptation:AdaptationProcess xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptation="http://www.descartes-research.net/metamodel/adaptation/0.1" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="q" name="MyTestStaRepo">
+ <tactics id="2341234" name="increaseResources">
+ <implementedPlan id="qweqweqwe" name="IncreaseResourcesAdaptationPlan">
+ <steps xsi:type="adaptation:StartAction" id="2342623434" successor="33eadsea"/>
+ <steps xsi:type="adaptation:BranchAction" id="33eadsea" predecessor="2342623434" successor="6423423423" condition="RuntimeEnvironment.allInstances()->select( re | re.template = self.template )->exists(re | re.configSpec.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number < 4)) and RuntimeEnvironment.allInstances()->select( re | re.template = self.template )->forAll(re | re.template.templateConfig.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number < 4))">
+ <context xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/>
+ <conditionTrueBranch id="efasfasd" name="increaseCores">
+ <steps xsi:type="adaptation:ActionReference" id="35634534" predecessor="321321" successor="345fdas" refersTo="2"/>
+ <steps xsi:type="adaptation:StartAction" id="321321" successor="35634534"/>
+ <steps xsi:type="adaptation:StopAction" id="345fdas" predecessor="35634534"/>
</conditionTrueBranch>
- <conditionFalseBranch
- id="adsgsadas"
- name="increaseServers">
- <steps
- xsi:type="adaptation:ActionReference"
- id="453412341241"
- predecessor="e123134"
- successor="e63412"
- refersTo="41123123"/>
- <steps
- xsi:type="adaptation:StartAction"
- id="e123134"
- successor="453412341241"/>
- <steps
- xsi:type="adaptation:StopAction"
- id="e63412"
- predecessor="453412341241"/>
+ <conditionFalseBranch id="adsgsadas" name="increaseServers">
+ <steps xsi:type="adaptation:ActionReference" id="453412341241" predecessor="e123134" successor="e63412" refersTo="41123123"/>
+ <steps xsi:type="adaptation:StartAction" id="e123134" successor="453412341241"/>
+ <steps xsi:type="adaptation:StopAction" id="e63412" predecessor="453412341241"/>
</conditionFalseBranch>
</steps>
- <steps
- xsi:type="adaptation:StopAction"
- id="6423423423"
- predecessor="33eadsea"/>
+ <steps xsi:type="adaptation:StopAction" id="6423423423" predecessor="33eadsea"/>
</implementedPlan>
</tactics>
- <tactics id="123123"
- name="decreaseResources">
- <implementedPlan
- id="123123123"
- name="DecreaseResourcesAdaptationPlan">
- <steps
- xsi:type="adaptation:StartAction"
- id="321"
- successor="46233214"/>
- <steps
- xsi:type="adaptation:ActionReference"
- id="46233214"
- predecessor="321"
- successor="ABC"
- refersTo="345242342"/>
- <steps
- xsi:type="adaptation:ActionReference"
- id="ABC"
- predecessor="46233214"
- successor="432"
- refersTo="1287127123"/>
- <steps
- xsi:type="adaptation:StopAction"
- id="432"
- predecessor="ABC"/>
+ <tactics id="123123" name="decreaseResources">
+ <implementedPlan id="123123123" name="DecreaseResourcesAdaptationPlan">
+ <steps xsi:type="adaptation:StartAction" id="321" successor="46233214"/>
+ <steps xsi:type="adaptation:ActionReference" id="46233214" predecessor="321" successor="ABC" refersTo="345242342"/>
+ <steps xsi:type="adaptation:ActionReference" id="ABC" predecessor="46233214" successor="432" refersTo="1287127123"/>
+ <steps xsi:type="adaptation:StopAction" id="432" predecessor="ABC"/>
</implementedPlan>
</tactics>
- <actions id="2"
- name="increaseVirtualCpu">
- <referredAdaptationPoint
- xsi:type="adaptationpoints:ModelVariableConfigurationRange"
- href="AdaptationPoints.xmi#238746123"/>
- <adaptationActionOperation
- adaptationOperationScope="RANDOM"
- adaptationOperationDirection="INCREASE"/>
+ <actions id="2" name="increaseVirtualCpu">
+ <referredAdaptationPoint xsi:type="adaptationpoints:ModelVariableConfigurationRange" href="AdaptationPoints.xmi#238746123"/>
+ <adaptationActionOperation adaptationOperationScope="RANDOM" adaptationOperationDirection="INCREASE"/>
</actions>
- <actions id="345242342"
- name="decreaseVirtualCpu">
- <referredAdaptationPoint
- xsi:type="adaptationpoints:ModelVariableConfigurationRange"
- href="AdaptationPoints.xmi#238746123"/>
- <adaptationActionOperation
- adaptationOperationScope="RANDOM"
- adaptationOperationDirection="DECREASE"/>
+ <actions id="345242342" name="decreaseVirtualCpu">
+ <referredAdaptationPoint xsi:type="adaptationpoints:ModelVariableConfigurationRange" href="AdaptationPoints.xmi#238746123"/>
+ <adaptationActionOperation adaptationOperationScope="RANDOM" adaptationOperationDirection="DECREASE"/>
</actions>
- <actions id="41123123"
- name="increaseServers">
- <referredAdaptationPoint
- xsi:type="adaptationpoints:ModelEntityConfigurationRange"
- href="AdaptationPoints.xmi#12312412412"/>
- <adaptationActionOperation
- adaptationOperationScope="RANDOM"
- adaptationOperationDirection="INCREASE"/>
+ <actions id="41123123" name="increaseServers">
+ <referredAdaptationPoint xsi:type="adaptationpoints:ModelEntityConfigurationRange" href="AdaptationPoints.xmi#12312412412"/>
+ <adaptationActionOperation adaptationOperationScope="RANDOM" adaptationOperationDirection="INCREASE"/>
</actions>
- <actions id="1287127123"
- name="decreaseServers">
- <referredAdaptationPoint
- xsi:type="adaptationpoints:ModelEntityConfigurationRange"
- href="AdaptationPoints.xmi#12312412412"/>
- <adaptationActionOperation
- adaptationOperationScope="RANDOM"
- adaptationOperationDirection="DECREASE"/>
+ <actions id="1287127123" name="decreaseServers">
+ <referredAdaptationPoint xsi:type="adaptationpoints:ModelEntityConfigurationRange" href="AdaptationPoints.xmi#12312412412"/>
+ <adaptationActionOperation adaptationOperationScope="RANDOM" adaptationOperationDirection="DECREASE"/>
</actions>
- <strategies
- id="s1"
- name="PUSH"
- objective="o1">
- <triggeringEvents
- id="12345"
- name="SlaViolatedEvent"/>
- <tactics
- id="wt1"
- name="weightedTacticIncreaseResources"
- usedTactic="2341234"
- currentWeight="NaN"
- defaultWeight="100.0">
- <lastImpact
- href="PerformanceDataRepositoryDummy.xmi#232341241"/>
+ <strategies id="s1" name="PUSH" objective="o1">
+ <triggeringEvents id="12345" name="SlaViolatedEvent"/>
+ <tactics id="wt1" name="weightedTacticIncreaseResources" usedTactic="2341234" currentWeight="100.2" defaultWeight="100.0">
+ <lastImpact href="PerformanceDataRepositoryDummy.xmi#3df1q3eq"/>
</tactics>
- <weightingFunction
- id="wf1"
- name="weightedSum">
- <weightedMetrics
- id="_TzHMgGVXEeK4L53_AeGtGA"
- name="utilizationMetricWeight"
- weight="1.0">
- <metricType
- href="PerformanceDataRepositoryDummy.xmi#2"/>
+ <weightingFunction id="wf1" name="weightedSum">
+ <weightedMetrics id="_TzHMgGVXEeK4L53_AeGtGA" name="utilizationMetricWeight" weight="1.0">
+ <metricType href="PerformanceDataRepositoryDummy.xmi#2"/>
</weightedMetrics>
- <weightedMetrics
- id="_QKf6YGllEeKYrN0mFHpJCQ"
- name="goldCustomerResponseTimeWeight"
- weight="-2.0">
- <metricType
- href="PerformanceDataRepositoryDummy.xmi#3"/>
+ <weightedMetrics id="_QKf6YGllEeKYrN0mFHpJCQ" name="goldCustomerResponseTimeWeight" weight="-2.0">
+ <metricType href="PerformanceDataRepositoryDummy.xmi#3"/>
</weightedMetrics>
- <weightedMetrics
- id="_UBs1cGllEeKYrN0mFHpJCQ"
- name="silverCustomerResponseTimeWeight"
- weight="-1.0">
- <metricType
- href="PerformanceDataRepositoryDummy.xmi#4"/>
+ <weightedMetrics id="_UBs1cGllEeKYrN0mFHpJCQ" name="silverCustomerResponseTimeWeight" weight="-1.0">
+ <metricType href="PerformanceDataRepositoryDummy.xmi#4"/>
</weightedMetrics>
</weightingFunction>
</strategies>
<goal description="Maintain the SLAs of all serivces while using resources as efficiently as possible">
- <objectives
- id="o1"
- name="maintainSLA"
- specification=""/>
- <objectives
- id="o2"
- name="resourceEfficiency"/>
+ <objectives id="o1" name="maintainSLA" specification=""/>
+ <objectives id="o2" name="resourceEfficiency"/>
</goal>
</adaptation:AdaptationProcess>
--
GitLab