- 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

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>

Examples/SEAMS_Case_Study/default.resourcetype

+<?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>