diff options
| -rw-r--r-- | docker/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/requirements.pip | 8 | ||||
| -rw-r--r-- | functest/ci/exec_test.sh | 2 | ||||
| -rw-r--r-- | functest/cli/commands/cli_testcase.py | 4 | ||||
| -rw-r--r-- | functest/cli/commands/cli_tier.py | 4 | ||||
| -rwxr-xr-x | functest/opnfv_tests/features/sfc/sfc.py | 23 |
6 files changed, 29 insertions, 18 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index a51e3046e..e8cef3c0c 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -122,9 +122,13 @@ ADD http://205.177.226.237:9999/onosfw/firewall_block_image.img /home/opnfv/func RUN gpg --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 RUN curl -L https://get.rvm.io | bash -s stable +# SNAPS integration +RUN git clone --depth 1 https://gerrit.cablelabs.com/snaps-provisioning ${repos_dir}/snaps +RUN pip install -e ${repos_dir}/snaps/ + RUN /bin/bash -c ". /home/opnfv/repos/functest/functest/opnfv_tests/features/sfc/tacker_client_install.sh" RUN cd ${repos_dir}/bgpvpn && pip install . -RUN cd ${repos_dir}/kingbird && pip install -e . +#RUN cd ${repos_dir}/kingbird && pip install -e . RUN cd ${repos_dir}/moon/moonclient/ && python setup.py install RUN /bin/bash -c ". /etc/profile.d/rvm.sh \ diff --git a/docker/requirements.pip b/docker/requirements.pip index c3f77997c..ed941bc19 100644 --- a/docker/requirements.pip +++ b/docker/requirements.pip @@ -10,9 +10,10 @@ pyyaml==3.10 gitpython==1.0.1 python-openstackclient==2.3.0 -python-ceilometerclient==1.5.1 -python-keystoneclient==3.6.0 -python-neutronclient==4.1.1 +python-ceilometerclient==2.6.2 +python-keystoneclient==3.5.0 +python-neutronclient==6.0.0 +python-congressclient==1.5.0 virtualenv==1.11.4 pexpect==4.0 requests==2.8.0 @@ -24,7 +25,6 @@ Flask==0.10.1 xmltodict==0.9.2 scp==0.10.2 paramiko==1.16.0 -python-congressclient==1.3.0 subprocess32 shyaml dnspython diff --git a/functest/ci/exec_test.sh b/functest/ci/exec_test.sh index 564953010..234a4d241 100644 --- a/functest/ci/exec_test.sh +++ b/functest/ci/exec_test.sh @@ -160,11 +160,13 @@ function run_test(){ python ${FUNCTEST_TEST_DIR}/features/domino.py $report ;; "odl-sfc") + pip install --upgrade python-keystoneclient==1.7.4 ODL_SFC_DIR=${FUNCTEST_TEST_DIR}/features/sfc # pass FUNCTEST_REPO_DIR inside prepare_odl_sfc.bash FUNCTEST_REPO_DIR=${FUNCTEST_REPO_DIR} python ${ODL_SFC_DIR}/prepare_odl_sfc.py || exit $? source ${ODL_SFC_DIR}/tackerc python ${ODL_SFC_DIR}/sfc.py $report + pip install --upgrade python-keystoneclient==3.5.0 ;; "parser") python ${FUNCTEST_TEST_DIR}/vnf/vRNC/parser.py $report diff --git a/functest/cli/commands/cli_testcase.py b/functest/cli/commands/cli_testcase.py index 510d740ba..da78ae9c9 100644 --- a/functest/cli/commands/cli_testcase.py +++ b/functest/cli/commands/cli_testcase.py @@ -55,9 +55,9 @@ class CliTestcase: "Run first 'functest env prepare'") else: if noclean: - cmd = ("python %s/ci/run_tests.py " + cmd = ("python %s/functest/ci/run_tests.py " "-n -t %s" % (FUNCTEST_REPO, testname)) else: - cmd = ("python %s/ci/run_tests.py " + cmd = ("python %s/functest/ci/run_tests.py " "-t %s" % (FUNCTEST_REPO, testname)) ft_utils.execute_command(cmd) diff --git a/functest/cli/commands/cli_tier.py b/functest/cli/commands/cli_tier.py index aa0541981..fa2de587c 100644 --- a/functest/cli/commands/cli_tier.py +++ b/functest/cli/commands/cli_tier.py @@ -65,9 +65,9 @@ class CliTier: "Run first 'functest env prepare'") else: if noclean: - cmd = ("python %s/ci/run_tests.py " + cmd = ("python %s/functest/ci/run_tests.py " "-n -t %s" % (FUNCTEST_REPO, tiername)) else: - cmd = ("python %s/ci/run_tests.py " + cmd = ("python %s/functest/ci/run_tests.py " "-t %s" % (FUNCTEST_REPO, tiername)) ft_utils.execute_command(cmd) diff --git a/functest/opnfv_tests/features/sfc/sfc.py b/functest/opnfv_tests/features/sfc/sfc.py index 5e3e37d7c..e048d90f0 100755 --- a/functest/opnfv_tests/features/sfc/sfc.py +++ b/functest/opnfv_tests/features/sfc/sfc.py @@ -414,15 +414,20 @@ def capture_time_log(compute_clients): while True: rsps = ovs_logger.ofctl_time_counter(compute_clients[0]) if not i: - first_RSP = rsps[0] - i = i + 1 - if(first_RSP != rsps[0]): - if (rsps[0] == rsps[1]): - stop_time = time.time() - logger.info("classification rules updated") - difference = stop_time - start_time - logger.info("It took %s seconds" % difference) - break + if len(rsps) > 0: + first_RSP = rsps[0] + i = i + 1 + else: + first_RSP = 0 + i = i + 1 + if (len(rsps) > 1): + if(first_RSP != rsps[0]): + if (rsps[0] == rsps[1]): + stop_time = time.time() + logger.info("classification rules updated") + difference = stop_time - start_time + logger.info("It took %s seconds" % difference) + break time.sleep(1) return |