Move the cached-based watcher implementation into its own class

There's a lot of methods implementing the common watcher tools that are
inherited from all drivers whereas there is no need for that. The mixin
is actually not correctly designed, as it mixes the hooks and the cache
code.

This splits out the common implementation into its common class that can
be inherited to implement this model of driver.

The Kazoo and Zake drivers are also merged to simplify code, as the base
class was not used.

Change-Id: I1acbf1983165d00e68b96cbca2bc5c1e2acadfa8

1 files changed, 0 insertions, 25 deletions

diff --git a/tooz/drivers/etcd.py b/tooz/drivers/etcd.py
index bdfa35c..34bfa35 100644
--- a/tooz/drivers/etcd.py
+++ b/tooz/drivers/etcd.py
@@ -21,7 +21,6 @@ from oslo_utils import timeutils
 import requests
 import six
 
-import tooz
 from tooz import coordination
 from tooz import locking
 from tooz import utils
@@ -227,27 +226,3 @@ class EtcdDriver(coordination.CoordinationDriver):
         for lock in self._acquired_locks:
             lock.heartbeat()
         return self.lock_timeout
-
-    @staticmethod
-    def watch_join_group(group_id, callback):
-        raise tooz.NotImplemented
-
-    @staticmethod
-    def unwatch_join_group(group_id, callback):
-        raise tooz.NotImplemented
-
-    @staticmethod
-    def watch_leave_group(group_id, callback):
-        raise tooz.NotImplemented
-
-    @staticmethod
-    def unwatch_leave_group(group_id, callback):
-        raise tooz.NotImplemented
-
-    @staticmethod
-    def watch_elected_as_leader(group_id, callback):
-        raise tooz.NotImplemented
-
-    @staticmethod
-    def unwatch_elected_as_leader(group_id, callback):
-        raise tooz.NotImplemented