diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | sfc/lib/utils.py | 7 | ||||
| -rw-r--r-- | sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml | 2 | ||||
| -rw-r--r-- | sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml | 2 |
4 files changed, 12 insertions, 2 deletions
@@ -1,3 +1,6 @@ /docs_build/ /docs_output/ /releng/ +*pyc +/sfc.egg-info/ +*ovs-logs/ diff --git a/sfc/lib/utils.py b/sfc/lib/utils.py index 2f98f6ff..02782765 100644 --- a/sfc/lib/utils.py +++ b/sfc/lib/utils.py @@ -34,6 +34,8 @@ def run_cmd(cmd): stderr=subprocess.PIPE) (output, errors) = pipe.communicate() + logger.debug("running [%s] returns: <%s> - %s " + "" % (cmd, pipe.returncode, output)) if output: output = output.strip() if pipe.returncode != 0 or len(errors) > 0: @@ -400,8 +402,9 @@ def setup_compute_node(cidr): ip_computes = get_openstack_node_ips("compute") for ip_compute in ip_computes: run_cmd_on_compute("ifconfig br-int up", ip_compute) - if not run_cmd_on_compute("ip route|grep -o %s" % cidr, ip_compute): + if not run_cmd_on_compute( + "ip route|grep -o %s || true" % cidr, ip_compute): logger.info("adding route %s in %s" % (cidr, ip_compute)) - run_cmd_on_compute("ip route add %s" % cidr, ip_compute) + run_cmd_on_compute("ip route add %s dev br-int" % cidr, ip_compute) else: logger.info("route %s exists" % cidr) diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml index fd862ea0..1d8da125 100644 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml @@ -20,6 +20,8 @@ vdus: management: true placement_policy: + # TODO: This availability zone is changed by the test case on the fly. + # See JIRA SFC-73 for more info availability_zone: nova auto-scaling: noop diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml index 5451358d..280fc9e5 100644 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml +++ b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml @@ -20,6 +20,8 @@ vdus: management: true placement_policy: + # TODO: This availability zone is changed by the test case on the fly. + # See JIRA SFC-73 for more info availability_zone: nova auto-scaling: noop |