projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs-openflowd: Remove documentation for obsolete --mgmt-id option.
[openvswitch]
/
xenserver
/
opt_xensource_libexec_InterfaceReconfigure.py
diff --git
a/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
b/xenserver/opt_xensource_libexec_InterfaceReconfigure.py
index 3c3a0195a6687fe8977f0094451fcb019a5489f7..9723c6617ebae65e7b40e4b5cc8eaae4d928c5ca 100644
(file)
--- a/
xenserver/opt_xensource_libexec_InterfaceReconfigure.py
+++ b/
xenserver/opt_xensource_libexec_InterfaceReconfigure.py
@@
-402,6
+402,10
@@
class DatabaseCache(object):
if f == "PIFs":
# drop PIFs on other hosts
self.__networks[n][f] = [p for p in rec[f] if self.__pif_on_host(p)]
if f == "PIFs":
# drop PIFs on other hosts
self.__networks[n][f] = [p for p in rec[f] if self.__pif_on_host(p)]
+ elif f == "MTU" and f not in rec:
+ # XenServer 5.5 network records did not have an
+ # MTU field, so allow this to be missing.
+ pass
else:
self.__networks[n][f] = rec[f]
self.__networks[n]['other_config'] = {}
else:
self.__networks[n][f] = rec[f]
self.__networks[n]['other_config'] = {}
@@
-859,7
+863,7
@@
def DatapathFactory(pif):
if network_backend == "bridge":
from InterfaceReconfigureBridge import DatapathBridge
return DatapathBridge(pif)
if network_backend == "bridge":
from InterfaceReconfigureBridge import DatapathBridge
return DatapathBridge(pif)
- elif network_backend
== "vswitch"
:
+ elif network_backend
in ["openvswitch", "vswitch"]
:
from InterfaceReconfigureVswitch import DatapathVswitch
return DatapathVswitch(pif)
else:
from InterfaceReconfigureVswitch import DatapathVswitch
return DatapathVswitch(pif)
else: