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 19cf4d23640992cc249aa4a7bea61aefd6d26523..801490536ed07256d52f4515ca7701c6e7e5c563 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,67 +1,221 @@
<?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="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"/>
+ <strategies
+ id="s1"
+ name="PUSH"
+ objective="o1">
+ <triggeringEvents
+ id="12345"
+ name="SlaViolatedEvent"/>
+ <tactics
+ id="wt1"
+ name="weightedTacticIncreaseResources"
+ usedTactic="2341234"
+ currentWeight="100.0"
+ defaultWeight="100.0"/>
+ <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>
+ <strategies
+ id="_Cg--ZYAnEeKW2vVcg5ekRw"
+ name="PULL"
+ objective="o2">
+ <triggeringEvents
+ id="_H_MTgIAnEeKW2vVcg5ekRw"
+ name="scheduledMaintenance"/>
+ <tactics
+ id="_Tk5LUYAnEeKW2vVcg5ekRw"
+ name="weightedTacticDecreaseResources"
+ usedTactic="123123"
+ currentWeight="100.0"
+ defaultWeight="100.0"/>
+ <weightingFunction
+ id="wf1"
+ name="weightedSum">
+ <weightedMetrics
+ id="_TzHMgGVXEeK4L53_AeGtGA1"
+ name="utilizationMetricWeight"
+ weight="1.0">
+ <metricType
+ href="PerformanceDataRepositoryDummy.xmi#2"/>
+ </weightedMetrics>
+ <weightedMetrics
+ id="_QKf6YGllEeKYrN0mFHpJCQ1"
+ name="goldCustomerResponseTimeWeight"
+ weight="-2.0">
+ <metricType
+ href="PerformanceDataRepositoryDummy.xmi#3"/>
+ </weightedMetrics>
+ <weightedMetrics
+ id="_UBs1cGllEeKYrN0mFHpJCQ1"
+ 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>