Merge "config: publish to discovery server only if one configured" in…

…to R2.20
Juniper · Jul 10, 2015 · 09345e6 · 09345e6
2 parents 0045dcb + f2f2822
commit 09345e6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/config/api-server/vnc_cfg_api_server.py b/src/config/api-server/vnc_cfg_api_server.py
@@ -1529,17 +1529,19 @@ def publish_self_to_discovery(self):
             'ip-address': self._args.ifmap_server_ip,
             'port': self._args.listen_port,
         }
-        self.api_server_task = self._disc.publish(
-            API_SERVER_DISCOVERY_SERVICE_NAME, data)
+        if self._disc:
+            self.api_server_task = self._disc.publish(
+                API_SERVER_DISCOVERY_SERVICE_NAME, data)
 
     def publish_ifmap_to_discovery(self):
         # publish ifmap server
         data = {
             'ip-address': self._args.ifmap_server_ip,
             'port': self._args.ifmap_server_port,
         }
-        self.ifmap_task = self._disc.publish(
-            IFMAP_SERVER_DISCOVERY_SERVICE_NAME, data)
+        if self._disc:
+            self.ifmap_task = self._disc.publish(
+                IFMAP_SERVER_DISCOVERY_SERVICE_NAME, data)
     # end publish_ifmap_to_discovery
 
     def un_publish_self_to_discovery(self):
@@ -1548,15 +1550,17 @@ def un_publish_self_to_discovery(self):
             'ip-address': self._args.ifmap_server_ip,
             'port': self._args.listen_port,
         }
-        self._disc.un_publish(API_SERVER_DISCOVERY_SERVICE_NAME, data)
+        if self._disc:
+            self._disc.un_publish(API_SERVER_DISCOVERY_SERVICE_NAME, data)
 
     def un_publish_ifmap_to_discovery(self):
         # un publish ifmap server
         data = {
             'ip-address': self._args.ifmap_server_ip,
             'port': self._args.ifmap_server_port,
         }
-        self._disc.un_publish(IFMAP_SERVER_DISCOVERY_SERVICE_NAME, data)
+        if self._disc:
+            self._disc.un_publish(IFMAP_SERVER_DISCOVERY_SERVICE_NAME, data)
     # end un_publish_ifmap_to_discovery
 
 # end class VncApiServer

diff --git a/src/config/api-server/vnc_cfg_ifmap.py b/src/config/api-server/vnc_cfg_ifmap.py
@@ -216,7 +216,7 @@ def _ifmap_dequeue_task(self):
                 self._publish_to_ifmap_dequeue()
             except Exception as e:
                 tb = utils.detailed_traceback()
-                self.config_log(tb, level=SandeshLevel.SYS_ERROR)
+                self.config_log(tb, level=SandeshLevel.SYS_ERR)
 
     def _publish_to_ifmap_dequeue(self):
         def _publish(requests, traces, publish_discovery=False):