X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=nfvbench.git;a=blobdiff_plain;f=nfvbench%2Fcleanup.py;h=6cb27138f489d4d8f97e12049d567d07ab183e61;hp=22ed3c1b10ff48178a7f43069e804be133a0c164;hb=ce2525c2a621af3d20fc58f03a8f88d29e0e3617;hpb=bbae2bc9d7df0108609eed07fe31d1e02856b8de 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: