diff options
| author |   ahothan <ahothan@cisco.com> | 2018-12-14 19:39:51 -0800 |
|---|---|---|
| committer | ahothan <ahothan@cisco.com> | 2018-12-14 19:49:57 -0800 |
| commit | 0d70709b1e56d7dae02411802730585af6bb071e (patch) | |
| tree | fbceb97002f0be4b52d84da6d853d60acce31545 /nfvbench | |
| parent | 95ec969158c3f2e75a2e70e87d5f43f1c45b6f8e (diff) | |
Relax checking for vxlan network type.3.0.4
The code should allow any network type that has "vxlan" in it.
Change-Id: I9e0a9b5f028b054e53b08a2765fd02b2c59342aa
Signed-off-by: ahothan <ahothan@cisco.com>
Diffstat (limited to 'nfvbench')
| -rw-r--r-- | nfvbench/chain_runner.py | 8 | ||||
| -rw-r--r-- | nfvbench/chaining.py | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/nfvbench/chain_runner.py b/nfvbench/chain_runner.py index e38cfcd..a4e461d 100644 --- a/nfvbench/chain_runner.py +++ b/nfvbench/chain_runner.py @@ -84,12 +84,8 @@ class ChainRunner(object): vtep_vlan = gen_config.gen_config.vtep_vlan src_vteps = gen_config.gen_config.src_vteps dst_vtep = gen_config.gen_config.dst_vtep - int_nets = self.config.internal_networks - network_type = set( - [int_nets[net].get('network_type') for net in int_nets]) - if 'vxlan' in network_type: - gen_config.set_vxlans(0, self.chain_manager.get_chain_vxlans(0)) - gen_config.set_vxlans(1, self.chain_manager.get_chain_vxlans(1)) + gen_config.set_vxlans(0, self.chain_manager.get_chain_vxlans(0)) + gen_config.set_vxlans(1, self.chain_manager.get_chain_vxlans(1)) gen_config.set_vtep_vlan(0, vtep_vlan) gen_config.set_vtep_vlan(1, vtep_vlan) # Configuring source an remote VTEPs on TREx interfaces diff --git a/nfvbench/chaining.py b/nfvbench/chaining.py index 5f9e1e8..a97cd0b 100644 --- a/nfvbench/chaining.py +++ b/nfvbench/chaining.py @@ -329,7 +329,7 @@ class ChainNetwork(object): :return: VNI ID for this network """ - if self.network['provider:network_type'] != 'vxlan': + if 'vxlan' not in self.network['provider:network_type']: raise ChainException('Trying to retrieve VNI for non VXLAN network') return self.network['provider:segmentation_id'] |