From 45ffa9fd7578984fdc8eabab9cca4d743012a751 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Fri, 21 Dec 2012 16:33:32 +0000
Subject: [PATCH] placed platform:/resource into the model file to test
"platform path uri"
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9623 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../test_models/AdaptationPoints.xmi | 2 +-
.../test_models/ContainerTemplateRepository.xmi | 2 +-
.../test_models/DistributedDataCenter.xmi | 2 +-
.../test_models/PerformanceDataRepositoryDummy.xmi | 2 +-
.../test_models/StaRepository.xmi | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
index 26e1de8a..88123f1a 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/AdaptationPoints.xmi
@@ -1,5 +1,5 @@
<?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: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 platform:/resource/edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore 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="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>
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 81c65905..11a5d915 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/ContainerTemplateRepository.xmi
@@ -1,5 +1,5 @@
<?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 ../../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="MyTestContainerTemplates">
+<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">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3" name="CPU_TEMPLATE">
<processingResourceSpecifications id="235234" name="CPU" processingRate="1000.0" parentResourceSpecification="3">
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
index f3a4eed3..d46fef72 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
@@ -1,5 +1,5 @@
<?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 ../../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" 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">
<consistsOf id="2" name="TestDataCenterUSA">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="y" name="ComputeNodeUsaOne">
<contains id="2313" name="VM1_USA1" ofClass="OS VM">
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 1b9969d2..a7c202f7 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/PerformanceDataRepositoryDummy.xmi
@@ -1,5 +1,5 @@
<?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: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 platform:/resource/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"/>
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 adf4c51a..26a2cf67 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/StaRepository.xmi
@@ -5,7 +5,7 @@
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"
+ xsi:schemaLocation="http://www.descartes-research.net/metamodel/adaptation/0.1 platform:/resource/edu.kit.ipd.descartes.mm.adaptation/model/adaptation.ecore http://www.descartes-research.net/metamodel/adaptationpoints/0.1 platform:/resource/edu.kit.ipd.descartes.mm.adaptationpoints/model/adaptationpoints.ecore"
id="q" name="MyTestStaRepo">
<tactics id="2341234"
name="myFirstIncreaseResourceTactic">
--
GitLab