parallelvirtualcluster/pvc
1
0
Fork 0
Code Issues 11 Pull Requests Projects Releases 115 Wiki Activity

Fix incorrect usage of zkhandler inside pvc.py

Browse Source
This commit is contained in:
Joshua Boniface
2018-07-18 21:31:17 -04:00
parent f91e210f1a
commit 22776cdaaa
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
pvc.py
View File

@@ -371,12 +371,12 @@ def findTargetHypervisor(zk_conn, search_field, dom_uuid):
# Get the list of valid target hypervisors # Get the list of valid target hypervisors
def getHypervisors(zk_conn, dom_uuid): def getHypervisors(zk_conn, dom_uuid):
valid_hypervisor_list = {} valid_hypervisor_list = {}
full_hypervisor_list = zkhandler.listchildren(zk_conn, '/nodes') full_hypervisor_list = zk_conn.get_children('/nodes')
current_hypervisor = zkhandler.readdata(zk_conn, '/domains/{}/hypervisor'.format(dom_uuid)) current_hypervisor = zk_conn.get('/domains/{}/hypervisor'.format(dom_uuid))[0].decode('ascii')
for hypervisor in full_hypervisor_list: for hypervisor in full_hypervisor_list:
daemon_state = zkhandler.readdata(zk_conn, '/nodes/{}/daemonstate'.format(hypervisor)) daemon_state = zk_conn.get('/nodes/{}/daemonstate'.format(hypervisor))[0].decode('ascii')
domain_state = zkhandler.readdata(zk_conn, '/nodes/{}/domainstate'.format(hypervisor)) domain_state = zk_conn.get('/nodes/{}/domainstate'.format(hypervisor))[0].decode('ascii')
if hypervisor == current_hypervisor: if hypervisor == current_hypervisor:
continue continue
@@ -395,9 +395,9 @@ def findTargetHypervisorMem(zk_conn, dom_uuid):
hypervisor_list = getHypervisors(zk_conn, dom_uuid) hypervisor_list = getHypervisors(zk_conn, dom_uuid)
for hypervisor in hypervisor_list: for hypervisor in hypervisor_list:
memalloc = int(zkhandler.readdata(zk_conn, '/nodes/{}/memalloc'.format(hypervisor))) memalloc = int(zk_conn.get('/nodes/{}/memalloc'.format(hypervisor))[0].decode('ascii'))
memused = int(zkhandler.readdata(zk_conn, '/nodes/{}/memused'.format(hypervisor))) memused = int(zk_conn.get('/nodes/{}/memused'.format(hypervisor))[0].decode('ascii'))
memfree = int(zkhandler.readdata(zk_conn, '/nodes/{}/memfree'.format(hypervisor))) memfree = int(zk_conn.get('/nodes/{}/memfree'.format(hypervisor))[0].decode('ascii'))
memtotal = memused + memfree memtotal = memused + memfree
allocfree = memtotal - memalloc allocfree = memtotal - memalloc
@@ -414,7 +414,7 @@ def findTargetHypervisorLoad(zk_conn, dom_uuid):
hypervisor_list = getHypervisors(zk_conn, dom_uuid) hypervisor_list = getHypervisors(zk_conn, dom_uuid)
for hypervisor in hypervisor_list: for hypervisor in hypervisor_list:
load = int(zkhandler.readdata(zk_conn, '/nodes/{}/load'.format(hypervisor))) load = int(zk_conn.get('/nodes/{}/load'.format(hypervisor))[0].decode('ascii'))
if load < least_load: if load < least_load:
least_load = load least_load = load
@@ -429,7 +429,7 @@ def findTargetHypervisorVCPUs(zk_conn, dom_uuid):
hypervisor_list = getHypervisors(zk_conn, dom_uuid) hypervisor_list = getHypervisors(zk_conn, dom_uuid)
for hypervisor in hypervisor_list: for hypervisor in hypervisor_list:
vcpus = int(zkhandler.readdata(zk_conn, '/nodes/{}/vcpualloc'.format(hypervisor))) vcpus = int(zk_conn.get('/nodes/{}/vcpualloc'.format(hypervisor))[0].decode('ascii'))
if vcpus < least_vcpus: if vcpus < least_vcpus:
least_vcpus = vcpus least_vcpus = vcpus
@@ -444,7 +444,7 @@ def findTargetHypervisorVMs(zk_conn, dom_uuid):
hypervisor_list = getHypervisors(zk_conn, dom_uuid) hypervisor_list = getHypervisors(zk_conn, dom_uuid)
for hypervisor in hypervisor_list: for hypervisor in hypervisor_list:
vms = int(zkhandler.readdata(zk_conn, '/nodes/{}/domainscount'.format(hypervisor))) vms = int(zk_conn.get('/nodes/{}/domainscount'.format(hypervisor))[0].decode('ascii'))
if vms < least_vms: if vms < least_vms:
least_vms = vms least_vms = vms