Modified vnc_openstack to catch proper error from the api-server and …

…pass it to the neutron.

Closes Bug: #1604578

Change-Id: Ibd66e36d57a1079fb8a3032ea117d0a7c7f7b634

src/config/api-server/vnc_cfg_types.py

@@ -430,10 +430,10 @@ def pre_dbe_create(cls, tenant_name, obj_dict, db_conn):
         # for g/w ip, creation allowed but only can ref to router port.
         if req_ip and cls.addr_mgmt.is_ip_allocated(req_ip, vn_fq_name):
             if not cls._is_gateway_ip(vn_dict, req_ip):
-                return (False, (403, 'Ip address already in use'))
+                return (False, (400, 'Ip address already in use'))
             elif cls._vmi_has_vm_ref(db_conn, obj_dict):
                 return (False,
-                    (403, 'Gateway IP cannot be used by VM port'))
+                    (400, 'Gateway IP cannot be used by VM port'))
         # end if request has ip addr
 
         try:

src/config/vnc_openstack/vnc_openstack/neutron_plugin_db.py

@@ -3527,8 +3527,14 @@ def _port_create_instance_ip(self, net_obj, port_obj, port_q, ip_family="v4"):
                     elif (IPAddress(fixed_ip['ip_address']).version == 6):
                         ip_family="v6"
                 subnet_id = fixed_ip.get('subnet_id')
-                ip_id = self._create_instance_ip(net_obj, port_obj, ip_addr,
+                try:
+                    ip_id = self._create_instance_ip(net_obj, port_obj, ip_addr,
                                                  subnet_id, ip_family)
+                except BadRequest as e:
+                    self._raise_contrail_exception(
+                            'IpAddressInUse', net_id=net_obj.uuid,
+                            ip_address=ip_addr)
+
                 created_iip_ids.append(ip_id)
             except vnc_exc.HttpError as e:
                 # Resources are not available