summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
9476136)
Joid doesn't support ODL and this exception is no longer needed.
It will be a simple switch from SDN_CONTROLLER to SDN_CONTROLLER_IP
if Joid supports ODL again.
Change-Id: I925965f9c1adf24914e4110ff3206443f4063ac8
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP']
kwargs['odlwebport'] = '8081'
kwargs['odlrestconfport'] = '8081'
kwargs['odlip'] = os.environ['SDN_CONTROLLER_IP']
kwargs['odlwebport'] = '8081'
kwargs['odlrestconfport'] = '8081'
- elif installer_type == 'joid':
- kwargs['odlip'] = os.environ['SDN_CONTROLLER']
elif installer_type == 'compass':
kwargs['odlrestconfport'] = '8080'
elif installer_type == 'daisy':
elif installer_type == 'compass':
kwargs['odlrestconfport'] = '8080'
elif installer_type == 'daisy':
odlip=self._sdn_controller_ip, odlwebport='8081',
odlrestconfport='8081')
odlip=self._sdn_controller_ip, odlwebport='8081',
odlrestconfport='8081')
- def test_joid_no_controller_ip(self):
- os.environ["INSTALLER_TYPE"] = "joid"
- self.assertEqual(self.test.run(), testcase.TestCase.EX_RUN_ERROR)
-
- def test_joid(self):
- os.environ["SDN_CONTROLLER"] = self._sdn_controller_ip
- os.environ["INSTALLER_TYPE"] = "joid"
- self._test_run(testcase.TestCase.EX_OK, None,
- odlip=self._sdn_controller_ip, odlwebport='8080')
-
def test_compass(self):
os.environ["INSTALLER_TYPE"] = "compass"
self._test_run(testcase.TestCase.EX_OK, None,
def test_compass(self):
os.environ["INSTALLER_TYPE"] = "compass"
self._test_run(testcase.TestCase.EX_OK, None,