diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-25 10:51:32 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2018-08-25 11:59:37 +0200 |
| commit | 330c9cd57f1fa27b7f3bc018a49b885308c22138 (patch) | |
| tree | 97564ab31f5259d4e8707f9be0e8259674195470 | |
| parent | 2cb24dc687ca621c177c4881bc6b023999b63589 (diff) | |
Remove INSTALLER_TYPE logics in odl
JIRA: APEX-621
JIRA: COMPASS-606
Change-Id: I76dde66aefc67f80b40496f705f2864ea9355dcf
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
| -rw-r--r-- | functest/opnfv_tests/sdn/odl/odl.py | 6 | ||||
| -rw-r--r-- | functest/tests/unit/odl/test_odl.py | 35 |
2 files changed, 1 insertions, 40 deletions
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py index 03e759182..17600a316 100644 --- a/functest/opnfv_tests/sdn/odl/odl.py +++ b/functest/opnfv_tests/sdn/odl/odl.py @@ -169,7 +169,6 @@ class ODLTests(robotframework.RobotFramework): 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( 'OS_USER_DOMAIN_NAME', 'Default') @@ -178,11 +177,6 @@ class ODLTests(robotframework.RobotFramework): 'OS_PROJECT_DOMAIN_NAME', 'Default') kwargs['osauthurl'] = os.environ['OS_AUTH_URL'] kwargs['ospassword'] = os.environ['OS_PASSWORD'] - if installer_type == 'apex' or installer_type == 'netvirt': - kwargs['odlwebport'] = '8081' - kwargs['odlrestconfport'] = '8081' - elif installer_type == 'compass': - kwargs['odlrestconfport'] = '8080' assert kwargs['odlip'] except KeyError as ex: self.__logger.error( diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py index 6a2c5ad55..f65170453 100644 --- a/functest/tests/unit/odl/test_odl.py +++ b/functest/tests/unit/odl/test_odl.py @@ -49,7 +49,7 @@ class ODLTesting(unittest.TestCase): _os_interface = "public" def setUp(self): - for var in ("INSTALLER_TYPE", "SDN_CONTROLLER", "SDN_CONTROLLER_IP"): + for var in ("SDN_CONTROLLER", "SDN_CONTROLLER_IP"): if var in os.environ: del os.environ[var] os.environ["OS_AUTH_URL"] = self._os_auth_url @@ -533,39 +533,6 @@ class ODLRunTesting(ODLTesting): odlip=self._sdn_controller_ip, odlwebport=self._odl_webport) - def test_apex_no_controller_ip(self): - os.environ["INSTALLER_TYPE"] = "apex" - self._test_missing_value() - - def test_apex(self): - os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip - os.environ["INSTALLER_TYPE"] = "apex" - self._test_run(testcase.TestCase.EX_OK, None, - odlip=self._sdn_controller_ip, odlwebport='8081', - odlrestconfport='8081') - - def test_netvirt_no_controller_ip(self): - os.environ["INSTALLER_TYPE"] = "netvirt" - self._test_missing_value() - - def test_netvirt(self): - os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip - os.environ["INSTALLER_TYPE"] = "netvirt" - self._test_run(testcase.TestCase.EX_OK, None, - odlip=self._sdn_controller_ip, odlwebport='8081', - odlrestconfport='8081') - - def test_compass(self): - os.environ["SDN_CONTROLLER_IP"] = self._sdn_controller_ip - os.environ["INSTALLER_TYPE"] = "compass" - self._test_run(testcase.TestCase.EX_OK, None, - odlip=self._sdn_controller_ip, - odlrestconfport='8080') - - def test_compass_no_controller_ip(self): - os.environ["INSTALLER_TYPE"] = "compass" - self._test_missing_value() - class ODLArgParserTesting(ODLTesting): |