Merge "Rearrangment of logging msgs in k8s"

src/container/kube-manager/kube_manager/kube/endpoint_monitor.py

@@ -13,20 +13,20 @@ def __init__(self, args=None, logger=None, q=None):
     def process_event(self, event):
         endpoint_data = event['object']
         event_type = event['type']
+        kind = event['object'].get('kind')
 
         endpoint_name = endpoint_data['metadata'].get('name')
         namespace = endpoint_data['metadata'].get('namespace')
-
         if not endpoint_name or not namespace:
             return
 
         if endpoint_name == "kube-controller-manager" or endpoint_name == "kube-scheduler":
             return
 
-        print("Put %s %s %s:%s" % (event['type'],
-            event['object'].get('kind'),
-            event['object']['metadata'].get('namespace'),
-            event['object']['metadata'].get('name')))
+        print("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, endpoint_name))
+        self.logger.info("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, endpoint_name))
         self.q.put(event)
 
     def event_callback(self):

src/container/kube-manager/kube_manager/kube/ingress_monitor.py

@@ -31,7 +31,10 @@ def process_event(self, event):
                 # Remove the entry from Ingress DB.
                 self.db.delete(uuid)
 
-        print("Put %s %s %s:%s" %(event_type, kind, namespace, name))
+        print("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, name))
+        self.logger.debug("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, name))
         self.q.put(event)
 
     def event_callback(self):

src/container/kube-manager/kube_manager/kube/namespace_monitor.py

@@ -22,22 +22,25 @@ def get_entry_url(self, base_url, entry):
         return self.v1_url + "/namespaces/" +  entry['metadata']['name']
 
     def process_event(self, event):
-        namespce_data = event['object']
+        namespace_data = event['object']
         event_type = event['type']
+        kind = event['object'].get('kind')
+        name = event['object']['metadata'].get('name')
 
         if self.db:
             namespace_uuid = self.db.get_uuid(event['object'])
             if event_type != 'DELETED':
                 # Update Namespace DB.
                 namespace = self.db.locate(namespace_uuid)
-                namespace.update(namespce_data)
+                namespace.update(namespace_data)
             else:
                 # Remove the entry from Namespace DB.
                 self.db.delete(namespace_uuid)
 
-        print("Put %s %s %s" % (event['type'],
-            event['object'].get('kind'),
-            event['object']['metadata'].get('name')))
+        print("%s - Got %s %s %s"
+              %(self.name, event_type, kind, name))
+        self.logger.debug("%s - Got %s %s %s"
+              %(self.name, event_type, kind, name))
         self.q.put(event)
 
     def event_callback(self):

src/container/kube-manager/kube_manager/kube/network_policy_monitor.py

@@ -12,13 +12,11 @@ def __init__(self, args=None, logger=None, q=None, network_policy_db=None):
         self.logger.info("NetworkPolicyMonitor init done.");
 
     def process_event(self, event):
-        print("Put %s %s %s:%s" % (event['type'],
-            event['object'].get('kind'),
-            event['object']['metadata'].get('namespace'),
-            event['object']['metadata'].get('name')))
-
         np_data = event['object']
         event_type = event['type']
+        kind = event['object'].get('kind')
+        namespace = event['object']['metadata'].get('namespace')
+        name = event['object']['metadata'].get('name')
 
         if self.db:
             np_uuid = self.db.get_uuid(np_data)
@@ -30,6 +28,10 @@ def process_event(self, event):
                 # Remove the entry from Network Policy DB.
                 self.db.delete(np_uuid)
 
+        print("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, name))
+        self.logger.debug("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, name))
         self.q.put(event)
 
     def event_callback(self):

src/container/kube-manager/kube_manager/kube/pod_monitor.py

@@ -14,6 +14,7 @@ def __init__(self, args=None, logger=None, q=None):
     def process_event(self, event):
         pod_data = event['object']
         event_type = event['type']
+        kind = event['object'].get('kind')
 
         if event_type != 'DELETED':
             if pod_data['spec'].get('hostNetwork'):
@@ -36,10 +37,10 @@ def process_event(self, event):
         if not pod_name or not namespace:
             return
 
-        print("Put %s %s %s:%s" % (event['type'],
-            event['object'].get('kind'),
-            event['object']['metadata'].get('namespace'),
-            event['object']['metadata'].get('name')))
+        print("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, pod_name))
+        self.logger.info("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, pod_name))
         self.q.put(event)
 
     def event_callback(self):

src/container/kube-manager/kube_manager/kube/service_monitor.py

@@ -14,6 +14,7 @@ def __init__(self, args=None, logger=None, q=None):
     def process_event(self, event):
         service_data = event['object']
         event_type = event['type']
+        kind = event['object'].get('kind')
 
         service_name = service_data['metadata'].get('name')
         namespace = service_data['metadata'].get('namespace')
@@ -30,10 +31,10 @@ def process_event(self, event):
                 # Remove the entry from Service DB.
                 self.db.delete(service_uuid)
 
-        print("Put %s %s %s:%s" % (event['type'],
-            event['object'].get('kind'),
-            event['object']['metadata'].get('namespace'),
-            event['object']['metadata'].get('name')))
+        print("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, service_name))
+        self.logger.debug("%s - Got %s %s %s:%s"
+              %(self.name, event_type, kind, namespace, service_name))
         self.q.put(event)
 
     def event_callback(self):

src/container/kube-manager/kube_manager/vnc/vnc_endpoints.py

@@ -15,6 +15,7 @@
 class VncEndpoints(object):
 
     def __init__(self, vnc_lib=None, logger=None, kube=None):
+        self._name = type(self).__name__
         self._vnc_lib = vnc_lib
         self.logger = logger
         self._kube = kube
@@ -233,10 +234,17 @@ def vnc_endpoint_delete(self, uid, name, namespace):
             remove_pod_from_service(service_id, pod_id)
 
     def process(self, event):
+        event_type = event['type']
+        kind = event['object'].get('kind')
         uid = event['object']['metadata'].get('uid')
         name = event['object']['metadata'].get('name')
         namespace = event['object']['metadata'].get('namespace')
 
+        print("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, namespace, name))
+        self.logger.debug("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, namespace, name))
+
         if event['type'] == 'ADDED' or event['type'] == 'MODIFIED':
             self.vnc_endpoint_add(uid, name, namespace, event)
         elif event['type'] == 'DELETED':

src/container/kube-manager/kube_manager/vnc/vnc_ingress.py

@@ -18,10 +18,12 @@
 class VncIngress(object):
     def __init__(self, args=None, queue=None, vnc_lib=None,
                  label_cache=None, logger=None, kube=None):
+        self._name = type(self).__name__
         self._args = args
-        self._kube = kube
-        self._vnc_lib = vnc_lib
         self._queue = queue
+        self._vnc_lib = vnc_lib
+        self._logger = logger
+        self._kube = kube
         self._vn_obj = None
         self._service_subnet_uuid = None
         self._fip_pool_obj = None
@@ -479,8 +481,16 @@ def ingress_timer(self):
         self._sync_ingress_lb()
 
     def process(self, event):
+        event_type = event['type']
+        kind = event['object'].get('kind')
         name = event['object']['metadata'].get('name')
         uid = event['object']['metadata'].get('uid')
+        namespace = event['object']['metadata'].get('namespace')
+
+        print("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, namespace, name))
+        self._logger.debug("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, namespace, name))
 
         if event['type'] == 'ADDED' or event['type'] == 'MODIFIED':
             self._update_ingress(name, uid, event)

src/container/kube-manager/kube_manager/vnc/vnc_kubernetes.py

@@ -25,6 +25,7 @@
 class VncKubernetes(object):
 
     def __init__(self, args=None, logger=None, q=None, kube=None):
+        self._name = type(self).__name__
         self.args = args
         self.logger = logger
         self.q = q
@@ -57,7 +58,7 @@ def __init__(self, args=None, logger=None, q=None, kube=None):
         self.label_cache = label_cache.LabelCache()
         self.namespace_mgr = importutils.import_object(
             'kube_manager.vnc.vnc_namespace.VncNamespace',vnc_lib=self.vnc_lib,
-            cluster_pod_subnets = self.args.pod_subnets)
+            logger=self.logger, cluster_pod_subnets = self.args.pod_subnets)
         self.service_mgr = importutils.import_object(
             'kube_manager.vnc.vnc_service.VncService', self.vnc_lib,
             self.label_cache, self.args, self.logger, self.kube)
@@ -312,25 +313,27 @@ def vnc_process(self):
         while True:
             try:
                 event = self.q.get()
-                print("\tGot %s %s %s:%s" % (event['type'],
-                    event['object'].get('kind'),
-                    event['object']['metadata'].get('namespace'),
-                    event['object']['metadata'].get('name')))
-                self.logger.debug("\tGot %s %s %s:%s" % (event['type'],
-                    event['object'].get('kind'),
-                    event['object']['metadata'].get('namespace'),
-                    event['object']['metadata'].get('name')))
-                if event['object'].get('kind') == 'Pod':
+                event_type = event['type']
+                kind = event['object'].get('kind')
+                metadata = event['object']['metadata']
+                namespace = metadata.get('namespace')
+                name = metadata.get('name')
+                if kind == 'Pod':
                     self.pod_mgr.process(event)
-                elif event['object'].get('kind') == 'Service':
+                elif kind == 'Service':
                     self.service_mgr.process(event)
-                elif event['object'].get('kind') == 'Namespace':
+                elif kind == 'Namespace':
                     self.namespace_mgr.process(event)
-                elif event['object'].get('kind') == 'NetworkPolicy':
+                elif kind == 'NetworkPolicy':
                     self.network_policy_mgr.process(event)
-                elif event['object'].get('kind') == 'Endpoints':
+                elif kind == 'Endpoints':
                     self.endpoints_mgr.process(event)
-                elif event['object'].get('kind') == 'Ingress':
+                elif kind == 'Ingress':
                     self.ingress_mgr.process(event)
+                else:
+                    print("$s - Event %s %s %s:%s not handled"
+                        %(self._name, event_type, kind, namespace, name))
+                    self.logger.error("%s - Event %s %s %s:%s not handled"
+                        %(self._name, event_type, kind, namespace, name))
             except Empty:
                 gevent.sleep(0)

src/container/kube-manager/kube_manager/vnc/vnc_namespace.py

@@ -14,8 +14,10 @@
 
 class VncNamespace(object):
 
-    def __init__(self, cluster_pod_subnets=None, vnc_lib=None):
+    def __init__(self, cluster_pod_subnets=None, logger=None, vnc_lib=None):
+        self._name = type(self).__name__
         self._vnc_lib = vnc_lib
+        self._logger = logger
 
         # Cache user specified subnet directive to be used for pods iip's
         # in this namespace.
@@ -275,9 +277,16 @@ def vnc_namespace_delete(self,namespace_id,  name):
             pass
 
     def process(self, event):
+        event_type = event['type']
+        kind = event['object'].get('kind')
         name = event['object']['metadata'].get('name')
         ns_id = event['object']['metadata'].get('uid')
         annotations = event['object']['metadata'].get('annotations')
+        print("%s - Got %s %s %s"
+              %(self._name, event_type, kind, name))
+        self._logger.debug("%s - Got %s %s %s"
+              %(self._name, event_type, kind, name))
+
 
         if event['type'] == 'ADDED' or event['type'] == 'MODIFIED':
             self.vnc_namespace_add(ns_id, name, annotations)

src/container/kube-manager/kube_manager/vnc/vnc_network_policy.py

@@ -15,6 +15,7 @@
 class VncNetworkPolicy(object):
 
     def __init__(self, vnc_lib=None, label_cache=None, logger=None):
+        self._name = type(self).__name__
         self._vnc_lib = vnc_lib
         self._label_cache = label_cache
         self.logger = logger
@@ -360,6 +361,17 @@ def vnc_network_policy_delete(self, event, sg_uuid=None):
         self._vnc_lib.security_group_delete(id=sg.uuid)
 
     def process(self, event):
+        event_type = event['type']
+        kind = event['object'].get('kind')
+        name = event['object']['metadata'].get('name')
+        uid = event['object']['metadata'].get('uid')
+        namespace = event['object']['metadata'].get('namespace')
+
+        print("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, namespace, name))
+        self.logger.debug("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, namespace, name))
+
         if event['object'].get('kind') == 'NetworkPolicy':
             if event['type'] == 'ADDED' or event['type'] == 'MODIFIED':
                 self.vnc_network_policy_add(event)

src/container/kube-manager/kube_manager/vnc/vnc_pod.py

@@ -18,6 +18,7 @@ class VncPod(object):
     def __init__(self, vnc_lib=None, label_cache=None, args=None, logger=None,
             service_mgr=None, network_policy_mgr=None, queue=None,
             svc_fip_pool=None):
+        self._name = type(self).__name__
         self._vnc_lib = vnc_lib
         self._label_cache = label_cache
         self._service_mgr = service_mgr
@@ -372,11 +373,18 @@ def pod_timer(self):
         return
 
     def process(self, event):
+        event_type = event['type']
+        kind = event['object'].get('kind')
         pod_id = event['object']['metadata'].get('uid')
         pod_name = event['object']['metadata'].get('name')
         pod_namespace = event['object']['metadata'].get('namespace')
         labels = event['object']['metadata'].get('labels', {})
 
+        print("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, pod_namespace, pod_name))
+        self._logger.debug("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, pod_namespace, pod_name))
+
         if event['type'] == 'ADDED' or event['type'] == 'MODIFIED':
 
             # Proceed ONLY if host network is specified.

src/container/kube-manager/kube_manager/vnc/vnc_service.py

@@ -17,6 +17,7 @@ class VncService(object):
 
     def __init__(self, vnc_lib=None, label_cache=None, args=None, logger=None,
                  queue=None, kube=None):
+        self._name = type(self).__name__
         self._vnc_lib = vnc_lib
         self._label_cache = label_cache
         self._args = args
@@ -466,6 +467,8 @@ def service_timer(self):
         return
 
     def process(self, event):
+        event_type = event['type']
+        kind = event['object'].get('kind')
         service_id = event['object']['metadata'].get('uid')
         service_name = event['object']['metadata'].get('name')
         service_namespace = event['object']['metadata'].get('namespace')
@@ -475,6 +478,12 @@ def process(self, event):
         service_type  = event['object']['spec'].get('type')
         loadBalancerIp  = event['object']['spec'].get('loadBalancerIP', None)
         externalIps  = event['object']['spec'].get('externalIPs', None)
+
+        print("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, service_namespace, service_name))
+        self.logger.debug("%s - Got %s %s %s:%s"
+              %(self._name, event_type, kind, service_namespace, service_name))
+
         if externalIps is not None:
             externalIp = externalIps[0]
         else: