From 33dea9cb731266c3c0322f7469656467eb3eac27 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Sun, 27 Jan 2013 15:29:58 +0000
Subject: [PATCH] fix branchAction deciding wether to increase servers or cpus
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10008 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../PushPullAdaptationProcess.xmi | 176 ++++--------------
1 file changed, 38 insertions(+), 138 deletions(-)
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 53fe2050..ceb2aa22 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,155 +1,55 @@
<?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 )->forAll(re | re.template.templateConfig.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number <= 4))">
- <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 )->forAll(re | re.template.templateConfig.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number < 4))">
+ <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>
- <context
- xsi:type="resourcelandscape:RuntimeEnvironment"
- href="AcamarCluster.xmi#12"/>
+ <context xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/>
</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"
- operationType="SCALE_UP">
- <referredAdaptationPoint
- xsi:type="adaptationpoints:ModelVariableConfigurationRange"
- href="AdaptationPoints.xmi#238746123"/>
+ <actions id="2" name="increaseVirtualCpu" operationType="SCALE_UP">
+ <referredAdaptationPoint xsi:type="adaptationpoints:ModelVariableConfigurationRange" href="AdaptationPoints.xmi#238746123"/>
</actions>
- <actions id="345242342"
- name="decreaseCpuAction"
- operationType="SCALE_DOWN">
- <referredAdaptationPoint
- xsi:type="adaptationpoints:ModelVariableConfigurationRange"
- href="AdaptationPoints.xmi#238746123"/>
+ <actions id="345242342" name="decreaseCpuAction" operationType="SCALE_DOWN">
+ <referredAdaptationPoint xsi:type="adaptationpoints:ModelVariableConfigurationRange" href="AdaptationPoints.xmi#238746123"/>
</actions>
- <actions id="41123123"
- name="increaseServers"
- operationType="SCALE_OUT">
- <referredAdaptationPoint
- xsi:type="adaptationpoints:ModelEntityConfigurationRange"
- href="AdaptationPoints.xmi#12312412412"/>
+ <actions id="41123123" name="increaseServers" operationType="SCALE_OUT">
+ <referredAdaptationPoint xsi:type="adaptationpoints:ModelEntityConfigurationRange" href="AdaptationPoints.xmi#12312412412"/>
</actions>
- <actions id="1287127123"
- name="decreaseServers"
- operationType="SCALE_IN">
- <referredAdaptationPoint
- xsi:type="adaptationpoints:ModelEntityConfigurationRange"
- href="AdaptationPoints.xmi#12312412412"/>
+ <actions id="1287127123" name="decreaseServers" operationType="SCALE_IN">
+ <referredAdaptationPoint xsi:type="adaptationpoints:ModelEntityConfigurationRange" href="AdaptationPoints.xmi#12312412412"/>
</actions>
- <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"/>
+ <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"/>
+ </tactics>
+ <weightingFunction id="wf1" name="weightedSum">
+ <weightedMetrics id="_TzHMgGVXEeK4L53_AeGtGA"/>
</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