From 14abbcf8c035848ff436e143364432ccb954fa33 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Mon, 21 Jan 2013 12:14:45 +0000
Subject: [PATCH] git-svn-id:
https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9871
9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../test_models/DistributedDataCenter.xmi | 49 +++++--------------
1 file changed, 11 insertions(+), 38 deletions(-)
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 0b93f7a1..96234895 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/DistributedDataCenter.xmi
@@ -1,46 +1,19 @@
<?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"
- 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">
- <template
- href="ContainerTemplateRepository.xmi#2"/>
+<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">
+ <template href="ContainerTemplateRepository.xmi#2"/>
</contains>
</contains>
</consistsOf>
- <consistsOf
- id="123123"
- name="TestDataCenterGermany">
- <contains
- xsi:type="resourcelandscape:ComputingInfrastructure"
- id="12312312"
- name="ComputeNodeGermanyOne">
- <contains
- id="12345-1"
- name="VM1-GER"
- ofClass="OS VM">
- <template
- href="ContainerTemplateRepository.xmi#555"/>
+ <consistsOf id="123123" name="TestDataCenterGermany">
+ <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="12312312" name="ComputeNodeGermanyOne">
+ <contains id="12345-1" name="VM1-GER" ofClass="OS VM">
+ <template href="ContainerTemplateRepository.xmi#555"/>
</contains>
- <contains
- id="12345-2"
- name="VM2-GER"
- ofClass="OS VM">
- <template
- href="ContainerTemplateRepository.xmi#555"/>
+ <contains id="12345-2" name="VM2-GER" ofClass="OS VM">
+ <template href="ContainerTemplateRepository.xmi#555"/>
</contains>
</contains>
</consistsOf>
--
GitLab