Merge pull request OpenXenManager#101 from seijikun/master

Fix old filter for xapi network interface Fixes OpenXenManager#99
jayma777 · Nov 18, 2015 · dcbc2b1 · dcbc2b1
2 parents c6e0843 + 49e5111
commit dcbc2b1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/OXM/oxcSERVER_menuitem.py b/src/OXM/oxcSERVER_menuitem.py
@@ -311,7 +311,7 @@ def fill_list_networks(self, list, list2):
         list2.clear()
         i = 0
         for network in self.all['network']:
-            if self.all['network'][network]['bridge'] != "xapi0":
+            if self.all['network'][network]['bridge'] != "xenapi":
                 if "automatic" in self.all['network'][network]['other_config'] and \
                         self.all['network'][network]['other_config']["automatic"] == "true":
                     list.append(["interface " + str(i), "auto-generated",
@@ -324,7 +324,7 @@ def fill_management_networks(self, list, network_ref):
         i = 0
         current = 0
         for network in self.all['network']:
-            if self.all['network'][network]['bridge'] != "xapi0":
+            if self.all['network'][network]['bridge'] != "xenapi":
                 if self.all['network'][network]['PIFs'] \
                         and self.all['PIF'][self.all['network'][network]['PIFs'][0]]['bond_slave_of'] == "OpaqueRef:NULL":
                     if network == network_ref:

diff --git a/src/OXM/oxcSERVER_vm_network.py b/src/OXM/oxcSERVER_vm_network.py
@@ -36,7 +36,7 @@ def vm_remove_interface(self, vm_ref, vif_ref):
     def fill_addinterface_network(self, list):
         list.clear()
         for network in self.all['network']:
-            if self.all['network'][network]['bridge'] != "xapi0":
+            if self.all['network'][network]['bridge'] != "xenapi":
                     #if self.all['PIF'][self.all['network'][network]['PIFs'][0]]['bond_slave_of'] == "OpaqueRef:NULL":
                 list.append([network, self.all['network'][network]['name_label'].replace('Pool-wide network associated with eth','Network ')])
 
@@ -45,7 +45,7 @@ def fill_editinterface_network(self, list, network_ref):
         i = 0 
         current = 0
         for network in self.all['network']:
-            if self.all['network'][network]['bridge'] != "xapi0":
+            if self.all['network'][network]['bridge'] != "xenapi":
                 #if self.all['PIF'][self.all['network'][network]['PIFs'][0]]['bond_slave_of'] == "OpaqueRef:NULL":
                 if network == network_ref:
                     current = i