openstack
/
neutron-dynamic-routing
Code Issues Proposed changes

use l3 api def from neutron-lib 

Commit I81748aa0e48b1275df3e1ea41b1d36a117d0097d added the l3 extension
API definition to neutron-lib, commit
I2324a3a02789c798248cab41c278a2d9981d24be rehomed the l3 exceptions and
Ifd79eb1a92853e49bd4ef028e7a7bd89811c6957 shims the l3 exceptions in
neutron.

This patch consumes the l3 API definition from neutron-lib
in prep for If2e66e06b83e15ee2851ea2bc3b64ad366e675dd

Change-Id: Ie5f87829ce55fed290bce4be933b9e2b0615be46
This commit is contained in:
Boden R 2017-11-28 06:33:35 -07:00
parent 78ae7cb8f5
commit 1f46de716d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron_dynamic_routing/db/bgp_db.py
View File

@ -23,13 +23,13 @@ from neutron.db.models import address_scope as address_scope_db
from neutron.db.models import l3 as l3_db
from neutron.db.models import l3_attrs as l3_attrs_db
from neutron.db import models_v2
from neutron.extensions import l3 as l3_ext
from neutron.plugins.ml2 import models as ml2_models
from neutron_lib.api import validators
from neutron_lib import constants as lib_consts
from neutron_lib.db import model_base
from neutron_lib import exceptions as n_exc
from neutron_lib.exceptions import l3 as l3_exc
from oslo_db import exception as oslo_db_exc
from oslo_utils import uuidutils
import sqlalchemy as sa
@ -1025,7 +1025,7 @@ class BgpDbMixin(common_db.CommonDbMixin):
try:
router = self._get_by_id(context, l3_db.Router, router_id)
except sa_exc.NoResultFound:
raise l3_ext.RouterNotFound(router_id=router_id)
raise l3_exc.RouterNotFound(router_id=router_id)
return router
def _get_fip_next_hop(self, context, router_id, ip_address=None):