Changeset 1208 for DCWoRMS/branches/coolemall/src/test/article/recs/resources1.xml

Timestamp:

11/26/13 12:36:37 (11 years ago)

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/test/article/recs/resources1.xml (modified) (12 diffs)

DCWoRMS/branches/coolemall/src/test/article/recs/resources1.xml

@@ -1 +1 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <environment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-        xsi:noNamespaceSchemaLocation="../../../../simulator/schemas/resources/DCWormsResSchema.xsd">
+        xsi:noNamespaceSchemaLocation="../../../../simulator/schemas/resources/DCWormsResSchemaNew.xsd">
         
         <timeEstimationPlugin>
@@ -9 +9 @@
         <resources>
                 <computingResource class="DataCenter" name="RECS">
-                        <resourceUnit class="storage">
-                                <amount>4800000</amount>
-                        </resourceUnit>
+
                                 <profile>
                                         <powerProfile>
@@ -19 +17 @@
                                         </powerProfile> 
                                 </profile>
-                                
+                                                        <resourceUnit class="storage">
+                                <amount>4800000</amount>
+                        </resourceUnit>
                         <computingResource class="ComputingNode" type="Intel_i7" count="8" name="IntelI7">
-                                <resourceUnit class="memory">
-                                        <amount>16384</amount>
-                                </resourceUnit>
-                                <parameter name="category">
+                                                        <parameter name="category">
                                         <value>Intel_i7</value>
                                 </parameter>
+
+
                                 <profile>
                                         <powerProfile>
@@ -32 +31 @@
                                                         <name>test.article.recs.plugins.energy.IntelNodeEEP</name>
                                                 </energyEstimationPlugin>       
-                                                <powerStates>
+                                                <powerStateList>
                                                         <powerState>
                                                                 <name>ON</name>
@@ -41 +40 @@
                                                                 <powerUsage>0</powerUsage>
                                                         </powerState>
-                                                </powerStates>                          
+                                                </powerStateList>                               
                                         </powerProfile>
+                                        <thermalProfile></thermalProfile>
                                 </profile>
+                                                                <resourceUnit class="memory">
+                                        <amount>16384</amount>
+                                </resourceUnit>
                                 <computingResource class="Processor" count="1">
                                         <profile>
@@ -210 +213 @@
                         
                         <computingResource class="ComputingNode" type="AMD_Fusion" count="6" name="AMDFusion">
-                                <resourceUnit class="memory">
-                                        <amount>4096</amount>
-                                </resourceUnit>
+
                                 <parameter name="category">
                                         <value>AMD_Fusion</value>
@@ -221 +222 @@
                                                         <name>test.article.recs.plugins.energy.AmdNodeEEP</name>
                                                 </energyEstimationPlugin>       
-                                                <powerStates>
+                                                <powerStateList>
                                                         <powerState>
                                                                 <name>ON</name>
@@ -230 +231 @@
                                                                 <powerUsage>0</powerUsage>
                                                         </powerState>
-                                                </powerStates>                          
+                                                </powerStateList>                               
                                         </powerProfile>
+                                        <thermalProfile></thermalProfile>
                                 </profile>
+                                                                <resourceUnit class="memory">
+                                        <amount>4096</amount>
+                                </resourceUnit>
                                 <computingResource class="Processor" count="1">
                                         <profile>
@@ -268 +273 @@
 
                         <computingResource class="ComputingNode" type="Atom_D510" count="4" name="AtomD510">
-                                <resourceUnit class="memory">
-                                        <amount>2048</amount>
-                                </resourceUnit>
+
                                 <parameter name="category">
                                         <value>Atom_D510</value>
@@ -279 +282 @@
                                                         <name>test.article.recs.plugins.energy.AtomD510NodeEEP</name>
                                                 </energyEstimationPlugin>       
-                                                <powerStates>
+                                                <powerStateList>
                                                         <powerState>
                                                                 <name>ON</name>
@@ -288 +291 @@
                                                                 <powerUsage>0</powerUsage>
                                                         </powerState>
-                                                </powerStates>                          
+                                                </powerStateList>                               
                                         </powerProfile>
+                                        <thermalProfile></thermalProfile>
                                 </profile>
+                                                                <resourceUnit class="memory">
+                                        <amount>2048</amount>
+                                </resourceUnit>
                                 <computingResource class="Processor" count="1">
                                         <profile>
@@ -464 +471 @@
                         <!-- Definition of scheduling plugin at cluster level -->
                         <schedulingPlugin>
-                                <name>test.article.recs.plugins.scheduling.RecsExclusivenessEnOptSP</name>
+                                <name>test.article.recs.plugins.scheduling.RecsExclusivenessRandomSP</name>
                         </schedulingPlugin>     
                         <!-- Reference to managed resources - cluster manages resources belonging to the defined data center -->