X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=nfvbench%2Fchain_runner.py;h=f045528ed3c12fa46ac338bf48c64bf69478775e;hb=bc825ac3ee6f58791d47f9bfef288624624f700c;hp=418d6677bdd403b498de301552f9e917ba36389f;hpb=95f2491ed89ac99b0d8bd006b4a13cbeb1eb96ce;p=nfvbench.git

diff --git a/nfvbench/chain_runner.py b/nfvbench/chain_runner.py
index 418d667..f045528 100644
--- a/nfvbench/chain_runner.py
+++ b/nfvbench/chain_runner.py
@@ -71,6 +71,8 @@ class ChainRunner(object):
             # VLAN is discovered from the networks
             gen_config.set_vlans(0, self.chain_manager.get_chain_vlans(0))
             gen_config.set_vlans(1, self.chain_manager.get_chain_vlans(1))
+        else:
+            LOG.info("Ports: untagged")
 
         # the only case we do not need to set the dest MAC is in the case of
         # l2-loopback (because the traffic gen will default to use the peer MAC)
@@ -96,16 +98,37 @@ class ChainRunner(object):
             gen_config.set_vxlan_endpoints(1, src_vteps[1], dst_vtep)
             self.config['vxlan_gen_config'] = gen_config
 
+        if config.mpls:
+            # MPLS VPN is discovered from the networks
+            src_vteps = gen_config.gen_config.src_vteps
+            vtep_gateway_ips = gen_config.gen_config.vtep_gateway_ips
+            gen_config.set_mpls_inner_labels(0, self.chain_manager.get_chain_mpls_inner_labels(0))
+            gen_config.set_mpls_inner_labels(1, self.chain_manager.get_chain_mpls_inner_labels(1))
+            outer_mpls_labels_left = self.config.internal_networks.left.mpls_transport_labels
+            outer_mpls_labels_right = self.config.internal_networks.right.mpls_transport_labels
+            if outer_mpls_labels_left or outer_mpls_labels_right:
+                gen_config.set_mpls_outer_labels(0, outer_mpls_labels_left)
+                gen_config.set_mpls_outer_labels(1, outer_mpls_labels_right)
+            # Configuring source an remote VTEPs on TREx interfaces
+            gen_config.set_mpls_peers(0, src_vteps[0], vtep_gateway_ips[0])
+            gen_config.set_mpls_peers(1, src_vteps[1], vtep_gateway_ips[1])
+            self.config['mpls_gen_config'] = gen_config
+
         # get an instance of the stats manager
         self.stats_manager = StatsManager(self)
         LOG.info('ChainRunner initialized')
 
     def __setup_traffic(self):
+        # possibly skip connectivity check
+        if self.config.no_e2e_check:
+            LOG.info('Skipping end to end connectivity check')
+            return
         self.traffic_client.setup()
         if not self.config.no_traffic:
-            # ARP is needed for EXT chain or VxLAN overlay unless disabled explicitly
-            if (self.config.service_chain == ChainType.EXT or
-                    self.config.vxlan or self.config.l3_router) and not self.config.no_arp:
+            # ARP is needed for EXT chain or VxLAN overlay or MPLS unless disabled explicitly
+            if (self.config.service_chain == ChainType.EXT or self.config.mpls or
+                    self.config.vxlan or self.config.l3_router or self.config.loop_vm_arp)\
+                    and not self.config.no_arp:
                 self.traffic_client.ensure_arp_successful()
             self.traffic_client.ensure_end_to_end()
 
@@ -132,7 +155,10 @@ class ChainRunner(object):
             if self.config.single_run:
                 result['run_config'] = self.traffic_client.get_run_config(result)
                 required = result['run_config']['direction-total']['orig']['rate_pps']
-                actual = result['stats']['total_tx_rate']
+                if self.config.periodic_gratuitous_arp:
+                    actual = result['stats']['total_tx_rate'] + self.config.gratuitous_arp_pps
+                else:
+                    actual = result['stats']['total_tx_rate']
                 warning = self.traffic_client.compare_tx_rates(required, actual)
                 if warning is not None:
                     result['run_config']['warning'] = warning
@@ -166,10 +192,9 @@ class ChainRunner(object):
 
         LOG.info('Starting %dx%s benchmark...', self.config.service_chain_count, self.chain_name)
         self.stats_manager.create_worker()
-        if self.config.vxlan:
-            # Configure vxlan tunnels
+        if self.config.vxlan or self.config.mpls:
+            # Configure vxlan or mpls tunnels
             self.stats_manager.worker.config_interfaces()
-
         self.__setup_traffic()
 
         results[self.chain_name] = {'result': self.__get_chain_result()}
@@ -188,8 +213,8 @@ class ChainRunner(object):
                 LOG.info('Clean up skipped.')
             try:
                 self.traffic_client.close()
-            except Exception:
-                LOG.exception()
+            except Exception as exc:
+                LOG.exception(exc)
             if self.stats_manager:
                 self.stats_manager.close()
         except Exception: