Skip to content

[vmtopology]: Fix no attribute 'host_ifaces' issue for start/stop vm #2504

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 1 commit into from
Nov 11, 2020
Merged

[vmtopology]: Fix no attribute 'host_ifaces' issue for start/stop vm #2504

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions ansible/roles/vm_set/library/vm_topology.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,8 +239,7 @@ def create_bridges(self):
return

def create_ovs_bridge(self, bridge_name, mtu):
if bridge_name not in self.host_ifaces:
VMTopology.cmd('ovs-vsctl add-br %s' % bridge_name)
VMTopology.cmd('ovs-vsctl --may-exist add-br %s' % bridge_name)

if mtu != DEFAULT_MTU:
VMTopology.cmd('ifconfig %s mtu %d' % (bridge_name, mtu))
Expand All @@ -250,17 +249,16 @@ def create_ovs_bridge(self, bridge_name, mtu):
return

def destroy_bridges(self):
host_ifaces = VMTopology.ifconfig('ifconfig -a')
for vm in self.vm_names:
for ifname in self.host_ifaces:
for ifname in host_ifaces:
if re.compile(OVS_FP_BRIDGE_REGEX % vm).match(ifname):
self.destroy_ovs_bridge(ifname)

return

def destroy_ovs_bridge(self, bridge_name):
if bridge_name in self.host_ifaces:
VMTopology.cmd('ifconfig %s down' % bridge_name)
VMTopology.cmd('ovs-vsctl del-br %s' % bridge_name)
VMTopology.cmd('ovs-vsctl --if-exists del-br %s' % bridge_name)

return

Expand Down