X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=test%2Ftest_chains.py;h=f7a2ce3df798e8def4d2c6b91fe4fb4d77783a9b;hb=e7fdfb5c5e386bb8851b6c583c44ae61bd188627;hp=812aecee117daa8c7d0a8f6d19d152dfc91b14ea;hpb=6f7847f5917a80d224031bb92b63530fe4965734;p=nfvbench.git diff --git a/test/test_chains.py b/test/test_chains.py index 812aece..f7a2ce3 100644 --- a/test/test_chains.py +++ b/test/test_chains.py @@ -38,7 +38,7 @@ from nfvbench.specs import Specs from nfvbench.summarizer import _annotate_chain_stats from nfvbench.traffic_client import TrafficClient from nfvbench.traffic_gen.traffic_base import Latency -from nfvbench.traffic_gen.trex import TRex +from nfvbench.traffic_gen.trex_gen import TRex # just to get rid of the unused function warning @@ -232,6 +232,9 @@ def test_ext_chain_runner(): for scc in [1, 2]: config = _get_chain_config(ChainType.EXT, scc, shared_net) config.no_arp = no_arp + # this time use a tuple of network names + config['external_networks']['left'] = ('ext-lnet00', 'ext-lnet01') + config['external_networks']['right'] = ('ext-rnet00', 'ext-rnet01') if no_arp: # If EXT and no arp, the config must provide mac addresses (1 pair per chain) config['traffic_generator']['mac_addrs_left'] = ['00:00:00:00:00:00'] * scc @@ -244,6 +247,9 @@ def _check_nfvbench_openstack(sc=ChainType.PVP, l2_loopback=False): if l2_loopback: config.l2_loopback = True config.vlans = [[100], [200]] + if sc == ChainType.EXT: + config['external_networks']['left'] = 'ext-lnet' + config['external_networks']['right'] = 'ext-rnet' factory = BasicFactory() config_plugin = factory.get_config_plugin_class()(config) config = config_plugin.get_config()