Merge pull request #30 from schubergphilis/os_preference

rebalance OS now skipping dedicated hosts

Author: remibergsma

.gitignore

@@ -1,3 +1,5 @@
 *.pyc
 *.swp
 config
+*.iml
+.idea/

cloudstackops/cloudstackops.py

@@ -433,6 +433,36 @@ def getHostsFromCluster(self, clusterID):
         # Call CloudStack API
         return self._callAPI(apicall)
 
+    # Find enabled hosts in a given cluster excluding it's hosts which have been marked dedicated
+    def getSharedHostsFromCluster(self, clusterID):
+        apicall = listHosts.listHostsCmd()
+        apicall.clusterid = str(clusterID)
+        apicall.resourcestate = "Enabled"
+        apicall.listAll = "true"
+
+        # Call CloudStack API
+        clusterhostdetails  =  self._callAPI(apicall)
+
+        # Remove dedicated hosts from the results
+        dedicatedhosts = self.getDedicatedHosts()
+        clusterhostdetails_orig = list(clusterhostdetails)
+        if dedicatedhosts:
+            for h in clusterhostdetails_orig:
+                for d in dedicatedhosts:
+                    if h.name == d.name:
+                        if self.DEBUG == 1:
+                            print "Remove dedicated host from the list: " + str(d.name)
+                        clusterhostdetails.remove(h)
+        return clusterhostdetails
+
+    # Find dedicated hosts
+    def getDedicatedHosts(self):
+        apicall = listDedicatedHosts.listDedicatedHostsCmd()
+        apicall.listAll = "true"
+
+        # Call CloudStack API
+        return self._callAPI(apicall)
+
     # Generic listVirtualMachines function
     def listVirtualmachines(self, args):
         args = self.remove_empty_values(args)

rebalanceOSTypesOnCluster.py

@@ -137,14 +137,17 @@ def sortHostByMemory(hosts,reverse=False):
   print "ApiKey: " + c.apikey
   print "SecretKey: " + c.secretkey
 
-fromClusterHostsData = c.getHostsFromCluster(clusterID)
-if fromClusterHostsData == 1 or fromClusterHostsData == None:
+# Fetch the list of hosts in a cluster which are not marked dedicated aka shared:
+fromClusterHostsData = c.getSharedHostsFromCluster(clusterID)
+if fromClusterHostsData == [] or fromClusterHostsData == None:
   print
   sys.stdout.write("\033[F")
-  print "No (enabled) hosts found on cluster " + clustername
+  print "No (enabled or non-dedicated) hosts found on cluster " + clusterName
+  print "Nothing to work on, exiting."
+  exit (1)
 
 # Settings
-minInstances = 10
+minInstances = 7
 maxInstances = 25
 osFamilies = []
 osFamilies.append('Windows')