From a5b6c661009ab64a703f746c25a938d5062aa83b Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Thu, 18 Apr 2013 12:07:43 +0000
Subject: [PATCH] - added default resource types - adjusted resource
configuration
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@11274 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../SEAMS_Case_Study/default.containerrepository | 15 +++++++++++----
Examples/SEAMS_Case_Study/default.resourcetype | 5 +++++
2 files changed, 16 insertions(+), 4 deletions(-)
create mode 100644 Examples/SEAMS_Case_Study/default.resourcetype
diff --git a/Examples/SEAMS_Case_Study/default.containerrepository b/Examples/SEAMS_Case_Study/default.containerrepository
index 2d8e74b6..0a5139f8 100644
--- a/Examples/SEAMS_Case_Study/default.containerrepository
+++ b/Examples/SEAMS_Case_Study/default.containerrepository
@@ -2,7 +2,8 @@
<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">
+ <processingResourceSpecifications id="235234" name="vCpuSpec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
+ <activeResourceType href="default.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<nrOfParProcUnits id="1341341" name="NumberOfAppServerVmCpus" number="2"/>
</processingResourceSpecifications>
</templateConfig>
@@ -10,15 +11,21 @@
</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">
+ <processingResourceSpecifications id="51241132" name="CpuSpec" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
+ <activeResourceType href="default.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
<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">
- <nrOfParProcUnits id="23423sad" name="AmdOpteron" number="8"/>
+ <processingResourceSpecifications id="123sf" name="IntelXeonE5430-1" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
+ <activeResourceType href="default.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+ <nrOfParProcUnits id="23423sad" name="quad-core" number="4"/>
+ </processingResourceSpecifications>
+ <processingResourceSpecifications id="_wYMNIagfEeKjPK9oRuUP7g" name="IntelXeonE5430-2" schedulingPolicy="PROCESSOR_SHARING" processingRate="1000.0">
+ <activeResourceType href="default.resourcetype#_3ql5IJB4EeKmfoqNH_-HEA"/>
+ <nrOfParProcUnits id="_16c70KgfEeKjPK9oRuUP7g" name="quad-core" number="4"/>
</processingResourceSpecifications>
</templateConfig>
</templates>
diff --git a/Examples/SEAMS_Case_Study/default.resourcetype b/Examples/SEAMS_Case_Study/default.resourcetype
new file mode 100644
index 00000000..b304da21
--- /dev/null
+++ b/Examples/SEAMS_Case_Study/default.resourcetype
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resourcetype:ResourceTypeRepository xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:resourcetype="http://www.descartes-research.net/metamodel/resourcetype/0.1">
+ <resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_3ql5IJB4EeKmfoqNH_-HEA" name="CPU"/>
+ <resourceTypes xsi:type="resourcetype:ProcessingResourceType" id="_52tLYJB4EeKmfoqNH_-HEA" name="DELAY"/>
+</resourcetype:ResourceTypeRepository>
--
GitLab