NFVBENCH-161 NFVbench --force-cleanup deletes more ports than needed

Change-Id: Id2c015248df6ef161b57192e1691a70af9bc2c9b
Signed-off-by: ahothan <ahothan@cisco.com>

diff --git a/docs/development/building/build.rst b/docs/development/building/build.rst
index 1b6bc0a..00c1c98 100644 (file)
--- a/docs/development/building/build.rst
+++ b/docs/development/building/build.rst
@@ -23,7 +23,7 @@ The NFVbench version is controlled by the git tag that conforms to the semver ve
 This tag controls the version of the Dockerfile used for building the container.
 
 The TRex version is controlled by the TREX_VER variable in Dockerfile (e.g. ENV TREX_VER "v2.56").
-TRex is installed in container from https://trex-tgn.cisco.com/trex/release/
+TRex is installed in container from https://github.com/cisco-system-traffic-generator/trex-core/releases
 
 The Test VM version is controlled by the VM_IMAGE_VER variable in Dockerfile (e.g. ENV VM_IMAGE_VER "0.8").
 The VM is extracted from google storage (http://artifacts.opnfv.org)

diff --git a/docs/testing/user/userguide/hw_requirements.rst b/docs/testing/user/userguide/hw_requirements.rst
index 124e8a0..44ab549 100644 (file)
--- a/docs/testing/user/userguide/hw_requirements.rst
+++ b/docs/testing/user/userguide/hw_requirements.rst
@@ -14,7 +14,8 @@ To run NFVbench you need the following hardware:
 - a DPDK compatible NIC with at least 2 ports (preferably 10Gbps or higher)
 - 2 ethernet cables between the NIC and the OpenStack pod under test (usually through a top of rack switch)
 
-The DPDK-compliant NIC must be one supported by the TRex traffic generator (such as Intel X710, refer to the `Trex Installation Guide <https://trex-tgn.cisco.com/trex/doc/trex_manual.html#_download_and_installation>`_ for a complete list of supported NIC)
+The DPDK-compliant NIC must be one supported by the TRex traffic generator (such as Intel X710, 
+refer to the Trex Installation Guide for a complete list of supported NIC)
 
 To run the TRex traffic generator (that is bundled with NFVbench) you will need to wire 2 physical interfaces of the NIC to the TOR switch(es):
     - if you have only 1 TOR, wire both interfaces to that same TOR

diff --git a/docs/testing/user/userguide/readme.rst b/docs/testing/user/userguide/readme.rst
index 1789d4a..50175c3 100644 (file)
--- a/docs/testing/user/userguide/readme.rst
+++ b/docs/testing/user/userguide/readme.rst
@@ -92,7 +92,7 @@ Traffic Generation
 
 NFVbench currently integrates with the open source TRex traffic generator:
 
-- `TRex <https://trex-tgn.cisco.com>`_ (pre-built into the NFVbench container)
+- `TRex <https://github.com/cisco-system-traffic-generator/trex-core>`_ (pre-built into the NFVbench container)
 
 
 Supported Packet Paths

diff --git a/nfvbench/cleanup.py b/nfvbench/cleanup.py
index 22ed3c1..6cb2713 100644 (file)
--- a/nfvbench/cleanup.py
+++ b/nfvbench/cleanup.py
@@ -96,7 +96,7 @@ class NetworkCleaner(object):
         for net in all_networks:
             netname = net['name']
             for prefix in network_name_prefixes:
-                if netname.startswith(prefix):
+                if prefix and netname.startswith(prefix):
                     self.networks.append(net)
                     net_ids.append(net['id'])
                     break
@@ -269,8 +269,8 @@ class Cleaner(object):
         self.nova_client = Client(2, session=session)
         network_names = [inet['name'] for inet in config.internal_networks.values()]
         network_names.extend([inet['name'] for inet in config.edge_networks.values()])
-        network_names.extend(config.management_network['name'])
-        network_names.extend(config.floating_network['name'])
+        network_names.append(config.management_network['name'])
+        network_names.append(config.floating_network['name'])
         router_names = [rtr['router_name'] for rtr in config.edge_networks.values()]
         # add idle networks as well
         if config.idle_networks.name: