summaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
diff options
context:
space:
mode:
authorShuyaNakama <shuya.nakama@okinawaopenlabs.org>2017-12-14 17:37:33 +0000
committerShuyaNakama <shuya.nakama@okinawaopenlabs.org>2017-12-14 17:37:40 +0000
commitfc0d8c601ce627d5f7b8c5e3eef73bd01c6db7d4 (patch)
treec16e766291612d03494e4c2a4563bddd834ada89 /functest/opnfv_tests/vnf/router/cloudify_vrouter.py
parent7d834311d2828437bc5350efb0792062b59ace56 (diff)
[vyos_vrouter] Support https endpoints
JIRA: FUNCTEST-881 vyos_vrouter did not support https endpoints [1]. I fixed the following two points. 1. Modifying blueprint of Cloudify. 2. Changing nova client of utilvnf module. Point 1 I added command of support https endpoint to blueprint of vyos_vrouter. The Blueprint of vyos_vrouter is on our github repository [2]. I updated our repository. Point 2 I changed nova client of utilvnf module. Utilvnf module is utility module of vyos_vrouter. Nova client of utilvnf module did not support https endpoints. So, I changed to use nova client of snaps. After fixed the source code, I confirmed the vyos_vrouter was succeeded in the following two environments. 1. Our labs (Instoller:fuel, environment of https endpoints) 2. Orange POD (Instoller:compass, environment of http endpoints) [1] https://jira.opnfv.org/browse/FUNCTEST-881 [2] https://github.com/oolorg/opnfv-vnf-vyos-blueprint/blob/master/function-test-openstack-blueprint.yaml Change-Id: I468df0f2486a34bc558ad161eb7de44264549006 Signed-off-by: ShuyaNakama <shuya.nakama@okinawaopenlabs.org>
Diffstat (limited to 'functest/opnfv_tests/vnf/router/cloudify_vrouter.py')
-rw-r--r--functest/opnfv_tests/vnf/router/cloudify_vrouter.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index 788a94132..f2cd63fb2 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -112,10 +112,7 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
self.__logger.info("Additional pre-configuration steps")
- self.util.set_credentials(self.snaps_creds.username,
- self.snaps_creds.password,
- self.snaps_creds.auth_url,
- self.snaps_creds.project_name)
+ self.util.set_credentials(self.snaps_creds)
# needs some images
self.__logger.info("Upload some OS images if it doesn't exist")
@@ -370,7 +367,8 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
def test_vnf(self):
cfy_client = self.orchestrator['object']
- credentials = {"username": self.snaps_creds.username,
+ 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}