summaryrefslogtreecommitdiffstats
path: root/apex/network/jumphost.py
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2017-09-16 09:42:47 -0400
committerTim Rozet <trozet@redhat.com>2017-09-16 09:42:47 -0400
commit74336aa1ff8270e701c1e5f20c7a566715ed8d92 (patch)
treecb01fd6485ac827543dc1a5b71ec93efd7cdccd2 /apex/network/jumphost.py
parent54b8b2a51e4156d42005158f003fb307b32e45c1 (diff)
Fix broken jumphost detach method when orig file exists
In the case where the backup ifcfg file exists (.orig) the functionality to detach the interface from ovs was broken. This fixes it and adds unit test case to cover that scenario. Change-Id: If6d8ca0ba5cf80df71bb82f52e9d204435374479 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/network/jumphost.py')
-rw-r--r--apex/network/jumphost.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/apex/network/jumphost.py b/apex/network/jumphost.py
index 2ecb7f4..96b06cb 100644
--- a/apex/network/jumphost.py
+++ b/apex/network/jumphost.py
@@ -227,15 +227,14 @@ def detach_interface_from_ovs(network):
orig_ifcfg_file = os.path.join(NET_CFG_PATH,
"ifcfg-{}.orig".format(real_interface))
ifcfg_file = orig_ifcfg_file[:-len('.orig')]
+ bridge_ifcfg_file = os.path.join(NET_CFG_PATH,
+ "ifcfg-{}".format(bridge))
if os.path.isfile(orig_ifcfg_file):
logging.debug("Original interface file found: "
"{}".format(orig_ifcfg_file))
- shutil.move(orig_ifcfg_file, ifcfg_file)
else:
logging.info("No original ifcfg file found...will attempt to use "
- "bridge icfg file and re-create")
- bridge_ifcfg_file = os.path.join(NET_CFG_PATH,
- "ifcfg-{}".format(bridge))
+ "bridge ifcfg file and re-create")
if os.path.isfile(bridge_ifcfg_file):
ifcfg_params = generate_ifcfg_params(bridge_ifcfg_file, network)
if_content = """DEVICE={}