aboutsummaryrefslogtreecommitdiffstats
path: root/sfc/tests
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2019-01-18 16:41:28 +0100
committerManuel Buil <mbuil@suse.com>2019-01-21 10:19:01 +0100
commit264aa87f2ea4e52387b671a4d5e1394d46faf5ea (patch)
tree9fd0ed5264672c0bb046fd9f8769e6337a6ab753 /sfc/tests
parent402517b52e126650c1403927fa0c2f34483e3ff0 (diff)
Simplify deletion test and fix unittest
Removing the port groups when deleting the first chain simplifies things because we don't need port_groups to be a variable of the SfcCommonTestCase class There were also some missing unittest Change-Id: I6ae780bdc72116907a9e6037571c29f28a6ba334 Signed-off-by: Manuel Buil <mbuil@suse.com>
Diffstat (limited to 'sfc/tests')
-rw-r--r--sfc/tests/functest/sfc_chain_deletion.py2
-rw-r--r--sfc/tests/functest/sfc_parent_function.py40
2 files changed, 20 insertions, 22 deletions
diff --git a/sfc/tests/functest/sfc_chain_deletion.py b/sfc/tests/functest/sfc_chain_deletion.py
index dac32143..5f73d0c7 100644
--- a/sfc/tests/functest/sfc_chain_deletion.py
+++ b/sfc/tests/functest/sfc_chain_deletion.py
@@ -65,7 +65,7 @@ class SfcChainDeletion(sfc_parent_function.SfcCommonTestCase):
self.create_vnffg(self.testcase_config.test_vnffgd_red, 'blue',
'blue_http', port=80, protocol='tcp',
- symmetric=False, only_chain=True)
+ symmetric=False)
t2 = threading.Thread(target=odl_utils.wait_for_classification_rules,
args=(self.ovs_logger, self.compute_nodes,
diff --git a/sfc/tests/functest/sfc_parent_function.py b/sfc/tests/functest/sfc_parent_function.py
index dab6abc0..9558eb8c 100644
--- a/sfc/tests/functest/sfc_parent_function.py
+++ b/sfc/tests/functest/sfc_parent_function.py
@@ -58,9 +58,6 @@ class SfcCommonTestCase(object):
self.server_ip = None
self.port_client = None
- # n-sfc variables
- self.port_groups = []
-
self.prepare_env(testcase_config, supported_installers, vnfs)
def prepare_env(self, testcase_config, supported_installers, vnfs):
@@ -404,10 +401,10 @@ class SfcCommonTestCase(object):
# TODO: If we had a testcase where only one chains must be removed
# we would need to add the logic. Now it removes all of them
openstack_sfc.delete_chain()
+ openstack_sfc.delete_port_groups()
def create_vnffg(self, testcase_config_name, vnffgd_name, vnffg_name,
- port=80, protocol='tcp', symmetric=False,
- only_chain=False):
+ port=80, protocol='tcp', symmetric=False):
"""Create the vnffg components following the instructions from
relevant templates.
@@ -451,31 +448,32 @@ class SfcCommonTestCase(object):
self.neutron_port.id)
elif COMMON_CONFIG.mano_component == 'no-mano':
- if not only_chain:
- for vnf in self.vnfs:
- # vnf_instance is in [0] and vnf_port in [1]
- vnf_instance = self.vnf_objects[vnf][0]
- vnf_port = self.vnf_objects[vnf][1]
- if symmetric:
- # VNFs have two ports
- neutron_port1 = vnf_port[0]
- neutron_port2 = vnf_port[1]
- neutron_ports = [neutron_port1, neutron_port2]
- else:
- neutron_port1 = vnf_port[0]
- neutron_ports = [neutron_port1]
+ port_groups = []
+ for vnf in self.vnfs:
+ # vnf_instance is in [0] and vnf_port in [1]
+ vnf_instance = self.vnf_objects[vnf][0]
+ vnf_port = self.vnf_objects[vnf][1]
+ if symmetric:
+ # VNFs have two ports
+ neutron_port1 = vnf_port[0]
+ neutron_port2 = vnf_port[1]
+ neutron_ports = [neutron_port1, neutron_port2]
+ else:
+ neutron_port1 = vnf_port[0]
+ neutron_ports = [neutron_port1]
port_group = \
openstack_sfc.create_port_groups(neutron_ports,
vnf_instance)
- self.port_groups.append(port_group)
+ port_groups.append(port_group)
+
self.neutron_port = self.port_client
if symmetric:
# We must pass the server_port and server_ip in the symmetric
# case. Otherwise ODL does not work well
server_ip_prefix = self.server_ip + '/32'
- openstack_sfc.create_chain(self.port_groups,
+ openstack_sfc.create_chain(port_groups,
self.neutron_port.id,
port, protocol, vnffg_name,
symmetric,
@@ -483,7 +481,7 @@ class SfcCommonTestCase(object):
server_ip=server_ip_prefix)
else:
- openstack_sfc.create_chain(self.port_groups,
+ openstack_sfc.create_chain(port_groups,
self.neutron_port.id,
port, protocol, vnffg_name,
symmetric)