aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/vnf/ims/orchestra_openims.py
diff options
context:
space:
mode:
authorboucherv <valentin.boucher@orange.com>2017-08-22 12:08:14 +0200
committerboucherv <valentin.boucher@orange.com>2017-09-04 15:44:48 +0200
commit578f831fe90f08028c6e88e103175b9bb698b6c5 (patch)
tree276f39d702b5e304b59113f893898f30df96943f /functest/opnfv_tests/vnf/ims/orchestra_openims.py
parent42562fa3393aa54d1780a428b439cedcd3590a7b (diff)
More support of snaps for VNF
Remove OpenStack utils in vnf_base Support snaps for quotas management in cloudify_ims Change-Id: I44e5b01bb26569276133e85dfc25bc2cceb03056 Signed-off-by: boucherv <valentin.boucher@orange.com>
Diffstat (limited to 'functest/opnfv_tests/vnf/ims/orchestra_openims.py')
-rw-r--r--functest/opnfv_tests/vnf/ims/orchestra_openims.py17
1 files changed, 6 insertions, 11 deletions
diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
index f9a81f22..d9d4d8a1 100644
--- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
@@ -32,7 +32,6 @@ from snaps.openstack.create_network import (
SubnetSettings,
PortSettings)
from snaps.openstack.create_router import OpenStackRouter, RouterSettings
-from snaps.openstack.os_credentials import OSCreds
from snaps.openstack.create_instance import (
VmInstanceSettings, OpenStackVmInstance)
from functest.opnfv_tests.openstack.snaps import snaps_utils
@@ -199,22 +198,18 @@ class OpenImsVnf(vnf.VnfOnBoarding):
self.case_name, config_file)
self.images.update(get_config("tenant_images.%s" %
self.case_name, config_file))
- self.snaps_creds = None
def prepare(self):
"""Prepare testscase (Additional pre-configuration steps)."""
super(OpenImsVnf, self).prepare()
self.logger.info("Additional pre-configuration steps")
- self.logger.info("creds %s", (self.creds))
-
- self.snaps_creds = OSCreds(
- username=self.creds['username'],
- password=self.creds['password'],
- auth_url=self.creds['auth_url'],
- project_name=self.creds['tenant'],
- identity_api_version=int(os_utils.get_keystone_client_version()))
-
+ self.creds = {
+ "tenant": self.tenant_name,
+ "username": self.tenant_name,
+ "password": self.tenant_name,
+ "auth_url": os_utils.get_credentials()['auth_url']
+ }
self.prepare_images()
self.prepare_flavor()
self.prepare_security_groups()