Merge "Fixed a potential circular dependency"

9 files changed, 8 insertions, 14 deletions

diff --git a/designate/agent/service.py b/designate/agent/service.py
index ef5abe4a..59d37d1e 100644
--- a/designate/agent/service.py
+++ b/designate/agent/service.py
@@ -31,7 +31,7 @@ from designate import dnsutils
 from designate import service
 from designate.agent import handler
 from designate.backend import agent_backend
-from designate.utils import DEFAULT_AGENT_PORT
+from designate.conf.agent import DEFAULT_AGENT_PORT
 
 
 CONF = cfg.CONF
diff --git a/designate/backend/agent.py b/designate/backend/agent.py
index 72f6ce97..8ddc1818 100644
--- a/designate/backend/agent.py
+++ b/designate/backend/agent.py
@@ -38,8 +38,8 @@ from oslo_log import log as logging
 
 from designate.backend import base
 from designate import exceptions
+from designate.conf.agent import DEFAULT_AGENT_PORT
 from designate.mdns import rpcapi as mdns_api
-from designate.utils import DEFAULT_AGENT_PORT
 import designate.backend.private_codes as pcodes
 
 dns_query = eventlet.import_patched('dns.query')
diff --git a/designate/backend/impl_bind9.py b/designate/backend/impl_bind9.py
index ab8d06b0..1ac2d3f4 100644
--- a/designate/backend/impl_bind9.py
+++ b/designate/backend/impl_bind9.py
@@ -29,7 +29,7 @@ from oslo_utils import strutils
 from designate import exceptions
 from designate import utils
 from designate.backend import base
-from designate.utils import DEFAULT_MDNS_PORT
+from designate.conf.mdns import DEFAULT_MDNS_PORT
 
 LOG = logging.getLogger(__name__)
 DEFAULT_MASTER_PORT = DEFAULT_MDNS_PORT
diff --git a/designate/conf/agent.py b/designate/conf/agent.py
index 672496fc..16f5b47b 100644
--- a/designate/conf/agent.py
+++ b/designate/conf/agent.py
@@ -15,7 +15,7 @@
 # under the License.
 from oslo_config import cfg
 
-from designate.utils import DEFAULT_AGENT_PORT
+DEFAULT_AGENT_PORT = 5358
 
 AGENT_GROUP = cfg.OptGroup(
     name='service:agent',
diff --git a/designate/conf/mdns.py b/designate/conf/mdns.py
index c7d941b5..f2e54501 100644
--- a/designate/conf/mdns.py
+++ b/designate/conf/mdns.py
@@ -15,7 +15,7 @@
 # under the License.
 from oslo_config import cfg
 
-from designate.utils import DEFAULT_MDNS_PORT
+DEFAULT_MDNS_PORT = 5354
 
 MDNS_GROUP = cfg.OptGroup(
     name='service:mdns', title="Configuration for mDNS Service"
diff --git a/designate/mdns/service.py b/designate/mdns/service.py
index 308fcda8..2e6b4122 100644
--- a/designate/mdns/service.py
+++ b/designate/mdns/service.py
@@ -20,10 +20,10 @@ from designate import dnsutils
 from designate import service
 from designate import storage
 from designate import utils
+from designate.conf.mdns import DEFAULT_MDNS_PORT
 from designate.mdns import handler
 from designate.mdns import notify
 from designate.mdns import xfr
-from designate.utils import DEFAULT_MDNS_PORT
 
 LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
diff --git a/designate/tests/test_storage/__init__.py b/designate/tests/test_storage/__init__.py
index cecbd0d5..d7ada332 100644
--- a/designate/tests/test_storage/__init__.py
+++ b/designate/tests/test_storage/__init__.py
@@ -23,9 +23,9 @@ from oslo_messaging.rpc import dispatcher as rpc_dispatcher
 
 from designate import exceptions
 from designate import objects
+from designate.conf.mdns import DEFAULT_MDNS_PORT
 from designate.utils import generate_uuid
 from designate.storage.base import Storage as StorageBase
-from designate.utils import DEFAULT_MDNS_PORT
 
 
 LOG = logging.getLogger(__name__)
diff --git a/designate/tests/unit/objects/test_yaml_adapters.py b/designate/tests/unit/objects/test_yaml_adapters.py
index b00c9d20..05e53e7d 100644
--- a/designate/tests/unit/objects/test_yaml_adapters.py
+++ b/designate/tests/unit/objects/test_yaml_adapters.py
@@ -20,9 +20,9 @@ import yaml
 from oslo_log import log as logging
 
 from designate import objects
+from designate.conf.mdns import DEFAULT_MDNS_PORT
 from designate.objects import adapters
 from designate.tests import resources
-from designate.utils import DEFAULT_MDNS_PORT
 
 LOG = logging.getLogger(__name__)
 
diff --git a/designate/utils.py b/designate/utils.py
index 77ef62c3..8fb5df3e 100644
--- a/designate/utils.py
+++ b/designate/utils.py
@@ -36,12 +36,6 @@ from designate.i18n import _
 
 LOG = logging.getLogger(__name__)
 
-# Default TCP/UDP ports
-
-DEFAULT_AGENT_PORT = 5358
-DEFAULT_MDNS_PORT = 5354
-
-
 # Default datetime format
 
 DATETIME_FORMAT = '%Y-%m-%dT%H:%M:%S.%f'