summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2018-03-20 08:21:45 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-20 08:21:45 +0000
commit2cbcd325ce64eff9d545d70b542e099ddff7a052 (patch)
tree77d93de55915fafe5f9dda48a334ac7f314d43df
parent0402dfb0e0a720ff0be42ac730afc25f54fef2eb (diff)
parent2c4c5eec6a31f4152d51ee67ea1e6a5a6196a099 (diff)
Merge "Remove unused code in vyos_vrouter"
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index 3b3cd3018..0f463128b 100644
--- 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 = ''
- self.util_info = {}
self.deployment_name = ''
config_file = os.path.join(self.case_dir, self.config)
@@ -390,11 +389,7 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
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,