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

Timestamp:

11/26/13 11:56:07 (11 years ago)

Author:

wojtekp

Message:

 

Location:

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

Files:

• ClusterResourceManager.java (modified) (2 diffs)
• LocalResourceManager.java (modified) (4 diffs)

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

@@ -23 +23 @@
         public List<ComputingNode> getComputingNodes(){
                 try {
-                        return (List<ComputingNode>) getResourcesOfType(StandardResourceType.ComputingNode);
+                        return (List<ComputingNode>) getResourcesOfType(StandardResourceType.Node);
                 } catch (ResourceException e) {
                         return new ArrayList<ComputingNode>();
@@ -40 +40 @@
         @SuppressWarnings("unchecked")
         public List<ComputingNode> getComputingNodes(Properties properties){
-                properties.setProperty("type", StandardResourceType.ComputingNode.toString());
+                properties.setProperty("type", StandardResourceType.Node.toString());
                 return (List<ComputingNode>) filterResources(properties);
 

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

@@ -19 +19 @@
 import schedframe.resources.StandardResourceType;
 import schedframe.resources.computing.ComputingResource;
+import schedframe.resources.computing.ComputingResourceCharacteristics;
 import schedframe.resources.computing.ResourceCharacteristics;
 import schedframe.resources.computing.validator.ResourcePropertiesValidator;
@@ -138 +139 @@
                 for (int i = 0; i < computingResources.size() && resourceWithName == null; i++) {
                         ComputingResource resource = computingResources.get(i);
-                        if (resource.getName().equals(resourceName))
+                        if (resource.getFullName().equals(resourceName))
                                 resourceWithName = resource;
                         else
@@ -154 +155 @@
                         while (!toExamine.isEmpty()) {
                                 ComputingResource resource = toExamine.pop();
-                                ResourceCharacteristics resourceCharacteristic = resource.getResourceCharacteristic();
+                                ComputingResourceCharacteristics resourceCharacteristic = (ComputingResourceCharacteristics)resource.getResourceCharacteristic();
                                 List<ResourceUnit> units = null;
                                 units = resourceCharacteristic.getResourceUnits().get(unitName);
@@ -266 +267 @@
                 for(int i = 0 ; i < computingResources.size() && resourceWithName == null; i++){
                         ComputingResource resource = computingResources.get(i);
-                        if(resource.getName().equals(resName))
+                        if(resource.getFullName().equals(resName))
                                 resourceWithName = resource;
                         else