diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-04-11 08:51:42 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-04-11 08:54:00 +0200 |
| commit | 492b5543103a25b51740b82a291b087f68d932eb (patch) | |
| tree | 92946117213d82e8dfb5febc64085053a5031cb6 /functest/opnfv_tests/sdn/odl | |
| parent | 941838f1b7e574e738b359ee3bb542d04eb97176 (diff) | |
Leverage on SDN_CONTROLLER_IP if fuel
It conforms with [1].
[1] https://jira.opnfv.org/browse/FUEL-352
Change-Id: Idae142de8de09203509c73c35c2e7fea5a5d880b
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/sdn/odl')
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index ac471b285..7c61e88df 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -160,8 +160,7 @@ class ODLTests(robotframework.RobotFramework): snaps_creds = snaps_utils.get_credentials() kwargs = {'neutronurl': keystone_utils.get_endpoint( snaps_creds, 'network')} - kwargs['odlip'] = urllib.parse.urlparse( - kwargs['neutronurl']).hostname + kwargs['odlip'] = env.get('SDN_CONTROLLER_IP') kwargs['odlwebport'] = '8080' kwargs['odlrestconfport'] = '8181' kwargs['odlusername'] = 'admin' @@ -179,18 +178,13 @@ class ODLTests(robotframework.RobotFramework): kwargs['odlwebport'] = '8282' kwargs['odlrestconfport'] = '8282' elif installer_type == 'apex' or installer_type == 'netvirt': - kwargs['odlip'] = env.get('SDN_CONTROLLER_IP') kwargs['odlwebport'] = '8081' kwargs['odlrestconfport'] = '8081' elif installer_type == 'compass': - kwargs['odlip'] = env.get('SDN_CONTROLLER_IP') kwargs['odlrestconfport'] = '8080' elif installer_type == 'daisy': - kwargs['odlip'] = env.get('SDN_CONTROLLER_IP') kwargs['odlwebport'] = '8181' kwargs['odlrestconfport'] = '8087' - else: - kwargs['odlip'] = env.get('SDN_CONTROLLER_IP') assert kwargs['odlip'] except KeyError as ex: self.__logger.error("Cannot run ODL testcases. " |