From d94ab3d478ed6042db2e4d2814645f2bdf86ea37 Mon Sep 17 00:00:00 2001 From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de> Date: Fri, 18 Jan 2013 13:55:56 +0000 Subject: [PATCH] git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9826 9e42b895-fcda-4063-8a3b-11be15eb1bbd --- .../ContainerTemplateRepository.xmi | 56 ++++--------------- 1 file changed, 11 insertions(+), 45 deletions(-) diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi index d6653f40..61693e37 100644 --- a/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi +++ b/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi @@ -1,52 +1,18 @@ <?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" - id="1" name="MyTestContainerTemplates"> - <templates - id="2" - name="VM_USA_TEMPLATE"> - <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="3"/> +<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"> + <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="3"/> </processingResourceSpecifications> </templateConfig> - <referringContainers - xsi:type="resourcelandscape:RuntimeEnvironment" - href="DistributedDataCenter.xmi#2313"/> + <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"> - <processingResourceSpecifications - id="51241132" - name="Opteron CPU" - processingRate="1000.0" - parentResourceSpecification="1231231231"/> + <templates id="555" name="VM_GER_TEMPLATE"> + <templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="1231231231" name="CPU"> + <processingResourceSpecifications id="51241132" name="Opteron CPU" processingRate="1000.0" parentResourceSpecification="1231231231"/> </templateConfig> - <referringContainers - xsi:type="resourcelandscape:RuntimeEnvironment" - href="DistributedDataCenter.xmi#12345-1"/> - <referringContainers - xsi:type="resourcelandscape:RuntimeEnvironment" - href="DistributedDataCenter.xmi#12345-2"/> + <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="DistributedDataCenter.xmi#12345-1"/> + <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="DistributedDataCenter.xmi#12345-2"/> </templates> </containerrepository:ContainerRepository> -- GitLab