diff --git a/src/device/service/drivers/gnmi_openconfig/GnmiSessionHandler.py b/src/device/service/drivers/gnmi_openconfig/GnmiSessionHandler.py index ff304d14490d57d49e93c9916a056fb1589ac138..3668c6a3eeb4ab31e2ee01517efaab157c98f8d1 100644 --- a/src/device/service/drivers/gnmi_openconfig/GnmiSessionHandler.py +++ b/src/device/service/drivers/gnmi_openconfig/GnmiSessionHandler.py @@ -48,13 +48,13 @@ class GnmiSessionHandler: self._out_samples = queue.Queue() def __del__(self) -> None: - self._logger.warning('Destroying YangValidator...') + self._logger.info('Destroying YangValidator...') if self._yang_handler is not None: - self._logger.warning('yang_validator.data:') + self._logger.debug('yang_validator.data:') for path, dnode in self._yang_handler.get_data_paths().items(): - self._logger.warning(' {:s}: {:s}'.format(str(path), json.dumps(dnode.print_dict()))) + self._logger.debug(' {:s}: {:s}'.format(str(path), json.dumps(dnode.print_dict()))) self._yang_handler.destroy() - self._logger.warning('DONE') + self._logger.info('DONE') @property def subscriptions(self): return self._subscriptions @@ -190,11 +190,11 @@ class GnmiSessionHandler: set_request_entry.val.json_val = str_data.encode('UTF-8') resources_requested.append((resource_key, resource_value)) - self._logger.info('set_request={:s}'.format(grpc_message_to_json_string(set_request))) + self._logger.debug('set_request={:s}'.format(grpc_message_to_json_string(set_request))) metadata = [('username', self._username), ('password', self._password)] timeout = None # GNMI_SUBSCRIPTION_TIMEOUT = int(sampling_duration) set_reply = self._stub.Set(set_request, metadata=metadata, timeout=timeout) - self._logger.info('set_reply={:s}'.format(grpc_message_to_json_string(set_reply))) + self._logger.debug('set_reply={:s}'.format(grpc_message_to_json_string(set_reply))) results = [] for (resource_key, resource_value), update_result in zip(resources_requested, set_reply.response): @@ -262,11 +262,11 @@ class GnmiSessionHandler: set_request_entry.CopyFrom(path_from_string(str_path)) resources_requested.append((resource_key, resource_value)) - self._logger.info('set_request={:s}'.format(grpc_message_to_json_string(set_request))) + self._logger.debug('set_request={:s}'.format(grpc_message_to_json_string(set_request))) metadata = [('username', self._username), ('password', self._password)] timeout = None # GNMI_SUBSCRIPTION_TIMEOUT = int(sampling_duration) set_reply = self._stub.Set(set_request, metadata=metadata, timeout=timeout) - self._logger.info('set_reply={:s}'.format(grpc_message_to_json_string(set_reply))) + self._logger.debug('set_reply={:s}'.format(grpc_message_to_json_string(set_reply))) results = [] for (resource_key, resource_value), update_result in zip(resources_requested, set_reply.response): diff --git a/src/device/service/drivers/gnmi_openconfig/MonitoringThread.py b/src/device/service/drivers/gnmi_openconfig/MonitoringThread.py index 78bf6d8fbb2ad4e13414e4ebff7f65f577162f2d..505c2f009cc7a2ab312e062f1ad82bd01d4c183e 100644 --- a/src/device/service/drivers/gnmi_openconfig/MonitoringThread.py +++ b/src/device/service/drivers/gnmi_openconfig/MonitoringThread.py @@ -112,15 +112,15 @@ class MonitoringThread(threading.Thread): subscriptions.append(subscription) except queue.Empty: if len(subscriptions) == 0: continue - #self._logger.warning('[generate_requests] process') + self._logger.debug('[generate_requests] process') prefix = path_from_string(GNMI_PATH_PREFIX) if GNMI_PATH_PREFIX is not None else None qos = QOSMarking(marking=GNMI_QOS_MARKING) if GNMI_QOS_MARKING is not None else None subscriptions_list = SubscriptionList( prefix=prefix, mode=GNMI_SUBSCRIPTION_LIST_MODE, allow_aggregation=GNMI_ALLOW_AGGREGATION, encoding=GNMI_ENCODING, subscription=subscriptions, qos=qos) subscribe_request = SubscribeRequest(subscribe=subscriptions_list) - #str_subscribe_request = grpc_message_to_json_string(subscribe_request) - #self._logger.warning('[generate_requests] subscribe_request={:s}'.format(str_subscribe_request)) + str_subscribe_request = grpc_message_to_json_string(subscribe_request) + self._logger.debug('[generate_requests] subscribe_request={:s}'.format(str_subscribe_request)) yield subscribe_request subscriptions = [] except: # pylint: disable=bare-except diff --git a/src/device/service/drivers/gnmi_openconfig/handlers/InterfaceCounter.py b/src/device/service/drivers/gnmi_openconfig/handlers/InterfaceCounter.py index 6ce6ee5aa3ed843b2ac6fff9c112a20b2c02b15e..ae6d86c43addf4f3083b9900796365b3e0601620 100644 --- a/src/device/service/drivers/gnmi_openconfig/handlers/InterfaceCounter.py +++ b/src/device/service/drivers/gnmi_openconfig/handlers/InterfaceCounter.py @@ -27,14 +27,14 @@ class InterfaceCounterHandler(_Handler): def parse( self, json_data : Dict, yang_handler : YangHandler ) -> List[Tuple[str, Dict[str, Any]]]: - LOGGER.info('json_data = {:s}'.format(json.dumps(json_data))) + LOGGER.debug('json_data = {:s}'.format(json.dumps(json_data))) yang_interfaces_path = self.get_path() json_data_valid = yang_handler.parse_to_dict(yang_interfaces_path, json_data, fmt='json') entries = [] for interface in json_data_valid['interfaces']['interface']: - LOGGER.info('interface={:s}'.format(str(interface))) + LOGGER.debug('interface={:s}'.format(str(interface))) interface_name = interface['name'] interface_counters = interface.get('state', {}).get('counters', {}) @@ -56,7 +56,7 @@ class InterfaceCounterHandler(_Handler): 'out-pkts' : interface_counters['out_pkts' ], 'out-unicast-pkts' : interface_counters['out_unicast_pkts' ], } - LOGGER.info('interface = {:s}'.format(str(interface))) + LOGGER.debug('interface = {:s}'.format(str(interface))) entry_interface_key = '/interface[{:s}]'.format(interface_name) entries.append((entry_interface_key, _interface)) diff --git a/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstance.py b/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstance.py index c4a1c03e4a3fcf61cc939dfefe81d21afd6136a6..f1d1c56b4023a1250263aaf0995975d815eb5fec 100644 --- a/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstance.py +++ b/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstance.py @@ -71,7 +71,6 @@ class NetworkInstanceHandler(_Handler): #'protocols': {'protocol': protocols}, str_data = yang_ni.print_mem('json') - LOGGER.warning('str_data = {:s}'.format(str(str_data))) json_data = json.loads(str_data) json_data = json_data['openconfig-network-instance:network-instance'][0] str_data = json.dumps(json_data) @@ -80,7 +79,7 @@ class NetworkInstanceHandler(_Handler): def parse( self, json_data : Dict, yang_handler : YangHandler ) -> List[Tuple[str, Dict[str, Any]]]: - LOGGER.info('json_data = {:s}'.format(json.dumps(json_data))) + LOGGER.debug('json_data = {:s}'.format(json.dumps(json_data))) # Arista Parsing Fixes: # - Default instance comes with mpls/signaling-protocols/rsvp-te/global/hellos/state/hello-interval set to 0 diff --git a/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceInterface.py b/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceInterface.py index ed5e0408711fa54a25e1c2e2ca070f404465bdad..5e5ea9bf0bdc38b09d3959e8b6ecfc3534319817 100644 --- a/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceInterface.py +++ b/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceInterface.py @@ -60,7 +60,6 @@ class NetworkInstanceInterfaceHandler(_Handler): yang_ni_if.create_path('config/subinterface', sif_index) str_data = yang_ni_if.print_mem('json') - LOGGER.warning('[compose] str_data = {:s}'.format(str(str_data))) json_data = json.loads(str_data) json_data = json_data['openconfig-network-instance:interface'][0] str_data = json.dumps(json_data) @@ -69,6 +68,6 @@ class NetworkInstanceInterfaceHandler(_Handler): def parse( self, json_data : Dict, yang_handler : YangHandler ) -> List[Tuple[str, Dict[str, Any]]]: - LOGGER.warning('[parse] json_data = {:s}'.format(str(json_data))) + LOGGER.debug('[parse] json_data = {:s}'.format(str(json_data))) response = [] return response diff --git a/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceProtocol.py b/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceProtocol.py index f456461929bf80a04b96e2cf8cdda3070d94954c..f155fa1ca5c0a990abf18ab1c78059673d94e04e 100644 --- a/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceProtocol.py +++ b/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceProtocol.py @@ -66,7 +66,6 @@ class NetworkInstanceProtocolHandler(_Handler): yang_ni_pr.create_path('config/enabled', True ) str_data = yang_ni_pr.print_mem('json') - LOGGER.warning('[compose] str_data = {:s}'.format(str(str_data))) json_data = json.loads(str_data) json_data = json_data['openconfig-network-instance:protocol'][0] str_data = json.dumps(json_data) @@ -75,6 +74,6 @@ class NetworkInstanceProtocolHandler(_Handler): def parse( self, json_data : Dict, yang_handler : YangHandler ) -> List[Tuple[str, Dict[str, Any]]]: - LOGGER.warning('[parse] json_data = {:s}'.format(str(json_data))) + LOGGER.debug('[parse] json_data = {:s}'.format(str(json_data))) response = [] return response diff --git a/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceStaticRoute.py b/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceStaticRoute.py index ad1ef8b700e022a3c3b55cbad1847ad989680bb0..9f80b647b8e1188c80609dbdb47bbe9ea0d68b5f 100644 --- a/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceStaticRoute.py +++ b/src/device/service/drivers/gnmi_openconfig/handlers/NetworkInstanceStaticRoute.py @@ -88,7 +88,6 @@ class NetworkInstanceStaticRouteHandler(_Handler): yang_ni_pr_sr_nh.create_path('config/metric', metric) str_data = yang_ni_pr.print_mem('json') - LOGGER.warning('[compose] str_data = {:s}'.format(str(str_data))) json_data = json.loads(str_data) json_data = json_data['openconfig-network-instance:protocol'][0] str_data = json.dumps(json_data) @@ -97,6 +96,6 @@ class NetworkInstanceStaticRouteHandler(_Handler): def parse( self, json_data : Dict, yang_handler : YangHandler ) -> List[Tuple[str, Dict[str, Any]]]: - LOGGER.warning('[parse] json_data = {:s}'.format(str(json_data))) + LOGGER.debug('[parse] json_data = {:s}'.format(str(json_data))) response = [] return response