From 4473c50dfbeed25c6973d04a0d2e307cb9fac442 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Wed, 27 Feb 2013 09:58:30 +0000
Subject: [PATCH] git-svn-id:
https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10461
9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../SEAMS_Case_Study/AcamarCluster.xmi | 23 +------------------
.../ContainerTemplateRepo.xmi | 2 --
2 files changed, 1 insertion(+), 24 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi
index d886b86e..6254ddba 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/AcamarCluster.xmi
@@ -1,23 +1,10 @@
<?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:resourceconfiguration="http://www.descartes-research.net/metamodel/resourceconfiguration/0.1" xmlns:resourcelandscape="http://www.descartes-research.net/metamodel/resourcelandscape/0.1" id="1" name="KitDataCenters">
+<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="1" name="KitDataCenters">
<consistsOf id="2" name="AtisDataCenter">
<contains xsi:type="resourcelandscape:CompositeHardwareInfrastructure" id="3" name="AcamarCluster">
<contains xsi:type="resourcelandscape:ComputingInfrastructure" id="4" name="ClusterNode20">
<contains id="10" name="XenServer">
<contains id="12" name="AppServerVM1" ofClass="OS VM">
- <configSpec xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer">
- <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
- <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="4"/>
- </processingResourceSpecifications>
- </configSpec>
- <template href="ContainerTemplateRepo.xmi#2"/>
- </contains>
- <contains id="_YMEnRIAmEeKl7vO96mU5Yg" name="AppServerVM1-Copy" ofClass="OS VM">
- <configSpec xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer">
- <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
- <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="4"/>
- </processingResourceSpecifications>
- </configSpec>
<template href="ContainerTemplateRepo.xmi#2"/>
</contains>
<template href="ContainerTemplateRepo.xmi#11"/>
@@ -41,14 +28,6 @@
<contains id="33" name="DatabaseVM" ofClass="OS VM">
<template href="ContainerTemplateRepo.xmi#555"/>
</contains>
- <contains id="_YOH1tIAmEeKl7vO96mU5Yg" name="AppServerVM1-Copy" ofClass="OS VM">
- <configSpec xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer">
- <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
- <nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="3"/>
- </processingResourceSpecifications>
- </configSpec>
- <template href="ContainerTemplateRepo.xmi#2"/>
- </contains>
<template href="ContainerTemplateRepo.xmi#11"/>
</contains>
<template href="ContainerTemplateRepo.xmi#5"/>
diff --git a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi
index 4767509a..b8771b32 100644
--- a/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi
+++ b/edu.kit.ipd.descartes.adaptation.test/test_models/SEAMS_Case_Study/ContainerTemplateRepo.xmi
@@ -7,8 +7,6 @@
</processingResourceSpecifications>
</templateConfig>
<referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#12"/>
- <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#_YMEnRIAmEeKl7vO96mU5Yg"/>
- <referringContainers xsi:type="resourcelandscape:RuntimeEnvironment" href="AcamarCluster.xmi#_YOH1tIAmEeKl7vO96mU5Yg"/>
</templates>
<templates id="555" name="DatabaseVmTemplate">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="1231231231" name="CpusDatabase">
--
GitLab