aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2017-09-07 11:30:14 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-07 11:30:14 +0000
commit5c95b492ff11f9f5373a643ad05cc23f29036d0b (patch)
tree7c73729a15f4b0e3b004f23b9781579708572b5b
parent4b8a9ec3bea182dc7d2c4e08dd38e7b509aeaad3 (diff)
parent42471ae077360d24105e336ad397da65e3ba2a25 (diff)
Merge "Fix creds used by vrouter"
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.py16
1 files changed, 4 insertions, 12 deletions
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index c3cccb989..edbdb495f 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -25,7 +25,6 @@ import functest.utils.openstack_utils as os_utils
from git import Repo
-from snaps.openstack.os_credentials import OSCreds
from snaps.openstack.create_network import (NetworkSettings, SubnetSettings,
OpenStackNetwork)
from snaps.openstack.create_security_group import (SecurityGroupSettings,
@@ -110,17 +109,10 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
self.__logger.info("Additional pre-configuration steps")
- 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.util.set_credentials(self.creds["username"],
- self.creds["password"],
- self.creds["auth_url"],
- self.creds["tenant"])
+ self.util.set_credentials(self.snaps_creds.username,
+ self.snaps_creds.password,
+ self.snaps_creds.auth_url,
+ self.snaps_creds.project_name)
# needs some images
self.__logger.info("Upload some OS images if it doesn't exist")