Switch to neutron-lib device owner constants

Instead of defining the constants here, make use of
the ones defined in neutron-lib.

Related-Bug: #2088286
Depends-On: https://review.opendev.org/c/openstack/neutron-lib/+/936842
Change-Id: I5ac670a5fed13d9a51693cd93dfbbcecaea13e78

neutron_vpnaas/db/vpn/vpn_ext_gw_db.py

@@ -33,7 +33,6 @@ from sqlalchemy import orm
 from sqlalchemy.orm import exc
 
 from neutron_vpnaas._i18n import _
-from neutron_vpnaas.services.vpn.common import constants as v_constants
 
 
 LOG = logging.getLogger(__name__)
@@ -125,8 +124,8 @@ class VPNExtGWPlugin_db:
             return
 
         port_id_column = {
-            v_constants.DEVICE_OWNER_VPN_ROUTER_GW: VPNExtGW.gw_port_id,
-            v_constants.DEVICE_OWNER_TRANSIT_NETWORK:
+            lib_constants.DEVICE_OWNER_VPN_ROUTER_GW: VPNExtGW.gw_port_id,
+            lib_constants.DEVICE_OWNER_VPN_TRANSIT_NETWORK:
                 VPNExtGW.transit_port_id,
         }.get(port['device_owner'])
 

neutron_vpnaas/services/vpn/common/constants.py

@@ -13,8 +13,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from neutron_lib import constants
-
 # Endpoint group types
 SUBNET_ENDPOINT = 'subnet'
 CIDR_ENDPOINT = 'cidr'
@@ -35,12 +33,6 @@ VPN_SUPPORTED_ENDPOINT_TYPES = [
 
 AGENT_TYPE_VPN = "VPN Agent"
 
-DEVICE_OWNER_VPN_ROUTER_GW = constants.DEVICE_OWNER_NETWORK_PREFIX + \
-                             "vpn_router_gateway"
-
-DEVICE_OWNER_TRANSIT_NETWORK = constants.DEVICE_OWNER_NETWORK_PREFIX + \
-                               "vpn_namespace"
-
 OVN_AGENT_VPN_SB_CFG_KEY = 'neutron:ovn-vpnagent-sb-cfg'
 OVN_AGENT_VPN_DESC_KEY = 'neutron:description-vpnagent'
 OVN_AGENT_VPN_ID_KEY = 'neutron:ovn-vpnagent-id'

neutron_vpnaas/services/vpn/service_drivers/ovn_ipsec.py

@@ -37,7 +37,6 @@ from neutron_vpnaas.db.vpn import vpn_agentschedulers_db as agent_db
 from neutron_vpnaas.db.vpn.vpn_ext_gw_db import RouterIsNotVPNExternal
 from neutron_vpnaas.db.vpn import vpn_models
 from neutron_vpnaas.extensions import vpnaas
-from neutron_vpnaas.services.vpn.common import constants as v_constants
 from neutron_vpnaas.services.vpn.common import topics
 from neutron_vpnaas.services.vpn.service_drivers import base_ipsec
 
@@ -204,7 +203,7 @@ class BaseOvnIPsecVPNDriver(base_ipsec.BaseIPsecVPNDriver):
             'network_id': network['id'],
             'fixed_ips': [fixed_ip],
             'device_id': subnet['id'],
-            'device_owner': v_constants.DEVICE_OWNER_TRANSIT_NETWORK,
+            'device_owner': lib_constants.DEVICE_OWNER_VPN_TRANSIT_NETWORK,
             'admin_state_up': True,
             portbindings.HOST_ID: agent_host,
             'name': self.get_vpn_namespace_port_name(router_id)
@@ -262,7 +261,7 @@ class BaseOvnIPsecVPNDriver(base_ipsec.BaseIPsecVPNDriver):
                      'network_id': network_id,
                      'fixed_ips': lib_constants.ATTR_NOT_SPECIFIED,
                      'device_id': router_id,
-                     'device_owner': v_constants.DEVICE_OWNER_VPN_ROUTER_GW,
+                     'device_owner': lib_constants.DEVICE_OWNER_VPN_ROUTER_GW,
                      'admin_state_up': True,
                      portbindings.HOST_ID: agent_host,
                      'name': self.get_vpn_gw_port_name(router_id)}

neutron_vpnaas/tests/unit/db/vpn/test_vpn_ext_gw_db.py

@@ -24,7 +24,6 @@ from neutron_lib import context
 from neutron_lib.plugins import constants as nconstants
 from neutron_lib.plugins import directory
 from neutron_vpnaas.db.vpn.vpn_ext_gw_db import VPNExtGWPlugin_db
-from neutron_vpnaas.services.vpn.common import constants as v_constants
 from neutron_vpnaas.tests import base
 from neutron_vpnaas.tests.unit.db.vpn import test_vpn_db
 
@@ -82,15 +81,15 @@ class TestVPNExtGw(VPNOVNPluginDbTestCase):
 
     def test_prevent_vpn_port_deletion_gw_port(self):
         self._test_prevent_vpn_port_deletion(
-            v_constants.DEVICE_OWNER_VPN_ROUTER_GW, 'gw_port_id')
+            lib_constants.DEVICE_OWNER_VPN_ROUTER_GW, 'gw_port_id')
 
     def test_prevent_vpn_port_deletion_transit_port(self):
         self._test_prevent_vpn_port_deletion(
-            v_constants.DEVICE_OWNER_TRANSIT_NETWORK, 'transit_port_id')
+            lib_constants.DEVICE_OWNER_VPN_TRANSIT_NETWORK, 'transit_port_id')
 
     def test_prevent_vpn_port_deletion_other_device_owner(self):
         plugin = directory.get_plugin(nconstants.VPN)
-        device_owner = v_constants.DEVICE_OWNER_TRANSIT_NETWORK
+        device_owner = lib_constants.DEVICE_OWNER_VPN_TRANSIT_NETWORK
         with self.router() as router, \
                 self.port(device_owner=device_owner) as transit_port, \
                 self.port(device_owner='other-device-owner') as other_port:
@@ -157,7 +156,7 @@ class TestVPNExtGwDB(base.NeutronDbPluginV2TestCase,
             'mac_address': lib_constants.ATTR_NOT_SPECIFIED,
             'admin_state_up': True,
             'device_id': router['id'],
-            'device_owner': v_constants.DEVICE_OWNER_VPN_ROUTER_GW,
+            'device_owner': lib_constants.DEVICE_OWNER_VPN_ROUTER_GW,
             'name': ''
         }}
         return self.core_plugin.create_port(self.context, port)