Merge pull request #184 from fabiokung/vm-ids

Expose VM ids to fitness constraints and functions

Author: fabiokung

fenzo-core/src/main/java/com/netflix/fenzo/AssignableVirtualMachine.java

@@ -841,29 +841,37 @@ VirtualMachineCurrentState getVmCurrentState() {
             public String getHostname() {
                 return hostname;
             }
+
+            @Override
+            public String getVMId() {
+                return currVMId;
+            }
+
             @Override
             public Map<String, PreferentialNamedConsumableResourceSet> getResourceSets() {
                 return resourceSets;
             }
+
             @Override
             public VirtualMachineLease getCurrAvailableResources() {
                 return currTotalLease;
             }
 
             @Override
             public Collection<Protos.Offer> getAllCurrentOffers() {
-                System.out.println("****************************** ");
                 return offers;
             }
 
             @Override
             public Collection<TaskAssignmentResult> getTasksCurrentlyAssigned() {
                 return Collections.emptyList();
             }
+
             @Override
             public Collection<TaskRequest> getRunningTasks() {
                 return Collections.unmodifiableCollection(previouslyAssignedTasksMap.values());
             }
+
             @Override
             public long getDisabledUntil() {
                 return disabledUntil;
@@ -881,10 +889,17 @@ private VirtualMachineCurrentState vmCurrentState() {
             public String getHostname() {
                 return hostname;
             }
+
+            @Override
+            public String getVMId() {
+                return currVMId;
+            }
+
             @Override
             public Map<String, PreferentialNamedConsumableResourceSet> getResourceSets() {
                 return resourceSets;
             }
+
             @Override
             public VirtualMachineLease getCurrAvailableResources() {
                 return currTotalLease;
@@ -899,10 +914,12 @@ public Collection<Protos.Offer> getAllCurrentOffers() {
             public Collection<TaskAssignmentResult> getTasksCurrentlyAssigned() {
                 return Collections.unmodifiableCollection(assignmentResults.values());
             }
+
             @Override
             public Collection<TaskRequest> getRunningTasks() {
                 return Collections.unmodifiableCollection(previouslyAssignedTasksMap.values());
             }
+
             @Override
             public long getDisabledUntil() {
                 return disabledUntil;

fenzo-core/src/main/java/com/netflix/fenzo/VirtualMachineCurrentState.java

@@ -35,6 +35,14 @@ public interface VirtualMachineCurrentState {
      */
     String getHostname();
 
+    /**
+     * Get the virtual machine id provided by the last seen {@link VirtualMachineLease lease} of this host.
+     *
+     * @return an identifier provided by the last {@link VirtualMachineLease}. It can be <tt>null</tt> when no leases
+     * were seen yet, or when leases do not include a VM id.
+     */
+    String getVMId();
+
     /**
      * Get a map of resource sets of the virtual machine.
      *
@@ -53,6 +61,7 @@ public interface VirtualMachineCurrentState {
     /**
      * Get all offers for the VM that represent the available resources. There may be more than one offer over time
      * if Mesos master offered partial resources for the VM multiple times.
+     *
      * @return A collection of Mesos resource offers.
      */
     Collection<Protos.Offer> getAllCurrentOffers();
@@ -61,7 +70,7 @@ public interface VirtualMachineCurrentState {
      * Get list of task assignment results for this host so far in the current scheduling run.
      *
      * @return a collection of tasks that the current scheduling iteration assigned to this host but that are
-     *         not launched/executing yet
+     * not launched/executing yet
      */
     Collection<TaskAssignmentResult> getTasksCurrentlyAssigned();