(1) When Heart beat to the discovery server fails [haproxy down/not s…

…tarted], the discovery client library marks the Discovery connection as DOWN.

However, on successful Heart beat, the connection status is not being marked UP. Also, reset the connection status to DOWN when the response code for
HeartBeat request is not 200.
(2) Increasing the timeout for introspect connection in contrail-status to 0.5 seconds.
In swisscom setup, changing the timeout from 0.01 to 0.1 did not work. Did not see much load on the system. Changing the timeout to 0.5 to be on the safer side.
Closes-Bug: #1372875

Change-Id: I90fa290beac079b25781d5c2ac2db0d5193c0828

src/config/utils/contrail-status.py

@@ -115,7 +115,7 @@ def _mk_url_str(self, path):
     def _load(self, path):
         url = self._mk_url_str(path)
         try:
-            resp = requests.get(url, timeout=0.01)
+            resp = requests.get(url, timeout=0.5)
             return etree.fromstring(resp.text)
         except requests.ConnectionError, e:
             if self._debug:

src/discovery/client.py

@@ -301,6 +301,20 @@ def heartbeat(self):
                     service, data = self.pubdata[cookie]
                     del self.pubdata[cookie]
                     self._publish_int(service, data)
+                elif r.status_code != 200:
+                    service, data = pub_list[cookie]
+                    ConnectionState.update(conn_type = ConnectionType.DISCOVERY,
+                        name = service, status = ConnectionStatus.DOWN,
+                        server_addrs = ['%s:%s' % (self._server_ip, \
+                            self._server_port)],
+                        message = 'HeartBeat Error: %d' % r.status_code)
+                else:
+                    service, data = pub_list[cookie]
+                    ConnectionState.update(conn_type = ConnectionType.DISCOVERY,
+                        name = service, status = ConnectionStatus.UP,
+                        server_addrs = ['%s:%s' % (self._server_ip, \
+                            self._server_port)],
+                        message = 'HeartBeat OK')
             gevent.sleep(HC_INTERVAL)
     # end client