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

further refactorings. now only the STA model and perfdatarepo model are used as input models 

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9804 9e42b895-fcda-4063-8a3b-11be15eb1bbd
parent 2241518b
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 27 additions and 78 deletions
edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
+ 18
− 62
View file @ bd531949
<?xml version="1.0" encoding="ASCII"?>
<adaptationpoints:AdaptationPointDescriptions
xmi:version="2.0"
xmlns:xmi="http://www.omg.org/XMI"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1"
xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1"
xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1"
xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1"
xsi:schemaLocation="http://www.descartes-research.net/metamodel/adaptationpoints/0.1 ../../edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore http://www.descartes-research.net/metamodel/containerrepository/0.1 ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/containerrepository.ecore http://www.descartes-research.net/metamodel/resourceconfiguration/0.1 ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourceconfiguration.ecore http://www.descartes-research.net/metamodel/resourcelandscape/0.1 ../../edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore"
id="1" name="MyAdaptationPointDescriptions">
<adaptationPoints
xsi:type="adaptationpoints:ModelVariableConfigurationRange"
id="238746123"
name="AmountOfCores"
minValue="1.0"
maxValue="4.0">
<adaptableEntity
xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits"
href="ContainerTemplateRepository.xmi#1341341"/>
<adaptationpoints:AdaptationPointDescriptions xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:adaptationpoints="http://www.descartes-research.net/metamodel/adaptationpoints/0.1" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="MyAdaptationPointDescriptions">
<adaptationPoints xsi:type="adaptationpoints:ModelVariableConfigurationRange" id="238746123" name="AmountOfCores" minValue="1.0" maxValue="4.0">
<adaptableEntity xsi:type="resourceconfiguration:NumberOfParallelProcessingUnits" href="ContainerTemplateRepository.xmi#1341341"/>
</adaptationPoints>
<adaptationPoints
xsi:type="adaptationpoints:ModelEntityConfigurationRange"
id="12312412412"
name="NumberOfVmInstances">
<variationPossibility
xsi:type="adaptationpoints:PropertyRange">
<minValueConstraint
oclString="self.containedIn.contains -> select( r&#xA; | r.template = self.template)->size() >= 1"/>
<maxValueConstraint
oclString="self.containedIn.contains -> select( r&#xA; | r.template = self.template)->size() &lt;= 4"/>
<adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="12312412412" name="NumberOfVmInstances">
<variationPossibility xsi:type="adaptationpoints:PropertyRange">
<minValueConstraint oclString="self.containedIn.contains -> select( r&#xA; | r.template = self.template)->size() >= 1"/>
<maxValueConstraint oclString="self.containedIn.contains -> select( r&#xA; | r.template = self.template)->size() &lt;= 4"/>
</variationPossibility>
<adaptableEntity
xsi:type="resourcelandscape:RuntimeEnvironment"
href="DistributedDataCenter.xmi#12345-1"/>
<adaptableEntity xsi:type="resourcelandscape:RuntimeEnvironment" href="DistributedDataCenter.xmi#12345-1"/>
</adaptationPoints>
<adaptationPoints
xsi:type="adaptationpoints:ModelEntityConfigurationRange"
id="xyz"
name="NumberOfTemplateInstances">
<variationPossibility
xsi:type="adaptationpoints:PropertyRange">
<minValueConstraint
oclString="self.referringContainers->size() >= 1"/>
<maxValueConstraint
oclString="self.referringContainers->size() &lt;= 10"/>
<adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="xyz" name="NumberOfTemplateInstances">
<variationPossibility xsi:type="adaptationpoints:PropertyRange">
<minValueConstraint oclString="self.referringContainers->size() >= 1"/>
<maxValueConstraint oclString="self.referringContainers->size() &lt;= 10"/>
</variationPossibility>
<adaptableEntity
xsi:type="containerrepository:ContainerTemplate"
href="ContainerTemplateRepository.xmi#555"/>
<adaptableEntity xsi:type="containerrepository:ContainerTemplate" href="ContainerTemplateRepository.xmi#555"/>
</adaptationPoints>
<adaptationPoints
xsi:type="adaptationpoints:ModelEntityConfigurationRange"
id="123321"
name="VM USA Migration">
<variationPossibility
xsi:type="adaptationpoints:SetOfConfigurations">
<valueConstraint
oclString="&quot;Specify a fancy OCL constraint here&quot;"/>
<variants
xsi:type="resourcelandscape:ComputingInfrastructure"
href="DistributedDataCenter.xmi#y"/>
<variants
xsi:type="resourcelandscape:ComputingInfrastructure"
href="DistributedDataCenter.xmi#12312312"/>
<adaptationPoints xsi:type="adaptationpoints:ModelEntityConfigurationRange" id="123321" name="VM USA Migration" adaptableEntity="2313">
<variationPossibility xsi:type="adaptationpoints:SetOfConfigurations">
<valueConstraint oclString="&quot;Specify a fancy OCL constraint here&quot;"/>
<variants xsi:type="resourcelandscape:ComputingInfrastructure" href="DistributedDataCenter.xmi#y"/>
<variants xsi:type="resourcelandscape:ComputingInfrastructure" href="DistributedDataCenter.xmi#12312312"/>
</variationPossibility>
<adaptableEntity
xsi:type="resourcelandscape:RuntimeEnvironment"
href="DistributedDataCenter.xmi#2313"/>
</adaptationPoints>
</adaptationpoints:AdaptationPointDescriptions>
edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi
+ 2
− 3
View file @ bd531949
<?xml version="1.0" encoding="ASCII"?>
<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" xsi:schemaLocation="http://www.descartes-research.net/metamodel/containerrepository/0.1 platform:/resource/edu.kit.ipd.descartes.mm.resourcelandscape/model/containerrepository.ecore http://www.descartes-research.net/metamodel/resourceconfiguration/0.1 platform:/resource/edu.kit.ipd.descartes.mm.resourcelandscape/model/resourceconfiguration.ecore http://www.descartes-research.net/metamodel/resourcelandscape/0.1 platform:/resource/edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore" id="1" name="MyTestContainerTemplates">
<templates id="2" name="VM_USA_TEMPLATE">
<containerrepository:ContainerRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:containerrepository="http://www.descartes-research.net/metamodel/containerrepository/0.1" xmlns:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="MyTestContainerTemplates">
<templates id="2" name="VM_USA_TEMPLATE" referringContainers="2313">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3" name="CPU_TEMPLATE">
<processingResourceSpecifications id="235234" name="CPU" processingRate="1000.0" parentResourceSpecification="3">
<nrOfParProcUnits id="1341341" name="NumberOfVirtualCpus" number="2"/>
</processingResourceSpecifications>
</templateConfig>
<referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="DistributedDataCenter.xmi#2313"/>
</templates>
<templates id="555" name="VM_GER_TEMPLATE">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="1231231231" name="CPU">
......
edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
+ 1
− 1
View file @ bd531949
<?xml version="1.0" encoding="ASCII"?>
<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" xsi:schemaLocation="http://www.descartes-research.net/metamodel/resourcelandscape/0.1 platform:/resource/edu.kit.ipd.descartes.mm.resourcelandscape/model/resourcelandscape.ecore" id="q" name="DDC Descartes">
<resourcelandscape:DistributedDataCenter xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="q" name="DDC Descartes">
<consistsOf id="2" name="TestDataCenterUSA">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="y" name="ComputeNodeUsaOne">
<contains id="2313" name="VM1_USA1" ofClass="OS VM">
......
edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
+ 1
− 1
View file @ bd531949
<?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">
<perfdatarepo:PerformanceDataRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:perfdatarepo="http://www.descartes-research.net/metamodel/perfdata/0.1" 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"/>
......
edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+ 5
− 11
View file @ bd531949
<?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"
xsi:schemaLocation="http://www.descartes-research.net/metamodel/adaptation/0.1 ../../edu.kit.ipd.descartes.mm.adaptation/model/adaptation.ecore http://www.descartes-research.net/metamodel/adaptationpoints/0.1 ../../edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore"
id="q" name="MyTestStaRepo">
<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" id="q" name="MyTestStaRepo">
<tactics id="2341234" name="myFirstIncreaseResourceTactic">
<implementedPlan id="qweqweqwe" name="IncreaseResourcesAdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="2342623434" successor="35634534"/>
......@@ -55,8 +48,7 @@
<implementedPlan id="45123123" name="testBranchActionAdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="branchStart" successor="branchAction"/>
<steps xsi:type="adaptation:StopAction" id="branchStop" predecessor="branchAction"/>
<steps xsi:type="adaptation:BranchAction" id="branchAction" predecessor="branchStart" successor="branchStop" condition="RuntimeEnvironment.allInstances()->size() &lt; 4">
<context href="DistributedDataCenter.xmi#2313"/>
<steps xsi:type="adaptation:BranchAction" id="branchAction" predecessor="branchStart" successor="branchStop" context="2313" condition="RuntimeEnvironment.allInstances()->size() &lt; 4">
<conditionTrueBranch id="TRUE-AdaptationPlan" name="TRUE-AdaptationPlan">
<steps xsi:type="adaptation:StartAction" id="98start" successor="98trueBranch"/>
<steps xsi:type="adaptation:ActionReference" id="98trueBranch" predecessor="98start" successor="98stop" refersTo="2"/>
......@@ -97,7 +89,9 @@
<lastImpact href="PerformanceDataRepositoryDummy.xmi#3df1q3eq"/>
</tactics>
<tactics id="634524" name="testDecreaseResource" usedTactic="123123" currentWeight="100.0" defaultWeight="1.0"/>
<tactics id="6324234" name="testTemplateScaling" usedTactic="323423123137" currentWeight="3000.0" defaultWeight="1.0"/>
<tactics id="6324234" name="testTemplateScaling" usedTactic="323423123137" currentWeight="230.4" defaultWeight="1.0">
<lastImpact href="PerformanceDataRepositoryDummy.xmi#3df1q3eq"/>
</tactics>
<tactics id="123migrationTest123" name="testMigration" usedTactic="12312412312" currentWeight="350.0"/>
<tactics id="451234123" name="testLoopActionTactic" usedTactic="123432"/>
<tactics id="testBranch" name="testBranchWeightedTactic" usedTactic="testBranch123235" currentWeight="100.0"/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment