Changeset 1247 for DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager

Timestamp:

11/28/13 10:54:54 (11 years ago)

Author:

wojtekp

Message:

 

Location:

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources

Files:

• ClusterResourceManager.java (modified) (3 diffs)
• ResourceManagerFactory.java (modified) (2 diffs)

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ClusterResourceManager.java

@@ -7 +7 @@
 import schedframe.exceptions.ResourceException;
 import schedframe.resources.StandardResourceType;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.computing.Processor;
@@ -21 +21 @@
 
         @SuppressWarnings("unchecked")
-        public List<ComputingNode> getComputingNodes(){
+        public List<Node> getNodes(){
                 try {
-                        return (List<ComputingNode>) getResourcesOfType(StandardResourceType.Node);
+                        return (List<Node>) getResourcesOfType(StandardResourceType.Node);
                 } catch (ResourceException e) {
-                        return new ArrayList<ComputingNode>();
+                        return new ArrayList<Node>();
                 }
         }
@@ -39 +39 @@
 
         @SuppressWarnings("unchecked")
-        public List<ComputingNode> getComputingNodes(Properties properties){
+        public List<Node> getNodes(Properties properties){
                 properties.setProperty("type", StandardResourceType.Node.toString());
-                return (List<ComputingNode>) filterResources(properties);
+                return (List<Node>) filterResources(properties);
 
         }

DCWoRMS/branches/coolemall/src/schedframe/scheduling/manager/resources/ResourceManagerFactory.java

@@ -1 +1 @@
 package schedframe.scheduling.manager.resources;
 
+import schedframe.resources.StandardResourceType;
 import schedframe.scheduling.GridResourceDiscovery;
 import schedframe.scheduling.Scheduler;
@@ -10 +11 @@
                 ManagedComputingResources managedResource = scheduler.getCompResources();
                 
-                if(managedResources == null || managedResource.getType().getName().equals("DataCenter"))
+                if(managedResources == null || managedResource.getType().getName().equals(StandardResourceType.DataCenter))
                         return new GridResourceDiscovery(scheduler);
-                else if (managedResource.getType().getName().equals("Rack"))
+                else if (managedResource.getType().getName().equals(StandardResourceType.Rack))
                         return new ClusterResourceManager(scheduler.getCompResources(), scheduler.getChildren(), managedResources);
-                else if (managedResource.getType().getName().equals("ComputingNode"))
+                else if (managedResource.getType().getName().equals(StandardResourceType.Node))
                         return new ClusterResourceManager(scheduler.getCompResources(), scheduler.getChildren(), managedResources);
-                else if (managedResource.getType().getName().equals("Processor"))
+                else if (managedResource.getType().getName().equals(StandardResourceType.Processor))
                         return new ClusterResourceManager(scheduler.getCompResources(), scheduler.getChildren(), managedResources);
                 else return new ClusterResourceManager(scheduler.getCompResources(), scheduler.getChildren(), managedResources);