Code Review
/
functest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Remove last CONST.__getattribute__()
[functest.git]
/
functest
/
opnfv_tests
/
vnf
/
ims
/
orchestra_openims.py
diff --git
a/functest/opnfv_tests/vnf/ims/orchestra_openims.py
b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
index
d609a0f
..
c35ec8c
100644
(file)
--- a/
functest/opnfv_tests/vnf/ims/orchestra_openims.py
+++ b/
functest/opnfv_tests/vnf/ims/orchestra_openims.py
@@
-151,14
+151,14
@@
class OpenImsVnf(vnf.VnfOnBoarding):
self.case_dir = pkg_resources.resource_filename(
'functest', 'opnfv_tests/vnf/ims/')
self.case_dir = pkg_resources.resource_filename(
'functest', 'opnfv_tests/vnf/ims/')
- self.data_dir =
CONST.__getattribute__(
'dir_ims_data')
- self.test_dir =
CONST.__getattribute__(
'dir_repo_vims_test')
+ self.data_dir =
getattr(CONST,
'dir_ims_data')
+ self.test_dir =
getattr(CONST,
'dir_repo_vims_test')
self.created_resources = []
self.logger.info("%s VNF onboarding test starting", self.case_name)
try:
self.created_resources = []
self.logger.info("%s VNF onboarding test starting", self.case_name)
try:
- self.config =
CONST.__getattribute__
(
- 'vnf_{}_config'.format(self.case_name))
+ self.config =
getattr
(
+
CONST,
'vnf_{}_config'.format(self.case_name))
except BaseException:
raise Exception("Orchestra VNF config file not found")
config_file = self.case_dir + self.config
except BaseException:
raise Exception("Orchestra VNF config file not found")
config_file = self.case_dir + self.config
@@
-206,9
+206,9
@@
class OpenImsVnf(vnf.VnfOnBoarding):
self.logger.info("Additional pre-configuration steps")
self.creds = {
self.logger.info("Additional pre-configuration steps")
self.creds = {
- "tenant": self.
tenan
t_name,
- "username": self.
tenant_
name,
- "password": self.
tenant_name
,
+ "tenant": self.
snaps_creds.projec
t_name,
+ "username": self.
snaps_creds.user
name,
+ "password": self.
snaps_creds.password
,
"auth_url": public_auth_url
}
self.prepare_images()
"auth_url": public_auth_url
}
self.prepare_images()