j3d1/webvirtcloud
1
0
Fork 0
mirror of https://github.com/retspen/webvirtcloud synced 2024-10-31 19:44:16 +00:00
Code Issues Projects Releases Wiki Activity

fix isinstance method call

Browse source
This commit is contained in:
catborise 2020-04-26 16:14:34 +03:00 committed by catborise
parent 22cb8f702a
commit e911db8124
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vrtManager/hostdetails.py
View file

@ -18,7 +18,7 @@ class wvmHostDetails(wvmConnect):
""" """
all_mem = self.wvm.getInfo()[1] * 1048576 all_mem = self.wvm.getInfo()[1] * 1048576
freemem = self.wvm.getMemoryStats(-1, 0) freemem = self.wvm.getMemoryStats(-1, 0)
if isinstance(dict, freemem): if isinstance(freemem, dict):
free = (freemem['buffers'] + free = (freemem['buffers'] +
freemem['free'] + freemem['free'] +
freemem['cached']) * 1024 freemem['cached']) * 1024
@ -36,7 +36,7 @@ class wvmHostDetails(wvmConnect):
prev_idle = 0 prev_idle = 0
prev_total = 0 prev_total = 0
cpu = self.wvm.getCPUStats(-1, 0) cpu = self.wvm.getCPUStats(-1, 0)
if isinstance(dict, cpu): if isinstance(cpu, dict):
for num in range(2): for num in range(2):
idle = self.wvm.getCPUStats(-1, 0)['idle'] idle = self.wvm.getCPUStats(-1, 0)['idle']
total = sum(self.wvm.getCPUStats(-1, 0).values()) total = sum(self.wvm.getCPUStats(-1, 0).values())

8
vrtManager/util.py
View file

@ -26,7 +26,6 @@ def randomMAC():
def randomUUID(): def randomUUID():
"""Generate a random UUID.""" """Generate a random UUID."""
u = [random.randint(0, 255) for ignore in range(0, 16)] u = [random.randint(0, 255) for ignore in range(0, 16)]
u[6] = (u[6] & 0x0F) | (4 << 4) u[6] = (u[6] & 0x0F) | (4 << 4)
u[8] = (u[8] & 0x3F) | (2 << 6) u[8] = (u[8] & 0x3F) | (2 << 6)
@ -108,7 +107,7 @@ def get_xpath(doc, path):
ret = doc.xpath(path) ret = doc.xpath(path)
if ret is not None: if ret is not None:
if isinstance(list, ret): if isinstance(ret, list):
if len(ret) >= 1: if len(ret) >= 1:
if hasattr(ret[0], 'text'): if hasattr(ret[0], 'text'):
result = ret[0].text result = ret[0].text
@ -137,11 +136,10 @@ def pretty_bytes(val):
def validate_uuid(val): def validate_uuid(val):
if not isinstance(str, val): if not isinstance(val, str):
raise ValueError("UUID must be a string.") raise ValueError("UUID must be a string.")
form = re.match("[a-fA-F0-9]{8}[-]([a-fA-F0-9]{4}[-]){3}[a-fA-F0-9]{12}$", form = re.match("[a-fA-F0-9]{8}[-]([a-fA-F0-9]{4}[-]){3}[a-fA-F0-9]{12}$", val)
val)
if form is None: if form is None:
form = re.match("[a-fA-F0-9]{32}$", val) form = re.match("[a-fA-F0-9]{32}$", val)
if form is None: if form is None: