adjusting to SOCA article

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11232 9e42b895-fcda-4063-8a3b-11be15eb1bbd

edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/PushPullAdaptationProcess.xmi

@@ -6,7 +6,8 @@
     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">
+    id="_07SqMKaFEeKsaqdh-1smGw"
+    name="PushPullAdaptationProcess">
   <tactics id="2341234"
       name="increaseResources">
     <implementedPlan
@@ -129,29 +130,8 @@
           predecessor="branchDecrease"/>
     </implementedPlan>
   </tactics>
-  <tactics id="_aGL2MIC4EeKnieBrE9C24w"
-      name="TEST-increaseVCPUsOnly">
-    <implementedPlan
-        id="_dQICoIC4EeKnieBrE9C24w"
-        name="increaseVCPUsOnly">
-      <steps
-          xsi:type="adaptation:StartAction"
-          id="_esR3kIC4EeKnieBrE9C24w"
-          successor="_fawHJIC4EeKnieBrE9C24w"/>
-      <steps
-          xsi:type="adaptation:ActionReference"
-          id="_fawHJIC4EeKnieBrE9C24w"
-          predecessor="_esR3kIC4EeKnieBrE9C24w"
-          successor="_e9rJkYC4EeKnieBrE9C24w"
-          refersTo="2"/>
-      <steps
-          xsi:type="adaptation:StopAction"
-          id="_e9rJkYC4EeKnieBrE9C24w"
-          predecessor="_fawHJIC4EeKnieBrE9C24w"/>
-    </implementedPlan>
-  </tactics>
   <actions id="2"
-      name="increaseVirtualCpu">
+      name="addVCPU">
     <referredAdaptationPoint
         xsi:type="adaptationpoints:ModelVariableConfigurationRange"
         href="AdaptationPoints.xmi#238746123"/>
@@ -160,7 +140,7 @@
         adaptationOperationDirection="INCREASE"/>
   </actions>
   <actions id="345242342"
-      name="decreaseVirtualCpu">
+      name="removeCPU">
     <referredAdaptationPoint
         xsi:type="adaptationpoints:ModelVariableConfigurationRange"
         href="AdaptationPoints.xmi#238746123"/>
@@ -169,7 +149,7 @@
         adaptationOperationDirection="DECREASE"/>
   </actions>
   <actions id="41123123"
-      name="increaseServers">
+      name="addAppServer">
     <referredAdaptationPoint
         xsi:type="adaptationpoints:ModelEntityConfigurationRange"
         href="AdaptationPoints.xmi#12312412412"/>
@@ -178,7 +158,7 @@
         adaptationOperationDirection="INCREASE"/>
   </actions>
   <actions id="1287127123"
-      name="decreaseServers">
+      name="removeAppServer">
     <referredAdaptationPoint
         xsi:type="adaptationpoints:ModelEntityConfigurationRange"
         href="AdaptationPoints.xmi#12312412412"/>
@@ -188,8 +168,7 @@
   </actions>
   <strategies
       id="s1"
-      name="PUSH"
-      objective="o1">
+      name="PUSH">
     <triggeringEvents
         id="12345"
         name="SlaViolatedEvent"/>
@@ -227,8 +206,7 @@
   </strategies>
   <strategies
       id="_Cg--ZYAnEeKW2vVcg5ekRw"
-      name="PULL"
-      objective="o2">
+      name="PULL">
     <triggeringEvents
         id="_H_MTgIAnEeKW2vVcg5ekRw"
         name="ScheduledMaintenanceEvent"/>
@@ -264,13 +242,13 @@
       </weightedMetrics>
     </weightingFunction>
   </strategies>
-  <goal description="Maintain the SLAs of all serivces while using resources as efficiently as possible">
+  <goal description="&lt;&lt;Maintain SLAs of all serivces while using resources efficiently>>">
     <objectives
-        id="o1"
-        name="maintainSLA"
+        id="_GdVkoKaGEeKsaqdh-1smGw"
+        name="ServiceLevelAgreements"
         specification=""/>
     <objectives
-        id="o2"
+        id="_G-ctoKaGEeKsaqdh-1smGw"
         name="resourceEfficiency"/>
   </goal>
 </adaptation:AdaptationProcess>