Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add case_name as constructor arg
[functest.git]
/
functest
/
opnfv_tests
/
vnf
/
ims
/
orchestra_ims.py
diff --git
a/functest/opnfv_tests/vnf/ims/orchestra_ims.py
b/functest/opnfv_tests/vnf/ims/orchestra_ims.py
index
d13fe8f
..
213d690
100755
(executable)
--- a/
functest/opnfv_tests/vnf/ims/orchestra_ims.py
+++ b/
functest/opnfv_tests/vnf/ims/orchestra_ims.py
@@
-78,9
+78,9
@@
def servertest(host, port):
class ImsVnf(vnf_base.VnfOnBoardingBase):
class ImsVnf(vnf_base.VnfOnBoardingBase):
- def __init__(self, project='functest', case='orchestra_ims',
+ def __init__(self, project='functest', case
_name
='orchestra_ims',
repo='', cmd=''):
repo='', cmd=''):
- super(ImsVnf, self).__init__(project, case, repo, cmd)
+ super(ImsVnf, self).__init__(project, case
_name
, repo, cmd)
self.ob_password = "openbaton"
self.ob_username = "admin"
self.ob_https = False
self.ob_password = "openbaton"
self.ob_username = "admin"
self.ob_https = False
@@
-311,10
+311,16
@@
class ImsVnf(vnf_base.VnfOnBoardingBase):
creds = os_utils.get_credentials()
self.logger.info("PoP creds: %s" % creds)
creds = os_utils.get_credentials()
self.logger.info("PoP creds: %s" % creds)
+ project_id = os_utils.get_tenant_id(
+ os_utils.get_keystone_client(),
+ creds.get("project_name"))
+
+ self.logger.debug("project id: %s" % project_id)
+
vim_json = {
"name": "vim-instance",
"authUrl": creds.get("auth_url"),
vim_json = {
"name": "vim-instance",
"authUrl": creds.get("auth_url"),
- "tenant":
os.environ.get("OS_PROJECT_ID")
,
+ "tenant":
project_id
,
"username": creds.get("username"),
"password": creds.get("password"),
"securityGroups": [
"username": creds.get("username"),
"password": creds.get("password"),
"securityGroups": [