Tidy up fetcd.py:

* FelixEtcdWatcher no longer an EtcdWatcher subclass.
* Move status cleanup to the StatusReporter.
* Remove ResyncRequired exception.

calico/datamodel_v1.py

@@ -190,6 +190,12 @@ def path_for_status(self):
     def __str__(self):
         return self.__class__.__name__ + ("<%s>" % self.endpoint)
 
+    def __repr__(self):
+        return self.__class__.__name__ + ("(%r,%r,%r,%r)" % (self.host,
+                                                             self.orchestrator,
+                                                             self.workload,
+                                                             self.endpoint))
+
     def __eq__(self, other):
         if other is self:
             return True

calico/etcddriver/driver.py

@@ -61,6 +61,18 @@
 
 FLUSH_THRESHOLD = 200
 
+# TODO: trigger immediate resync if these are deleted?
+# RESYNC_KEYS = [
+#     VERSION_DIR,
+#     POLICY_DIR,
+#     PROFILE_DIR,
+#     CONFIG_DIR,
+#     HOST_DIR,
+#     IPAM_DIR,
+#     IPAM_V4_DIR,
+#     POOL_V4_DIR,
+# ]
+
 
 class EtcdDriver(object):
     def __init__(self, felix_sck):