x/vmware-nsx
Code Issues Proposed changes

use dns api def from neutron-lib

Browse Source 
neutron-lib contains the dns API definition and associated exceptions,
constants, etc. and neutron is moving to it in
If180cf92d8ae31a0857080239e8233095cd6c768. This patch moves all
references over to use the API def from neutron-lib.

Change-Id: Ib17302db4d0d9aaa3b4f469980386b333b4bb056
This commit is contained in:
Boden R 2017-07-27 09:10:17 -06:00
parent f65b70ff38
commit 784aaacf0c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vmware_nsx/extension_drivers/dns_integration.py
View File

@ -14,14 +14,15 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron_lib.api.definitions import dns
from neutron_lib.api import validators from neutron_lib.api import validators
from neutron_lib import context as n_context from neutron_lib import context as n_context
from neutron_lib.exceptions import dns as dns_exc
from neutron_lib.plugins import directory from neutron_lib.plugins import directory
from oslo_config import cfg from oslo_config import cfg
from oslo_log import log as logging from oslo_log import log as logging
from neutron.extensions import availability_zone as az_ext from neutron.extensions import availability_zone as az_ext
from neutron.extensions import dns
from neutron.objects import network as net_obj from neutron.objects import network as net_obj
from neutron.objects import ports as port_obj from neutron.objects import ports as port_obj
from neutron.services.externaldns import driver from neutron.services.externaldns import driver
@ -338,5 +339,5 @@ def _get_dns_driver():
except ImportError: except ImportError:
LOG.exception("ImportError exception occurred while loading " LOG.exception("ImportError exception occurred while loading "
"the external DNS service driver") "the external DNS service driver")
raise dns.ExternalDNSDriverNotFound( raise dns_exc.ExternalDNSDriverNotFound(
driver=cfg.CONF.external_dns_driver) driver=cfg.CONF.external_dns_driver)

3
vmware_nsx/tests/unit/extension_drivers/test_dns_integration.py
View File

@ -13,12 +13,11 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from neutron_lib.api.definitions import dns
from neutron_lib import context from neutron_lib import context
from neutron_lib.plugins import directory from neutron_lib.plugins import directory
from oslo_config import cfg from oslo_config import cfg
from neutron.extensions import dns
from vmware_nsx.extension_drivers import dns_integration from vmware_nsx.extension_drivers import dns_integration
from vmware_nsx.tests.unit.nsx_v import test_plugin as test_v_plugin from vmware_nsx.tests.unit.nsx_v import test_plugin as test_v_plugin
from vmware_nsx.tests.unit.nsx_v3 import test_plugin as test_v3_plugin from vmware_nsx.tests.unit.nsx_v3 import test_plugin as test_v3_plugin