summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2018-07-15 15:11:35 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2018-07-15 15:11:35 +0200
commit38cc424c2a48a14a25b02eea03d70784577753a4 (patch)
treebcf260edaf445569b063f0cf8e7c7c3d68c10318
parente1dc928517e4c852b25cbb8f7455e49d7ce3ede7 (diff)
Define env vars for ODL inputs
It's linked to "Add default param for ODL password" [1]. [1] https://gerrit.opnfv.org/gerrit/#/c/59811/ Change-Id: Ib88d9371a2b6febb5c1af69ffda9b3c5024999e9 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--functest/opnfv_tests/sdn/odl/odl.py8
-rw-r--r--functest/utils/env.py4
2 files changed, 8 insertions, 4 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index 21c879efb..43476d8bf 100644
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -165,10 +165,10 @@ class ODLTests(robotframework.RobotFramework):
'service_id': neutron_id})[0].url
kwargs = {'neutronurl': endpoint}
kwargs['odlip'] = env.get('SDN_CONTROLLER_IP')
- kwargs['odlwebport'] = '8080'
- kwargs['odlrestconfport'] = '8181'
- kwargs['odlusername'] = 'admin'
- kwargs['odlpassword'] = 'admin'
+ kwargs['odlwebport'] = env.get('SDN_CONTROLLER_WEBPORT')
+ kwargs['odlrestconfport'] = env.get('SDN_CONTROLLER_RESTCONFPORT')
+ kwargs['odlusername'] = env.get('SDN_CONTROLLER_USER')
+ kwargs['odlpassword'] = env.get('SDN_CONTROLLER_PASSWORD')
installer_type = env.get('INSTALLER_TYPE')
kwargs['osusername'] = os.environ['OS_USERNAME']
kwargs['osuserdomainname'] = os.environ.get(
diff --git a/functest/utils/env.py b/functest/utils/env.py
index b0b8501f1..cba935ab8 100644
--- a/functest/utils/env.py
+++ b/functest/utils/env.py
@@ -20,6 +20,10 @@ INPUTS = {
'DEPLOY_SCENARIO': env.INPUTS['DEPLOY_SCENARIO'],
'INSTALLER_TYPE': env.INPUTS['INSTALLER_TYPE'],
'SDN_CONTROLLER_IP': None,
+ 'SDN_CONTROLLER_USER': 'admin',
+ 'SDN_CONTROLLER_PASSWORD': 'admin',
+ 'SDN_CONTROLLER_WEBPORT': '8080',
+ 'SDN_CONTROLLER_RESTCONFPORT': '8181',
'BUILD_TAG': env.INPUTS['BUILD_TAG'],
'NODE_NAME': env.INPUTS['NODE_NAME'],
'POD_ARCH': None,