Move dcs implementations into dcs package

patroni/__init__.py

@@ -43,13 +43,13 @@ class Patroni(object):
     @staticmethod
     def get_dcs(name, config):
         if 'etcd' in config:
-            from patroni.etcd import Etcd
+            from patroni.dcs.etcd import Etcd
             return Etcd(name, config['etcd'])
         if 'zookeeper' in config:
-            from patroni.zookeeper import ZooKeeper
+            from patroni.dcs.zookeeper import ZooKeeper
             return ZooKeeper(name, config['zookeeper'])
         if 'consul' in config:
-            from patroni.consul import Consul
+            from patroni.dcs.consul import Consul
             return Consul(name, config['consul'])
         raise PatroniException('Can not find suitable configuration of distributed configuration store')
 

tests/test_consul.py

@@ -1,9 +1,8 @@
 import consul
 import unittest
 
-from patroni.dcs import AbstractDCS
 from mock import Mock, patch
-from patroni.consul import Cluster, Consul, ConsulError, ConsulException, HTTPClient, NotFound
+from patroni.dcs.consul import AbstractDCS, Cluster, Consul, ConsulError, ConsulException, HTTPClient, NotFound
 from test_etcd import SleepException
 
 

tests/test_etcd.py

@@ -6,8 +6,7 @@ import unittest
 
 from dns.exception import DNSException
 from mock import Mock, patch
-from patroni.dcs import Cluster, AbstractDCS
-from patroni.etcd import Client, Etcd, EtcdError
+from patroni.dcs.etcd import AbstractDCS, Client, Cluster, Etcd, EtcdError
 from patroni.exceptions import DCSError
 from urllib3.exceptions import ReadTimeoutError
 

tests/test_patroni.py

@@ -8,9 +8,9 @@ import yaml
 from mock import Mock, patch
 from patroni.api import RestApiServer
 from patroni.async_executor import AsyncExecutor
-from patroni.consul import Consul
+from patroni.dcs.consul import Consul
+from patroni.dcs.zookeeper import ZooKeeper
 from patroni import Patroni, PatroniException, main as _main
-from patroni.zookeeper import ZooKeeper
 from six.moves import BaseHTTPServer
 from test_etcd import SleepException, etcd_read, etcd_write
 from test_postgresql import Postgresql, psycopg2_connect
@@ -38,7 +38,7 @@ class TestPatroni(unittest.TestCase):
                 config = yaml.load(f)
                 self.p = Patroni(config)
 
-    @patch('patroni.zookeeper.KazooClient', MockKazooClient())
+    @patch('patroni.dcs.zookeeper.KazooClient', MockKazooClient())
     @patch.object(Consul, 'create_or_restore_session', Mock())
     def test_get_dcs(self):
         self.assertIsInstance(self.p.get_dcs('', {'zookeeper': {'scope': '', 'hosts': ''}}), ZooKeeper)

tests/test_zookeeper.py

@@ -1,12 +1,11 @@
 import six
 import unittest
 
-from mock import Mock, patch
-from patroni.dcs import Leader
-from patroni.zookeeper import ExhibitorEnsembleProvider, ZooKeeper, ZooKeeperError
 from kazoo.client import KazooState
 from kazoo.exceptions import NoNodeError, NodeExistsError
 from kazoo.protocol.states import ZnodeStat
+from mock import Mock, patch
+from patroni.dcs.zookeeper import Leader, ExhibitorEnsembleProvider, ZooKeeper, ZooKeeperError
 from test_etcd import SleepException, requests_get
 
 
@@ -102,7 +101,7 @@ class TestExhibitorEnsembleProvider(unittest.TestCase):
 class TestZooKeeper(unittest.TestCase):
 
     @patch('requests.get', requests_get)
-    @patch('patroni.zookeeper.KazooClient', MockKazooClient)
+    @patch('patroni.dcs.zookeeper.KazooClient', MockKazooClient)
     def setUp(self):
         self.zk = ZooKeeper('foo', {'exhibitor': {'hosts': ['localhost', 'exhibitor'], 'port': 8181}, 'scope': 'test'})