Skip to content
Merged
Changes from all commits
Commits
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
18 changes: 8 additions & 10 deletions ansible/roles/vm_set/library/vm_topology.py
Original file line number Diff line number Diff line change
Expand Up @@ -160,14 +160,19 @@ def __init__(self, vm_names, fp_mtu, max_fp_num):
self.vm_names = vm_names
self.fp_mtu = fp_mtu
self.max_fp_num = max_fp_num

self.host_ifaces = VMTopology.ifconfig('ifconfig -a')

return

def init(self, vm_set_name, topo, vm_base, duts_fp_ports, duts_name, ptf_exists=True):
self.vm_set_name = vm_set_name
self.duts_name = duts_name

if ptf_exists:
self.pid = VMTopology.get_pid(PTF_NAME_TEMPLATE % vm_set_name)
else:
self.pid = None

self.update()

self.VMs = {}
if 'VMs' in topo:
self.vm_base = vm_base
Expand All @@ -194,15 +199,8 @@ def init(self, vm_set_name, topo, vm_base, duts_fp_ports, duts_name, ptf_exists=

self.injected_fp_ports = self.extract_vm_vlans()

if ptf_exists:
self.pid = VMTopology.get_pid(PTF_NAME_TEMPLATE % vm_set_name)
else:
self.pid = None

self.bp_bridge = ROOT_BACK_BR_TEMPLATE % self.vm_set_name

self.update()
Comment thread
lguohan marked this conversation as resolved.

return

def update(self):
Expand Down