From f8b4b5330f08d18fc6d5e12ec62be3ae1c44c3f5 Mon Sep 17 00:00:00 2001
From: Ken <kcratie@users.noreply.github.com>
Date: Fri, 26 Feb 2021 17:32:07 -0500
Subject: [PATCH] Update for reporting empty dataset.

---
 controller/modules/OverlayVisualizer.py | 10 +++-------
 controller/modules/Topology.py          |  3 ++-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/controller/modules/OverlayVisualizer.py b/controller/modules/OverlayVisualizer.py
index d5abbcb..f4ed386 100644
--- a/controller/modules/OverlayVisualizer.py
+++ b/controller/modules/OverlayVisualizer.py
@@ -63,10 +63,6 @@ class OverlayVisualizer(ControllerModule):
                         for mod_name in msg:
                             for ovrl_id in msg[mod_name]:
                                 self._vis_ds["VizData"][ovrl_id][mod_name] = msg[mod_name][ovrl_id]
-                else:
-                    warn_msg = "Got no data in CBT response from module" \
-                        " {}".format(cbt.request.recipient)
-                    self.register_cbt("Logger", "LOG_WARNING", warn_msg)
                 self.free_cbt(cbt)
             else:
                 parent_cbt = cbt.parent
@@ -92,11 +88,11 @@ class OverlayVisualizer(ControllerModule):
         if "GeoCoordinate" in self._cm_config:
             collector_msg["GeoCoordinate"] = self._cm_config["GeoCoordinate"]
         collector_msg["Version"] = self._evio_version
-        data_log = "Submitting collector data {}".format(collector_msg)
-        self.register_cbt("Logger", "LOG_DEBUG", data_log)
+        viz_data = json.dumps(collector_msg).encode('utf-8')
+        self.log("LOG_DEBUG", "Submitting collector data %s", viz_data)
         try:
             resp = requests.put(self._req_url,
-                                data=zlib.compress(json.dumps(collector_msg).encode('utf-8')),
+                                data=zlib.compress(viz_data),
                                 headers={"Content-Type":
                                              "application/json",
                                          "Content-Encoding": "deflate"})
diff --git a/controller/modules/Topology.py b/controller/modules/Topology.py
index 75bcdc2..e5a43ca 100644
--- a/controller/modules/Topology.py
+++ b/controller/modules/Topology.py
@@ -180,7 +180,8 @@ class Topology(ControllerModule, CFX):
                                "ConnectedTime": ce.connected_time,
                                "State": ce.edge_state, "Type": ce.edge_type}
                         edges[ce.edge_id] = ced
-                    topo_data[olid] = edges
+                    if edges:
+                        topo_data[olid] = edges
             cbt.set_response({"Topology": topo_data}, bool(topo_data))
             self.complete_cbt(cbt)
         except KeyError: