Merge "Return UnsupportedOptionError() on loadbalancer failover"
This commit is contained in:
commit
cca9d464fa
|
@ -46,7 +46,6 @@ SERVICE_AUTH = 'service_auth'
|
|||
# Request type constants
|
||||
REQ_TYPE_LB_CREATE = 'lb_create'
|
||||
REQ_TYPE_LB_DELETE = 'lb_delete'
|
||||
REQ_TYPE_LB_FAILOVER = 'lb_failover'
|
||||
REQ_TYPE_LB_UPDATE = 'lb_update'
|
||||
REQ_TYPE_LISTENER_CREATE = 'listener_create'
|
||||
REQ_TYPE_LISTENER_DELETE = 'listener_delete'
|
||||
|
|
|
@ -89,10 +89,10 @@ class OvnProviderDriver(driver_base.ProviderDriver):
|
|||
self._ovn_helper.add_request(request)
|
||||
|
||||
def loadbalancer_failover(self, loadbalancer_id):
|
||||
request_info = {'id': loadbalancer_id}
|
||||
request = {'type': ovn_const.REQ_TYPE_LB_FAILOVER,
|
||||
'info': request_info}
|
||||
self._ovn_helper.add_request(request)
|
||||
msg = _('OVN provider does not support loadbalancer failover')
|
||||
raise driver_exceptions.UnsupportedOptionError(
|
||||
user_fault_string=msg,
|
||||
operator_fault_string=msg)
|
||||
|
||||
def loadbalancer_update(self, old_loadbalancer, new_loadbalancer):
|
||||
request_info = {'id': new_loadbalancer.loadbalancer_id}
|
||||
|
|
|
@ -66,7 +66,6 @@ class OvnProviderHelper():
|
|||
ovn_const.REQ_TYPE_LB_CREATE: self.lb_create,
|
||||
ovn_const.REQ_TYPE_LB_DELETE: self.lb_delete,
|
||||
ovn_const.REQ_TYPE_LB_UPDATE: self.lb_update,
|
||||
ovn_const.REQ_TYPE_LB_FAILOVER: self.lb_failover,
|
||||
ovn_const.REQ_TYPE_LISTENER_CREATE: self.listener_create,
|
||||
ovn_const.REQ_TYPE_LISTENER_DELETE: self.listener_delete,
|
||||
ovn_const.REQ_TYPE_LISTENER_UPDATE: self.listener_update,
|
||||
|
@ -980,13 +979,6 @@ class OvnProviderHelper():
|
|||
self._execute_commands(commands)
|
||||
return status
|
||||
|
||||
def lb_failover(self, loadbalancer):
|
||||
status = {
|
||||
constants.LOADBALANCERS: [
|
||||
{constants.ID: loadbalancer[constants.ID],
|
||||
constants.PROVISIONING_STATUS: constants.ACTIVE}]}
|
||||
return status
|
||||
|
||||
def lb_update(self, loadbalancer):
|
||||
lb_status = {constants.ID: loadbalancer[constants.ID],
|
||||
constants.PROVISIONING_STATUS: constants.ACTIVE}
|
||||
|
|
|
@ -268,6 +268,10 @@ class TestOvnOctaviaProviderDriver(ovn_base.TestOvnOctaviaBase):
|
|||
self.assertRaises(o_exceptions.UnsupportedOptionError,
|
||||
self.ovn_driver.pool_create, m_pool)
|
||||
|
||||
self.assertRaises(o_exceptions.UnsupportedOptionError,
|
||||
self.ovn_driver.loadbalancer_failover,
|
||||
lb_data['model'].loadbalancer_id)
|
||||
|
||||
m_listener = self._create_listener_model(
|
||||
lb_data['model'].loadbalancer_id, m_pool.pool_id, 80)
|
||||
m_listener.protocol = o_constants.PROTOCOL_HTTP
|
||||
|
|
|
@ -456,11 +456,9 @@ class TestOvnProviderDriver(ovn_base.TestOvnOctaviaBase):
|
|||
self.mock_add_request.assert_called_once_with(expected_dict)
|
||||
|
||||
def test_loadbalancer_failover(self):
|
||||
info = {'id': self.ref_lb0.loadbalancer_id}
|
||||
expected_dict = {'type': ovn_const.REQ_TYPE_LB_FAILOVER,
|
||||
'info': info}
|
||||
self.driver.loadbalancer_failover(info['id'])
|
||||
self.mock_add_request.assert_called_once_with(expected_dict)
|
||||
self.assertRaises(exceptions.UnsupportedOptionError,
|
||||
self.driver.loadbalancer_failover,
|
||||
self.ref_lb0.loadbalancer_id)
|
||||
|
||||
def test_pool_create_unsupported_protocol(self):
|
||||
self.ref_pool.protocol = 'HTTP'
|
||||
|
|
|
@ -528,11 +528,6 @@ class TestOvnProviderHelper(ovn_base.TestOvnOctaviaBase):
|
|||
mock.call(self.ovn_lb.uuid),
|
||||
mock.call(udp_lb.uuid)])
|
||||
|
||||
def test_lb_failover(self):
|
||||
status = self.helper.lb_failover(self.lb)
|
||||
self.assertEqual(status['loadbalancers'][0]['provisioning_status'],
|
||||
constants.ACTIVE)
|
||||
|
||||
@mock.patch.object(ovn_helper.OvnProviderHelper, '_refresh_lb_vips')
|
||||
def test_lb_update_disabled(self, refresh_vips):
|
||||
self.lb['admin_state_up'] = False
|
||||
|
|
Loading…
Reference in New Issue