X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FContainerUtils.py;h=11bb964665e8b5f48022d0aeca6ce0253172e61d;hb=1bd729a755dd75b469e075f4efef4a929a59a297;hp=5fa0a575e9fd32ef2327d070ef79f869cebe5666;hpb=5a53823d8a6e99072152654ac632bb06a6b467ac;p=csit.git diff --git a/resources/libraries/python/ContainerUtils.py b/resources/libraries/python/ContainerUtils.py index 5fa0a575e9..11bb964665 100644 --- a/resources/libraries/python/ContainerUtils.py +++ b/resources/libraries/python/ContainerUtils.py @@ -183,9 +183,9 @@ class ContainerManager(object): container_vat_template, mid1=mid1, mid2=mid2, sid1=sid1, sid2=sid2, socket1='{dir}/memif-{c_name}-{sid}'. - format(c_name=c_name, sid=sid1, dir=guest_dir), + format(c_name=c_name, sid=sid1, dir=guest_dir), socket2='{dir}/memif-{c_name}-{sid}'. - format(c_name=c_name, sid=sid2, dir=guest_dir)) + format(c_name=c_name, sid=sid2, dir=guest_dir)) elif chain_topology == 'cross_horiz': if mod > 1: raise RuntimeError('Container chain topology {topology} ' @@ -206,21 +206,21 @@ class ContainerManager(object): c_name = self.engine.container.name guest_dir = self.engine.container.mnt[0].split(':')[1] if 'DUT1' in self.engine.container.name: - if_pci = Topology.get_interface_pci_addr( \ + if_pci = Topology.get_interface_pci_addr( self.engine.container.node, dut1_if) - if_name = Topology.get_interface_name( \ + if_name = Topology.get_interface_name( self.engine.container.node, dut1_if) if 'DUT2' in self.engine.container.name: - if_pci = Topology.get_interface_pci_addr( \ + if_pci = Topology.get_interface_pci_addr( self.engine.container.node, dut2_if) - if_name = Topology.get_interface_name( \ + if_name = Topology.get_interface_name( self.engine.container.node, dut2_if) self.engine.create_vpp_startup_config_dpdk_dev(if_pci) self.engine.create_vpp_exec_config( container_vat_template, mid1=mid1, sid1=sid1, if_name=if_name, socket1='{dir}/memif-{c_name}-{sid}'. - format(c_name=c_name, sid=sid1, dir=guest_dir)) + format(c_name=c_name, sid=sid1, dir=guest_dir)) elif chain_topology == 'chain_functional': for i, container in enumerate(self.containers): mid1 = i % mod + 1 @@ -236,9 +236,9 @@ class ContainerManager(object): container_vat_template, mid1=mid1, mid2=mid2, sid1=sid1, sid2=sid2, socket1='{dir}/memif-{c_name}-{sid}'. - format(c_name=c_name, sid=sid1, dir=guest_dir), + format(c_name=c_name, sid=sid1, dir=guest_dir), socket2='{dir}/memif-{c_name}-{sid}'. - format(c_name=c_name, sid=sid2, dir=guest_dir), + format(c_name=c_name, sid=sid2, dir=guest_dir), rx_mode=memif_rx_mode) else: raise RuntimeError('Container topology {topology} not implemented'.