diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi index 4727d43c8fd2c17c2a5df9f877e853b2a22959ca..1b9969d272327c81877dab30efd5f41ae5ede9ac 100644 --- a/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi +++ b/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi @@ -1,88 +1,23 @@ <?xml version="1.0" encoding="ASCII"?> -<perfdatarepo:PerformanceDataRepository - xmi:version="2.0" - xmlns:xmi="http://www.omg.org/XMI" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" - xsi:schemaLocation="http://www.descartes-research.net/metamodel/perfdata/0.1 ../../edu.kit.ipd.descartes.perfdatarepo/model/perfdatarepo.ecore" - id="1" name="DummyPerfDataRepo"> - <resultHistory - id="123" - name="ResultTactic1-1" - timestamp="2012-12-12T00:00:00.000+0100"> - <metricValues - id="224123" - name="Util" - metricType="2" - value="0.4"/> - <metricValues - id="213123" - name="RespTimeGold" - metricType="3" - value="150.0"/> - <metricValues - id="124124123" - name="RespTimeSilver" - metricType="4" - value="340.0"/> +<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" xsi:schemaLocation="http://www.descartes-research.net/metamodel/perfdata/0.1 ../../edu.kit.ipd.descartes.perfdatarepo/model/perfdatarepo.ecore" id="1" name="DummyPerfDataRepo"> + <resultHistory id="123" name="ResultTactic1-1" timestamp="2012-12-12T00:00:00.000+0100"> + <metricValues id="224123" name="Util" metricType="2" value="0.4"/> + <metricValues id="213123" name="RespTimeGold" metricType="3" value="150.0"/> + <metricValues id="124124123" name="RespTimeSilver" metricType="4" value="340.0"/> </resultHistory> - <resultHistory - id="assgddfs" - name="ResultTactic1-2" - timestamp="2012-12-12T01:00:00.000+0100"> - <metricValues - id="2241231" - name="Util" - metricType="2" - value="0.6"/> - <metricValues - id="2131232" - name="RespTimeGold" - metricType="3" - value="120.0"/> - <metricValues - id="1241241233" - name="RespTimeSilver" - metricType="4" - value="300.0"/> + <resultHistory id="assgddfs" name="ResultTactic1-2" timestamp="2012-12-12T01:00:00.000+0100"> + <metricValues id="2241231" name="Util" metricType="2" value="0.6"/> + <metricValues id="2131232" name="RespTimeGold" metricType="3" value="120.0"/> + <metricValues id="1241241233" name="RespTimeSilver" metricType="4" value="300.0"/> </resultHistory> - <resultHistory - id="234ersdf" - name="ResultTactic2-1" - timestamp="2012-12-12T02:00:00.000+0100"> - <metricValues - id="12343as" - name="Util" - metricType="2" - value="0.7"/> - <metricValues - id="sdfsdvc" - name="RespTimeGold" - metricType="3" - value="100.0"/> - <metricValues - id="63412412" - name="RespTimeSilver" - metricType="4" - value="280.0"/> + <resultHistory id="234ersdf" name="ResultTactic2-1" timestamp="2012-12-12T02:00:00.000+0100"> + <metricValues id="12343as" name="Util" metricType="2" value="0.7"/> + <metricValues id="sdfsdvc" name="RespTimeGold" metricType="3" value="100.0"/> + <metricValues id="63412412" name="RespTimeSilver" metricType="4" value="280.0"/> </resultHistory> - <metricTypes - id="2" - name="Utilization"/> - <metricTypes - id="3" - name="AvgRespTimeServiceGold"/> - <metricTypes - id="4" - name="AvgRespTimeServiceSilver"/> - <impactHistory - id="3df1q3eq" - name="Tactic1-AllImproved" - before="123" - after="assgddfs"/> - <impactHistory - id="232341241" - name="Tactic2-AllImproved" - before="assgddfs" - after="234ersdf"/> + <metricTypes id="2" name="Utilization"/> + <metricTypes id="3" name="AvgRespTimeServiceGold"/> + <metricTypes id="4" name="AvgRespTimeServiceSilver"/> + <impactHistory id="3df1q3eq" name="Tactic1-AllImproved" before="123" after="assgddfs"/> + <impactHistory id="232341241" name="Tactic2-AllImproved" before="assgddfs" after="234ersdf"/> </perfdatarepo:PerformanceDataRepository> 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 562b99bc58ae9145e3f7c6f0a67206c746a3f748..adf4c51ae1b9f757e0dce65c330a118d4f2a5fd2 100644 --- a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi +++ b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi @@ -160,7 +160,8 @@ </actions> <strategies id="23423423" - name="TestStrategy1"> + name="TestStrategy1" + objective="1231241"> <triggeringEvents id="12345" name="TestEvent"/> @@ -213,4 +214,10 @@ </weightedMetrics> </weightingFunction> </strategies> + <goal description="Test Tactics, Strategies and Actions"> + <objectives + id="1231241" + name="MaintainSLAs" + specification=""/> + </goal> </adaptation:AdaptationProcess>