From 91a756ac7ef9e30c648e514f5cd9b305bfe21008 Mon Sep 17 00:00:00 2001 From: Brad Walker Date: Sat, 13 Feb 2016 23:19:32 -0500 Subject: [PATCH 1/2] Correct displayed VM Network Tab IP Addresses Listed IP addresses now correspond with virtual interfaces when a VM has multiple virtual interfaces. Show IPv6 link-local ('fe80::') addresses similar to XC 6.5. --- src/OXM/oxcSERVER.py | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/src/OXM/oxcSERVER.py b/src/OXM/oxcSERVER.py index e3cf586..d7a5bc0 100644 --- a/src/OXM/oxcSERVER.py +++ b/src/OXM/oxcSERVER.py @@ -396,23 +396,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 From 20c10a415c9d365fbb4e591272f3f1560f8cddaa Mon Sep 17 00:00:00 2001 From: Adam Scheller Date: Fri, 11 Mar 2016 11:36:16 +0100 Subject: [PATCH 2/2] Add dependency information for Gentoo Linux --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d747ce4..dd1530a 100644 --- a/README.md +++ b/README.md @@ -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.