tyler.durden
/
openxenmanager
mirror of https://github.com/OpenXenManager/openxenmanager.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/OpenXenManager/openxenmanager

This commit is contained in:
james 2016-04-24 19:29:12 -06:00
parent 26171bb63b ea4f348337
commit aa873a4ebd
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -38,9 +38,12 @@ Requirements:
* ConfigObj
* GTK-VNC (Linux only)
Linux package dependencies:
Debian/Ubuntu Linux package dependencies:
python2.7 python-gtk2 glade python-gtk-vnc python-glade2 python-configobj
Gentoo Linux package dependencies:
dev-python/pygtk dev-python/configobj net-libs/gtk-vnc dev-lang/python:2.7 (remember to set "python" USE flag for gtk-vnc!)
OpenXenManager runs has been tested to run on Linux or Windows and should work
on MacOSX as well.

24
src/OXM/oxcSERVER.py
View File

@ -395,23 +395,17 @@ class oxcSERVER(oxcSERVERvm, oxcSERVERhost, oxcSERVERproperties,
vif = self.all['VIF'][vif_ref]
# QOS Parameters
if "kbps" in vif['qos_algorithm_params']:
limit = vif['qos_algorithm_params']['kbps']
else:
limit = ""
limit = vif['qos_algorithm_params'].get('kbps', '')
# IP Addresses
if guest_metrics in self.all['VM_guest_metrics'] and \
len(self.all['VM_guest_metrics'][guest_metrics]['networks']) > 0:
net_addrs = self.all['VM_guest_metrics'][guest_metrics]['networks']
addresses = []
for key in net_addrs:
if key == vif['device'] + "/ip":
addresses.append(net_addrs[key])
elif not str(net_addrs[key]).startswith('fe80'):
addresses.append(net_addrs[key])
else:
addresses = []
net_addrs = (
self.all['VM_guest_metrics'].get(
guest_metrics, {'networks': ()}).
get('networks', ()))
addresses = [
addr for key, addr in net_addrs.items()
if key.startswith(vif['device'] + '/ip')
]
# FIXME - Fix what?
# Network name