CS-14946, check if it is linux bridge before call ovs
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/175f396c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/175f396c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/175f396c Branch: refs/heads/3.0.x Commit: 175f396c1edd12b7a6daf24f8fed747667b6aec9 Parents: b650fef Author: anthony <[email protected]> Authored: Wed May 23 19:06:35 2012 -0700 Committer: anthony <[email protected]> Committed: Wed May 23 19:08:17 2012 -0700 ---------------------------------------------------------------------- scripts/vm/hypervisor/xenserver/vmops | 26 +++++++++++++++++--------- 1 files changed, 17 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/175f396c/scripts/vm/hypervisor/xenserver/vmops ---------------------------------------------------------------------- diff --git a/scripts/vm/hypervisor/xenserver/vmops b/scripts/vm/hypervisor/xenserver/vmops index 248108b..0872edb 100755 --- a/scripts/vm/hypervisor/xenserver/vmops +++ b/scripts/vm/hypervisor/xenserver/vmops @@ -275,16 +275,24 @@ def setLinkLocalIP(session, args): txt = util.pread2(cmd) except: try: - cmd = ["brctl", "addbr", brName] - txt = util.pread2(cmd) + cmd = ['cat', '/etc/xensource/network.conf'] + result = util.pread2(cmd) except: - pass - - try: - cmd = ["ovs-vsctl", "add-br", brName] - txt = util.pread2(cmd) - except: - pass + return 'can not cat network.conf' + + if result.lower() == "bridge": + try: + cmd = ["brctl", "addbr", brName] + txt = util.pread2(cmd) + except: + pass + + else: + try: + cmd = ["ovs-vsctl", "add-br", brName] + txt = util.pread2(cmd) + except: + pass try: cmd = ["ifconfig", brName, "169.254.0.1", "netmask", "255.255.0.0"]
