Merge pull request #14 from schubergphilis/replace_xl

Support XenServer 6.5

Author: remibergsma

cloudstackops/cloudstackopsssh.py

@@ -86,7 +86,11 @@ def getHeartbeatStatus(self, hostname):
 
     # Get xapi vm count
     def getXapiVmCount(self, hostname):
-        remoteCmd = "xl list-vm | grep -v UUID | wc -l"
+        remoteCmd = "xe vm-list resident-on=$(xe host-list params=uuid \
+                     name-label=$HOSTNAME --minimal) \
+                     params=name-label,memory-static-max is-control-domain=false | \
+                     tr '\\n' ' ' | sed 's/name-label/\\n/g' | \
+                     awk {'print $4 \",\" $8'} | sed '/^,$/d'| wc -l"
         return self.runSSHCommand(hostname, remoteCmd)
 
     # Migrate vm via xapi

cloudstackops/xenserver.py

@@ -207,7 +207,11 @@ def host_reboot(self, host):
     def host_get_vms(self, host):
         try:
             with settings(host_string=self.ssh_user + "@" + host.ipaddress):
-                return fab.run("xl list-vm | grep -v UUID | wc -l")
+                return fab.run("xe vm-list resident-on=$(xe host-list params=uuid \
+                name-label=$HOSTNAME --minimal) \
+                params=name-label,memory-static-max is-control-domain=false | \
+                tr '\\n' ' ' | sed 's/name-label/\\n/g' | \
+                awk {'print $4 \",\" $8'} | sed '/^,$/d'| wc -l")
         except:
             return False