afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'rel/5.2' of git-ssh.web.boeing.com:Boeing-CORE/CORE into rel/5.2

Browse source
This commit is contained in:
Blake J. Harnden 2018-07-27 16:11:12 -07:00
commit 6d11f5d63d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
daemon/core/netns/vif.py
View file

@ -274,7 +274,7 @@ class GreTap(PyCoreNetIf):
if remoteip is None: if remoteip is None:
raise ValueError, "missing remote IP required for GRE TAP device" raise ValueError, "missing remote IP required for GRE TAP device"
args = ["ip", "link", "add", self.localname, "type", "gretap", args = [constants.IP_BIN, "link", "add", self.localname, "type", "gretap",
"remote", str(remoteip)] "remote", str(remoteip)]
if localip: if localip:
args += ["local", str(localip)] args += ["local", str(localip)]
@ -283,7 +283,7 @@ class GreTap(PyCoreNetIf):
if key: if key:
args += ["key", str(key)] args += ["key", str(key)]
utils.check_cmd(args) utils.check_cmd(args)
args = ["ip", "link", "set", self.localname, "up"] args = [constants.IP_BIN, "link", "set", self.localname, "up"]
utils.check_cmd(args) utils.check_cmd(args)
self.up = True self.up = True
@ -295,9 +295,9 @@ class GreTap(PyCoreNetIf):
""" """
if self.localname: if self.localname:
try: try:
args = ["ip", "link", "set", self.localname, "down"] args = [constants.IP_BIN, "link", "set", self.localname, "down"]
utils.check_cmd(args) utils.check_cmd(args)
args = ["ip", "link", "del", self.localname] args = [constants.IP_BIN, "link", "del", self.localname]
utils.check_cmd(args) utils.check_cmd(args)
except CoreCommandError: except CoreCommandError:
logger.exception("error during shutdown") logger.exception("error during shutdown")