Merge "Do not send status update in case of IpAddressAlreadyAllocated"

ovn_octavia_provider/driver.py

@@ -368,5 +368,10 @@ class OvnProviderDriver(driver_base.ProviderDriver):
             vip_dict[constants.VIP_ADDRESS] = (
                 port['fixed_ips'][0]['ip_address'])
         except Exception as e:
-            raise driver_exceptions.DriverError(e)
+            kwargs = {}
+            if hasattr(e, 'message'):
+                kwargs = {'user_fault_string': e.message,
+                          'operator_fault_string': e.message}
+            raise driver_exceptions.DriverError(
+                **kwargs)
         return vip_dict

ovn_octavia_provider/helper.py

@@ -1675,7 +1675,7 @@ class OvnProviderHelper(object):
         neutron_client = clients.get_neutron_client()
         try:
             return neutron_client.create_port(port)
-        except n_exc.IpAddressAlreadyAllocatedClient:
+        except n_exc.IpAddressAlreadyAllocatedClient as e:
             # Sometimes the VIP is already created (race-conditions)
             # Lets get the it from Neutron API.
             ports = neutron_client.list_ports(
@@ -1684,13 +1684,7 @@ class OvnProviderHelper(object):
             if not ports['ports']:
                 LOG.error('Cannot create/get LoadBalancer VIP port with '
                           'fixed IP: %s', vip_d[constants.VIP_ADDRESS])
-                status = {
-                    constants.LOADBALANCERS: [{
-                        constants.ID: lb_id,
-                        constants.PROVISIONING_STATUS: constants.ERROR,
-                        constants.OPERATING_STATUS: constants.ERROR}]}
-                self._update_status_to_octavia(status)
-                return
+                raise e
             # there should only be one port returned
             port = ports['ports'][0]
             LOG.debug('VIP Port already exists, uuid: %s', port['id'])

ovn_octavia_provider/tests/unit/test_helper.py

@@ -2255,22 +2255,19 @@ class TestOvnProviderHelper(ovn_base.TestOvnOctaviaBase):
         net_cli.return_value.list_ports.return_value = {
             'ports': []}
         self.vip_dict['vip_address'] = '10.1.10.1'
-        ret = self.helper.create_vip_port(
+        self.assertRaises(
+            n_exc.IpAddressAlreadyAllocatedClient,
+            self.helper.create_vip_port,
             self.project_id,
             self.loadbalancer_id,
             self.vip_dict)
-        self.assertIsNone(ret)
         expected_call = [
             mock.call().list_ports(
                 network_id='%s' % self.vip_dict['vip_network_id'],
                 name='%s%s' % (ovn_const.LB_VIP_PORT_PREFIX,
                                self.loadbalancer_id))]
         net_cli.assert_has_calls(expected_call)
-        self.helper._update_status_to_octavia.assert_called_once_with(
-            {'loadbalancers':
-                [{'id': self.loadbalancer_id,
-                  'provisioning_status': 'ERROR',
-                  'operating_status': 'ERROR'}]})
+        self.helper._update_status_to_octavia.assert_not_called()
 
     def test_get_pool_member_id(self):
         ret = self.helper.get_pool_member_id(