Changeset 1247 for DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ConsolidationClusterPlugin.java

Timestamp:

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

Author:

wojtekp

Message:

 

File:

• DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ConsolidationClusterPlugin.java (modified) (5 diffs)

DCWoRMS/branches/coolemall/src/example/localplugin/FCFSBF_ConsolidationClusterPlugin.java

@@ -12 +12 @@
 import schedframe.events.scheduling.SchedulingEvent;
 import schedframe.resources.ResourceStatus;
-import schedframe.resources.computing.ComputingNode;
+import schedframe.resources.computing.Node;
 import schedframe.resources.computing.ComputingResource;
 import schedframe.resources.units.Memory;
@@ -74 +74 @@
         private Map<ResourceUnitName, ResourceUnit> chooseResourcesForExecution(ClusterResourceManager resourceManager, TaskInterface<?> task) throws NoSuchFieldException {
 
-                List<ComputingNode> nodes = resourceManager.getComputingNodes();
+                List<Node> nodes = resourceManager.getNodes();
                 nodes = findSuitableNodes(task, nodes);
-                Collections.sort(nodes, new Comparator<ComputingNode>(){
-                    public int compare(ComputingNode node1, ComputingNode node2){   
+                Collections.sort(nodes, new Comparator<Node>(){
+                    public int compare(Node node1, Node node2){   
                         return node1.getResourceCharacteristic().getParameters().get("category").get(0).getContent().compareTo(node2.getResourceCharacteristic().getParameters().get("category").get(0).getContent());
                     }
@@ -83 +83 @@
                 if(nodes.size() > 0)
                 {
-                        ComputingNode node = nodes.get(0);
+                        Node node = nodes.get(0);
                         Map<ResourceUnitName, ResourceUnit> map = new HashMap<ResourceUnitName, ResourceUnit>();
                         List<ComputingResource> choosenResources =  new ArrayList<ComputingResource>();
@@ -117 +117 @@
         }
         
-        private List<ComputingNode> findSuitableNodes(TaskInterface<?> task, List<ComputingNode> nodes) throws NoSuchFieldException{
+        private List<Node> findSuitableNodes(TaskInterface<?> task, List<Node> nodes) throws NoSuchFieldException{
                 int cpuRequest;
                 try {
@@ -130 +130 @@
                         memoryRequest = 0;
                 }
-                List<ComputingNode> suitableNodes = new ArrayList<ComputingNode>();
-                for(ComputingNode node: nodes){
+                List<Node> suitableNodes = new ArrayList<Node>();
+                for(Node node: nodes){
                         if(node.getFreeProcessorsNumber() >= cpuRequest && node.getFreeMemory() >= memoryRequest){
                                 suitableNodes.add(node);