From 23c9e6315ac836d12323fb51cc0947957d6ef264 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 28 Feb 2019 15:56:15 -0500
Subject: [PATCH] Update node collection handlers for renamed

Rename support will provide a map of old to new name.  Have the
existing node collection watchers accept a new argument.
---
 confluent_server/confluent/config/configmanager.py | 4 ++--
 confluent_server/confluent/consoleserver.py        | 2 +-
 confluent_server/confluent/discovery/core.py       | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/confluent_server/confluent/config/configmanager.py b/confluent_server/confluent/config/configmanager.py
index 9bf9ed86..4f6ba68d 100644
--- a/confluent_server/confluent/config/configmanager.py
+++ b/confluent_server/confluent/config/configmanager.py
@@ -290,7 +290,7 @@ def logException():
 
 def _do_add_watcher(watcher, added, configmanager):
     try:
-        watcher(added=added, deleting=[], configmanager=configmanager)
+        watcher(added=added, deleting=(), renamed=(), configmanager=configmanager)
     except Exception:
         logException()
 
@@ -1705,7 +1705,7 @@ class ConfigManager(object):
     def _true_del_nodes(self, nodes):
         if self.tenant in self._nodecollwatchers:
             for watcher in self._nodecollwatchers[self.tenant].itervalues():
-                watcher(added=[], deleting=nodes, configmanager=self)
+                watcher(added=(), deleting=nodes, renamed=(), configmanager=self)
         changeset = {}
         for node in nodes:
             # set a reserved attribute for the sake of the change notification
diff --git a/confluent_server/confluent/consoleserver.py b/confluent_server/confluent/consoleserver.py
index 3baba74d..6dd65441 100644
--- a/confluent_server/confluent/consoleserver.py
+++ b/confluent_server/confluent/consoleserver.py
@@ -621,7 +621,7 @@ def disconnect_node(node, configmanager):
         del _handled_consoles[consk]
 
 
-def _nodechange(added, deleting, configmanager):
+def _nodechange(added, deleting, renamed, configmanager, renamed=()):
     for node in added:
         connect_node(node, configmanager)
     for node in deleting:
diff --git a/confluent_server/confluent/discovery/core.py b/confluent_server/confluent/discovery/core.py
index 065a2437..9d1f3031 100644
--- a/confluent_server/confluent/discovery/core.py
+++ b/confluent_server/confluent/discovery/core.py
@@ -1129,7 +1129,7 @@ def _handle_nodelist_change(configmanager):
         nodeaddhandler = None
 
 
-def newnodes(added, deleting, configmanager):
+def newnodes(added, deleting, renamed, configmanager):
     global attribwatcher
     global needaddhandled
     global nodeaddhandler