From 6f1cfd59e2c81a7bb0f708352f99d04b01ba9327 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 26 Feb 2013 15:12:55 +0000
Subject: [PATCH] one execution of 7*increaseResources
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10448 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../SEAMS_Case_Study/AcamarCluster.xmi | 126 ++++++------------
.../ContainerTemplateRepo.xmi | 8 +-
2 files changed, 47 insertions(+), 87 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 f0e579ca..d886b86e 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,99 +1,57 @@
<?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">
- <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"
- parentResourceSpecification="3xyzActiveResourceTemplate32">
- <nrOfParProcUnits
- id="1341341"
- name="NumberOfAppServerVmCpus"
- number="2"/>
+<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">
+ <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"/>
+ <template href="ContainerTemplateRepo.xmi#2"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#11"/>
+ <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"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#5"/>
+ <template href="ContainerTemplateRepo.xmi#5"/>
</contains>
- <contains
- xsi:type="resourcelandscape:ComputingInfrastructure"
- id="5"
- name="ClusterNode19">
- <contains
- id="15"
- name="XenServer">
- <template
- href="ContainerTemplateRepo.xmi#11"/>
+ <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="5" name="ClusterNode19">
+ <contains id="15" name="XenServer">
+ <template href="ContainerTemplateRepo.xmi#11"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#5"/>
+ <template href="ContainerTemplateRepo.xmi#5"/>
</contains>
- <contains
- xsi:type="resourcelandscape:ComputingInfrastructure"
- id="6"
- name="ClusterNode18">
- <contains
- id="25"
- name="XenServer">
- <template
- href="ContainerTemplateRepo.xmi#11"/>
+ <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="6" name="ClusterNode18">
+ <contains id="25" name="XenServer">
+ <template href="ContainerTemplateRepo.xmi#11"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#5"/>
+ <template href="ContainerTemplateRepo.xmi#5"/>
</contains>
- <contains
- xsi:type="resourcelandscape:ComputingInfrastructure"
- id="7"
- name="ClusterNode17">
- <contains
- id="14"
- name="XenServer">
- <contains
- id="33"
- name="DatabaseVM"
- ofClass="OS VM">
- <template
- href="ContainerTemplateRepo.xmi#555"/>
+ <contains xsi:type="resourcelandscape:ComputingInfrastructure" id="7" name="ClusterNode17">
+ <contains id="14" name="XenServer">
+ <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"/>
+ <template href="ContainerTemplateRepo.xmi#11"/>
</contains>
- <template
- href="ContainerTemplateRepo.xmi#5"/>
+ <template href="ContainerTemplateRepo.xmi#5"/>
</contains>
</contains>
</consistsOf>
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 5d5567a7..4767509a 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
@@ -2,22 +2,24 @@
<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="AcamarClusterContainerTemplates">
<templates id="2" name="AppServerVmTemplate">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="3xyzActiveResourceTemplate32" name="CpusAppServer">
- <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="3xyzActiveResourceTemplate32">
+ <processingResourceSpecifications id="235234" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
<nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="2"/>
</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">
- <processingResourceSpecifications id="51241132" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="1231231231">
+ <processingResourceSpecifications id="51241132" name="CPU-Spec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
<nrOfParProcUnits id="33" name="DatabaseVirtualCpus" number="8"/>
</processingResourceSpecifications>
</templateConfig>
</templates>
<templates id="5" name="ClusterNodeTemplate">
<templateConfig xsi:type="resourceconfiguration:ActiveResourceSpecification" id="123123" name="CpusClusterNode">
- <processingResourceSpecifications id="123sf" name="AmdOpteronCpuSpec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0" parentResourceSpecification="123123">
+ <processingResourceSpecifications id="123sf" name="AmdOpteronCpuSpec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
<nrOfParProcUnits id="23423sad" name="AmdOpteron" number="8"/>
</processingResourceSpecifications>
</templateConfig>
--
GitLab