Merge pull request #33 from lttmtins/master

Include domain on HA worker listing

Author: remibergsma

cloudstackops/cloudstacksql.py

@@ -83,7 +83,9 @@ def getHAWorkerData(self, hypervisorName):
             hypervisorNameWhere = ""
 
         cursor = self.conn.cursor()
-        cursor.execute("SELECT vm.name, \
+        cursor.execute("SELECT \
+        d.name AS domain, \
+        vm.name AS vmname, \
         ha.type, \
         vm.state, \
         ha.created, \
@@ -96,9 +98,10 @@ def getHAWorkerData(self, hypervisorName):
         LEFT JOIN cloud.mshost ms ON ms.msid=ha.mgmt_server_id \
         LEFT JOIN cloud.vm_instance vm ON vm.id=ha.instance_id \
         LEFT JOIN cloud.host ON host.id=ha.host_id \
+        LEFT JOIN cloud.domain d ON vm.domain_id = d.id \
         WHERE ha.created > DATE_SUB(NOW(), INTERVAL 1 DAY) " +
                        hypervisorNameWhere + " \
-        ORDER BY ha.created desc \
+        ORDER BY domain,ha.created desc \
         ;")
         result = cursor.fetchall()
         cursor.close()

listHAWorkers.py

@@ -131,6 +131,7 @@ def handleArguments(argv):
 haworkers = s.getHAWorkerData(hypervisorName)
 counter = 0
 t = PrettyTable([
+    "Domain",
     "VM",
     "Type",
     "VM state",
@@ -147,7 +148,7 @@ def handleArguments(argv):
     t.header = False
     t.padding_width = 1
 
-for (vmname, vm_type, state, created, taken, step, hypervisor, mgtname,
+for (domain,vmname, vm_type, state, created, taken, step, hypervisor, mgtname,
         hastate) in haworkers:
     if onlyNonRunning == 1 and state == "Running":
         continue
@@ -156,6 +157,7 @@ def handleArguments(argv):
     counter = counter + 1
     displayname = (vmname[:28] + '..') if len(vmname) >= 31 else vmname
     t.add_row([
+        domain,
         displayname,
         vm_type,
         state,