aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py7
-rw-r--r--requirements.txt2
-rw-r--r--upper-constraints.txt2
3 files changed, 2 insertions, 9 deletions
diff --git a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
index 309709276..1dd85a118 100644
--- a/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
+++ b/functest/opnfv_tests/openstack/snaps/snaps_suite_builder.py
@@ -76,8 +76,6 @@ from snaps.openstack.utils.tests.neutron_utils_tests import (
from snaps.openstack.utils.tests.nova_utils_tests import (
NovaSmokeTests, NovaUtilsKeypairTests, NovaUtilsFlavorTests,
NovaUtilsInstanceTests, NovaUtilsInstanceVolumeTests)
-from snaps.provisioning.tests.ansible_utils_tests import (
- AnsibleProvisioningTests)
def add_openstack_client_tests(suite, os_creds, ext_net_name,
@@ -434,8 +432,3 @@ def add_openstack_integration_tests(suite, os_creds, ext_net_name,
ext_net_name=ext_net_name, use_keystone=use_keystone,
flavor_metadata=flavor_metadata, image_metadata=image_metadata,
log_level=log_level))
- suite.addTest(OSIntegrationTestCase.parameterize(
- AnsibleProvisioningTests, os_creds=os_creds,
- ext_net_name=ext_net_name, use_keystone=use_keystone,
- flavor_metadata=flavor_metadata, image_metadata=image_metadata,
- log_level=log_level))
diff --git a/requirements.txt b/requirements.txt
index 7e15cd5fe..298cc38ad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ cloudify-rest-client
mock # BSD
PrettyTable<0.8 # BSD
six # MIT
-snaps-oo
+snaps
paramiko # LGPLv2.1+
Jinja2 # BSD License (3 clause)
xtesting
diff --git a/upper-constraints.txt b/upper-constraints.txt
index cb7c42ff1..ec82f6f6b 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -1,6 +1,6 @@
git+https://gerrit.opnfv.org/gerrit/functest@stable/hunter#egg=functest
git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules
-git+https://gerrit.opnfv.org/gerrit/snaps@7c8b405bc02d5b489beb359f86ba57c831648897#egg=snaps-oo
+git+https://gerrit.opnfv.org/gerrit/snaps@0dacfaa2fbd2dfe7fc9d438b9350a0187506e61c#egg=snaps
git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests
git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn
git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc