diff options
| author |   ahothan <ahothan@cisco.com> | 2020-04-07 08:26:12 -0700 |
|---|---|---|
| committer | ahothan <ahothan@cisco.com> | 2020-04-07 09:00:47 -0700 |
| commit | ce2525c2a621af3d20fc58f03a8f88d29e0e3617 (patch) | |
| tree | 6dad812f5bfd94645af5cbeeb1295ca08bc1e38b /nfvbench | |
| parent | bbae2bc9d7df0108609eed07fe31d1e02856b8de (diff) | |
NFVBENCH-161 NFVbench --force-cleanup deletes more ports than needed4.2.3
Change-Id: Id2c015248df6ef161b57192e1691a70af9bc2c9b
Signed-off-by: ahothan <ahothan@cisco.com>
Diffstat (limited to 'nfvbench')
| -rw-r--r-- | nfvbench/cleanup.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nfvbench/cleanup.py b/nfvbench/cleanup.py index 22ed3c1..6cb2713 100644 --- 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: |