Streaming telemetry updates

Updated telemetry proto file from out-of-date version to unmarshal
telemetry data in 6.1.1. Changed naming conventions and added some
example clarifications.

Author: remingtonc

examples/telemetry_collector.py

@@ -8,10 +8,17 @@
 from lib.cisco_grpc_client import CiscoGRPCClient
 import json
 
+def print_connectivity(connectivity):
+	print connectivity
+
+# Change client details to match your environment.
 client = CiscoGRPCClient('10.200.96.16', 57400, 100, 'mdt', 'f33dm3d4t4')
 subscription_id = 'sub1'
 recv_count = 0
-for segment in client.get_subscription(subscription_id):
+# Handle connectivity changes.
+client.connectivityhandler(print_connectivity)
+# Iterate over subscription recvs.
+for segment in client.getsubscription(subscription_id):
 	recv_count += 1
 	print json.dumps(segment, indent=4, separators=(',', ': '))
 	print 'End Telemetry Segment'

generate_pb.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+#pip install grpcio-tools
+python -m grpc.tools.protoc -I. --python_out=. --grpc_python_out=. ems_grpc.proto telemetry.proto

lib/cisco_grpc_client.py

@@ -3,7 +3,7 @@
 import ems_grpc_pb2
 import protobuf_json
 import ems_grpc_pb2
-import telemetry_message_pb2
+import telemetry_pb2
 
 class CiscoGRPCClient(object):
     def __init__(self, host, port, timeout, user, password, creds=None, options=None):
@@ -62,7 +62,7 @@ def getconfig(self, path):
             objects += response.yangjson
         return objects
 
-    def get_subscription(self, sub_id):
+    def getsubscription(self, sub_id):
         """Telemetry subscription function
             :param sub_id: Subscription ID
             :type: string
@@ -71,16 +71,15 @@ def get_subscription(self, sub_id):
         """
         sub_args = ems_grpc_pb2.CreateSubsArgs(ReqId=1, encode=3, subidstr=sub_id)
         stream = self._stub.CreateSubs(sub_args, timeout=self._timeout, metadata=self._metadata)
-        self._channel.subscribe(self.connectivity_handler, True)
         for segment in stream:
             # Go straight for telemetry data
-            telemetry_pb = telemetry_message_pb2.Telemetry()
+            telemetry_pb = telemetry_pb2.Telemetry()
             telemetry_pb.ParseFromString(segment.data)
             # Return in JSON format instead of protobuf.
             yield protobuf_json.pb2json(telemetry_pb)
 
-    def connectivity_handler(self, result):
-        print result
+    def connectivityhandler(self, callback):
+        self._channel.subscribe(callback, True)
 
     def mergeconfig (self, yangjson):
         """Merge grpc call equivalent  of PATCH RESTconf call