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 unused code in vyos_vrouter
[functest.git]
/
functest
/
opnfv_tests
/
vnf
/
router
/
cloudify_vrouter.py
diff --git
a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index
e23bba1
..
0f46312
100644
(file)
--- a/
functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/
functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@
-75,7
+75,6
@@
class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
raise Exception("VNF config file not found")
self.cfy_manager_ip = ''
raise Exception("VNF config file not found")
self.cfy_manager_ip = ''
- self.util_info = {}
self.deployment_name = ''
config_file = os.path.join(self.case_dir, self.config)
self.deployment_name = ''
config_file = os.path.join(self.case_dir, self.config)
@@
-263,10
+262,10
@@
class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
while str(cfy_status) != 'running' and retry:
try:
cfy_status = cfy_client.manager.get_status()['status']
while str(cfy_status) != 'running' and retry:
try:
cfy_status = cfy_client.manager.get_status()['status']
- self.__logger.
debug("The current manager status is %s",
-
cfy_status)
+ self.__logger.
info(
+
"The current manager status is %s",
cfy_status)
except Exception: # pylint: disable=broad-except
except Exception: # pylint: disable=broad-except
- self.__logger.
exception
(
+ self.__logger.
info
(
"Cloudify Manager isn't up and running. Retrying ...")
retry = retry - 1
time.sleep(30)
"Cloudify Manager isn't up and running. Retrying ...")
retry = retry - 1
time.sleep(30)
@@
-352,6
+351,10
@@
class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
keystone_password=snaps_creds.password))
self.vnf['inputs'].update(dict(
keystone_tenant_name=snaps_creds.project_name))
keystone_password=snaps_creds.password))
self.vnf['inputs'].update(dict(
keystone_tenant_name=snaps_creds.project_name))
+ self.vnf['inputs'].update(dict(
+ keystone_user_domain_name=snaps_creds.user_domain_name))
+ self.vnf['inputs'].update(dict(
+ keystone_project_domain_name=snaps_creds.project_domain_name))
self.vnf['inputs'].update(dict(
region=snaps_creds.region_name))
self.vnf['inputs'].update(dict(
self.vnf['inputs'].update(dict(
region=snaps_creds.region_name))
self.vnf['inputs'].update(dict(
@@
-386,11
+389,7
@@
class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
def test_vnf(self):
cfy_client = self.orchestrator['object']
def test_vnf(self):
cfy_client = self.orchestrator['object']
- credentials = {"snaps_creds": self.snaps_creds,
- "username": self.snaps_creds.username,
- "password": self.snaps_creds.password,
- "auth_url": self.snaps_creds.auth_url,
- "tenant_name": self.snaps_creds.project_name}
+ credentials = {"snaps_creds": self.snaps_creds}
self.util_info = {"credentials": credentials,
"cfy": cfy_client,
self.util_info = {"credentials": credentials,
"cfy": cfy_client,