diff options
author | George Paraskevopoulos <geopar@intracom-telecom.com> | 2017-03-22 16:15:56 +0200 |
---|---|---|
committer | George Paraskevopoulos <geopar@intracom-telecom.com> | 2017-03-27 16:56:08 +0300 |
commit | b23c753e79172a2f865804854f80fb3b963d6f8e (patch) | |
tree | b396ef57265eb84287eb7ff22f0b6abc0ebf6e66 /sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | |
parent | 9ed03234419c6d6bfb6467bb0c48a45d722ac090 (diff) |
Rewrite classification rules wait loop
This is a candidate replacement for the wait_for_classification_rules
function. The functionality is as follows:
- Query ODL operational datastore for the RSPs for which we should
expect to see flows in the computes (RSPs for which ACL rules exist)
and associate them with a list of vnfs. Also get the tp_dst from the
ACL match rules.
- Use the known topology to associate the RSPs to a set of compute nodes
(at this point we know that ODL promised us that we should see
classification rules for a particular rsp in the nodes C1, C2 ...)
- Gather the installed flows in table=11 in each compute
- Verify that the RSPs are installed as promised by ODL for the correct
tp_dst
Change-Id: I79747ad1df3eb0c67f783167601b5ea99fb43f16
Signed-off-by: George Paraskevopoulos <geopar@intracom-telecom.com>
Diffstat (limited to 'sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py')
-rw-r--r-- | sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py index 54cacbc7..2c688412 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -190,11 +190,10 @@ def main(): logger.info(test_utils.run_cmd('tacker sfc-list')[1]) logger.info(test_utils.run_cmd('tacker sfc-classifier-list')[1]) - num_chains = 2 - # Start measuring the time it takes to implement the classification rules t1 = threading.Thread(target=test_utils.wait_for_classification_rules, - args=(ovs_logger, compute_clients, num_chains,)) + args=(ovs_logger, compute_nodes, odl_ip, odl_port, + testTopology,)) try: t1.start() @@ -269,7 +268,8 @@ def main(): # Start measuring the time it takes to implement the classification rules t2 = threading.Thread(target=test_utils.wait_for_classification_rules, - args=(ovs_logger, compute_clients, num_chains,)) + args=(ovs_logger, compute_nodes, odl_ip, odl_port, + testTopology,)) try: t2.start() except Exception, e: |