From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Mon, 19 Mar 2018 16:56:42 +0000 (+0100)
Subject: Conform with vyos descritor updates
X-Git-Tag: opnfv-6.0.0~66
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F27%2F54127%2F1;p=functest.git

Conform with vyos descritor updates

The new inputs [1] must be set else the testcase simply fails [2].

JIRA: FUNCTEST-936

[1] https://github.com/oolorg/opnfv-vnf-vyos-blueprint/commit/794f8a0594ed4c461c7d1d08d6b0ef9fb12004e2
[2] https://build.opnfv.org/ci/view/functest/job/functest-daisy-baremetal-daily-master/12/console

Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Change-Id: I1113581feac7d4dc901ba197caed4fddd5994929
---

diff --git a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
index 6b9145855..3b3cd3018 100644
--- a/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
+++ b/functest/opnfv_tests/vnf/router/cloudify_vrouter.py
@@ -352,6 +352,10 @@ class CloudifyVrouter(vrouter_base.VrouterOnBoardingBase):
             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(