Changeset 1098 for DCWoRMS/branches/coolemall/src/schedframe

Timestamp:

06/13/13 11:06:52 (12 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/recs

Files:

• ComputeBox1.java (modified) (2 diffs)
• NodeGroup.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/recs/ComputeBox1.java

@@ -3 +3 @@
 import java.util.List;
 
+import schedframe.resources.CoolEmAllResourceType;
 import schedframe.resources.StandardResourceType;
-import schedframe.resources.UserResourceType;
 import schedframe.resources.computing.ComputingNode;
-import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
+import schedframe.resources.computing.Rack;
 import schedframe.resources.computing.description.ComputingResourceDescription;
 
-public class ComputeBox1 extends ComputingResource{
+public class ComputeBox1 extends Rack{
         
         public ComputeBox1(ComputingResourceDescription resDesc) {
@@ -18 +18 @@
         @SuppressWarnings("unchecked")
         public List<NodeGroup> getNodesGroups(){
-                return (List<NodeGroup>) getDescendantsByType(new UserResourceType("NodeGroup"));
+                return (List<NodeGroup>) getDescendantsByType(CoolEmAllResourceType.NodeGroup);
         }
         
         @SuppressWarnings("unchecked")
         public List<ComputingNode> getNodes(){
-                return (List<ComputingNode>) getDescendantsByType(new UserResourceType("Node"));
+                return (List<ComputingNode>) getDescendantsByType(CoolEmAllResourceType.Node);
         }
         

DCWoRMS/branches/coolemall/src/schedframe/resources/computing/recs/NodeGroup.java

@@ -3 +3 @@
 import java.util.List;
 
+import schedframe.resources.CoolEmAllResourceType;
 import schedframe.resources.StandardResourceType;
-import schedframe.resources.UserResourceType;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
@@ -17 +17 @@
         @SuppressWarnings("unchecked")
         public List<Node> getNodes(){
-                return (List<Node>) getDescendantsByType(new UserResourceType("Node"));
+                return (List<Node>) getDescendantsByType(CoolEmAllResourceType.Node);
         }