From 4c0c0fd44a9e769bcbdae418937f5ff3adb305cd Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Mon, 4 Feb 2013 14:05:25 +0000
Subject: [PATCH] adjusted to metamodel changes
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10119 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../test_models/StaRepository.xmi | 48 ++++++++++++-------
1 file changed, 31 insertions(+), 17 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
index 71f135d1..e38dc49c 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
@@ -168,6 +168,9 @@
predecessor="branchStart"
successor="branchStop"
condition="RuntimeEnvironment.allInstances()->size() < 4">
+ <context
+ xsi:type="resourcelandscape:RuntimeEnvironment"
+ href="DistributedDataCenter.xmi#12345-1"/>
<conditionTrueBranch
id="TRUE-AdaptationPlan"
name="TRUE-AdaptationPlan">
@@ -204,60 +207,71 @@
id="99stop"
predecessor="99FalseBranch"/>
</conditionFalseBranch>
- <context
- xsi:type="resourcelandscape:RuntimeEnvironment"
- href="DistributedDataCenter.xmi#12345-1"/>
</steps>
</implementedPlan>
</tactics>
<actions id="2"
- name="myTestIncreaseCpuAction"
- operationType="SCALE_UP">
+ name="myTestIncreaseCpuAction">
<referredAdaptationPoint
xsi:type="adaptationpoints:ModelVariableConfigurationRange"
href="AdaptationPoints.xmi#238746123"/>
+ <adaptationActionOperation
+ adaptationOperationScope="THIS"
+ adaptationOperationDirection="INCREASE"/>
</actions>
<actions id="345242342"
- name="decreaseCpuAction"
- operationType="SCALE_DOWN">
+ name="decreaseCpuAction">
<referredAdaptationPoint
xsi:type="adaptationpoints:ModelVariableConfigurationRange"
href="AdaptationPoints.xmi#238746123"/>
+ <adaptationActionOperation
+ adaptationOperationScope="THIS"
+ adaptationOperationDirection="DECREASE"/>
</actions>
<actions id="41123123"
- name="increaseServers"
- operationType="SCALE_OUT">
+ name="increaseServers">
<referredAdaptationPoint
xsi:type="adaptationpoints:ModelEntityConfigurationRange"
href="AdaptationPoints.xmi#12312412412"/>
+ <adaptationActionOperation
+ adaptationOperationScope="RANDOM"
+ adaptationOperationDirection="INCREASE"/>
</actions>
<actions id="1287127123"
- name="decreaseServers"
- operationType="SCALE_IN">
+ name="decreaseServers">
<referredAdaptationPoint
xsi:type="adaptationpoints:ModelEntityConfigurationRange"
href="AdaptationPoints.xmi#12312412412"/>
+ <adaptationActionOperation
+ adaptationOperationScope="RANDOM"
+ adaptationOperationDirection="DECREASE"/>
</actions>
<actions id="3134124121223r2"
- name="increaseTemplate"
- operationType="SCALE_OUT">
+ name="increaseTemplate">
<referredAdaptationPoint
xsi:type="adaptationpoints:ModelEntityConfigurationRange"
href="AdaptationPoints.xmi#xyz"/>
+ <adaptationActionOperation
+ adaptationOperationScope="ALL"
+ adaptationOperationDirection="INCREASE"/>
</actions>
<actions id="5312fsdad"
- name="decreaseTemplate"
- operationType="SCALE_IN">
+ name="decreaseTemplate">
<referredAdaptationPoint
xsi:type="adaptationpoints:ModelEntityConfigurationRange"
href="AdaptationPoints.xmi#xyz"/>
+ <adaptationActionOperation
+ adaptationOperationScope="ALL"
+ adaptationOperationDirection="DECREASE"/>
</actions>
<actions id="182712"
- name="migrateVMTest"
- operationType="MIGRATE">
+ name="migrateVMTest">
<referredAdaptationPoint
xsi:type="adaptationpoints:ModelEntityConfigurationRange"
href="AdaptationPoints.xmi#123321"/>
+ <adaptationActionOperation
+ adaptationOperationScope="THIS"
+ adaptationOperationDirection="MIGRATE"/>
</actions>
<strategies
id="23423423"
--
GitLab