Skip to content
Snippets Groups Projects
Commit 399e52d3 authored by Nikolaus Huber's avatar Nikolaus Huber
Browse files

model adjustments

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@12110 9e42b895-fcda-4063-8a3b-11be15eb1bbd
parent e11665b8
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<implementedPlan id="qweqweqwe" name="AddResourcesAdaptationPlan"> <implementedPlan id="qweqweqwe" name="AddResourcesAdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="_PXgN0KaHEeKsaqdh-1smGw" successor="_Qych0qaHEeKsaqdh-1smGw"/> <steps xsi:type="adaptation:StartAction" id="_PXgN0KaHEeKsaqdh-1smGw" successor="_Qych0qaHEeKsaqdh-1smGw"/>
<steps xsi:type="adaptation:StopAction" id="_QNxHcaaHEeKsaqdh-1smGw" predecessor="_Qych0qaHEeKsaqdh-1smGw"/> <steps xsi:type="adaptation:StopAction" id="_QNxHcaaHEeKsaqdh-1smGw" predecessor="_Qych0qaHEeKsaqdh-1smGw"/>
<steps xsi:type="adaptation:LoopAction" id="_Qych0qaHEeKsaqdh-1smGw" predecessor="_PXgN0KaHEeKsaqdh-1smGw" successor="_QNxHcaaHEeKsaqdh-1smGw" counter="1"> <steps xsi:type="adaptation:LoopAction" id="_Qych0qaHEeKsaqdh-1smGw" predecessor="_PXgN0KaHEeKsaqdh-1smGw" successor="_QNxHcaaHEeKsaqdh-1smGw" counter="//@parameters.0">
<body id="_UpH4cKaHEeKsaqdh-1smGw" name="addVCPUorAppServer"> <body id="_UpH4cKaHEeKsaqdh-1smGw" name="addVCPUorAppServer">
<steps xsi:type="adaptation:StartAction" id="2342623434" successor="33eadsea"/> <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 &lt; 4)) and RuntimeEnvironment.allInstances()->select( re | re.template = self.template )->forAll(re | re.template.templateConfig.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number &lt; 4))"> <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 &lt; 4)) and RuntimeEnvironment.allInstances()->select( re | re.template = self.template )->forAll(re | re.template.templateConfig.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number &lt; 4))">
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<implementedPlan id="123123123" name="RemoveResourcesAdaptationPlan"> <implementedPlan id="123123123" name="RemoveResourcesAdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="_iqERYKaMEeKdn_E8M08Q_g" successor="_jqTmYqaMEeKdn_E8M08Q_g"/> <steps xsi:type="adaptation:StartAction" id="_iqERYKaMEeKdn_E8M08Q_g" successor="_jqTmYqaMEeKdn_E8M08Q_g"/>
<steps xsi:type="adaptation:StopAction" id="_jO2ZcaaMEeKdn_E8M08Q_g" predecessor="_jqTmYqaMEeKdn_E8M08Q_g"/> <steps xsi:type="adaptation:StopAction" id="_jO2ZcaaMEeKdn_E8M08Q_g" predecessor="_jqTmYqaMEeKdn_E8M08Q_g"/>
<steps xsi:type="adaptation:LoopAction" id="_jqTmYqaMEeKdn_E8M08Q_g" predecessor="_iqERYKaMEeKdn_E8M08Q_g" successor="_jO2ZcaaMEeKdn_E8M08Q_g" counter="1"> <steps xsi:type="adaptation:LoopAction" id="_jqTmYqaMEeKdn_E8M08Q_g" predecessor="_iqERYKaMEeKdn_E8M08Q_g" successor="_jO2ZcaaMEeKdn_E8M08Q_g" counter="//@parameters.0">
<body id="_oCJwYKaMEeKdn_E8M08Q_g" name="removeVCPUorAppServer"> <body id="_oCJwYKaMEeKdn_E8M08Q_g" name="removeVCPUorAppServer">
<steps xsi:type="adaptation:StartAction" id="321" successor="branchDecrease"/> <steps xsi:type="adaptation:StartAction" id="321" successor="branchDecrease"/>
<steps xsi:type="adaptation:BranchAction" id="branchDecrease" predecessor="321" successor="432" condition="RuntimeEnvironment.allInstances()->select( re | re.template = self.template and not re.configSpec->isEmpty())->exists(re | re.configSpec.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number > 2))"> <steps xsi:type="adaptation:BranchAction" id="branchDecrease" predecessor="321" successor="432" condition="RuntimeEnvironment.allInstances()->select( re | re.template = self.template and not re.configSpec->isEmpty())->exists(re | re.configSpec.oclAsType(resourceconfiguration::ActiveResourceSpecification).processingResourceSpecifications->forAll(nrOfParProcUnits.number > 2))">
...@@ -110,6 +110,7 @@ ...@@ -110,6 +110,7 @@
</weightedMetrics> </weightedMetrics>
</weightingFunction> </weightingFunction>
</strategies> </strategies>
<parameters name="LoopCounter" type="EInteger" value="1"/>
<goal description="Maintain SLAs of all serivces using resources efficiently"> <goal description="Maintain SLAs of all serivces using resources efficiently">
<objectives id="_GdVkoKaGEeKsaqdh-1smGw" name="MaintainSLAs"> <objectives id="_GdVkoKaGEeKsaqdh-1smGw" name="MaintainSLAs">
<specifications value="100.0" relationalOperator="LESS_EQUAL"> <specifications value="100.0" relationalOperator="LESS_EQUAL">
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<metricValues id="r2mv2" name="RespTimeGold" metricType="3" value="145.0"/> <metricValues id="r2mv2" name="RespTimeGold" metricType="3" value="145.0"/>
<metricValues id="r2mv3" name="RespTimeSilver" metricType="4" value="330.0"/> <metricValues id="r2mv3" name="RespTimeSilver" metricType="4" value="330.0"/>
</resultHistory> </resultHistory>
<resultHistory id="r3" name="ResultTactic2" timestamp="2012-12-12T02:00:00.000+0100"> <resultHistory id="r3" name="ResultTactic2" timestamp="2012-12-12T02:00:00.000+0100">
<metricValues id="r3mv1" name="Util" metricType="2" value="0.6"/> <metricValues id="r3mv1" name="Util" metricType="2" value="0.6"/>
<metricValues id="r3mv2" name="RespTimeGold" metricType="3" value="140.0"/> <metricValues id="r3mv2" name="RespTimeGold" metricType="3" value="140.0"/>
<metricValues id="r3mv3" name="RespTimeSilver" metricType="4" value="320.0"/> <metricValues id="r3mv3" name="RespTimeSilver" metricType="4" value="320.0"/>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
</resultHistory> </resultHistory>
<resultHistory id="m2" name="ResultMigration1-2" timestamp="2012-12-12T02:00:00.000+0100"> <resultHistory id="m2" name="ResultMigration1-2" timestamp="2012-12-12T02:00:00.000+0100">
<metricValues id="m2u1" name="Util1" metricType="2" value="0.5"/> <metricValues id="m2u1" name="Util1" metricType="2" value="0.5"/>
<metricValues id="m2u2" name="Util2" metricType="22" value="0.0"/> <metricValues id="m2u2" name="Util2" metricType="22"/>
<metricValues id="m2g" name="RespTimeGold" metricType="3" value="100.0"/> <metricValues id="m2g" name="RespTimeGold" metricType="3" value="100.0"/>
<metricValues id="m2s" name="RespTimeSilver" metricType="4" value="290.0"/> <metricValues id="m2s" name="RespTimeSilver" metricType="4" value="290.0"/>
</resultHistory> </resultHistory>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment