Skip to content
Snippets Groups Projects
Commit 2a3ddf38 authored by Waleed Akbar's avatar Waleed Akbar
Browse files

Update method names

parent 7a342bb6
No related branches found
No related tags found
2 merge requests!294Release TeraFlowSDN 4.0,!207Resolve "(CTTC) Separation of Monitoring"
...@@ -19,7 +19,7 @@ from common.Settings import get_service_host, get_service_port_grpc ...@@ -19,7 +19,7 @@ from common.Settings import get_service_host, get_service_port_grpc
from common.tools.client.RetryDecorator import retry, delay_exponential from common.tools.client.RetryDecorator import retry, delay_exponential
from common.tools.grpc.Tools import grpc_message_to_json_string from common.tools.grpc.Tools import grpc_message_to_json_string
from common.proto.context_pb2 import Empty from common.proto.context_pb2 import Empty
from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorList from common.proto.kpi_manager_pb2 import KpiId, KpiDescriptor, KpiDescriptorFilter, KpiDescriptorList
from common.proto.kpi_manager_pb2_grpc import KpiManagerServiceStub from common.proto.kpi_manager_pb2_grpc import KpiManagerServiceStub
LOGGER = logging.getLogger(__name__) LOGGER = logging.getLogger(__name__)
...@@ -29,8 +29,8 @@ RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, ...@@ -29,8 +29,8 @@ RETRY_DECORATOR = retry(max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION,
class KpiManagerClient: class KpiManagerClient:
def __init__(self, host=None, port=None): def __init__(self, host=None, port=None):
if not host: host = get_service_host(ServiceNameEnum.KPIMANAGER) # update enum if not host: host = get_service_host(ServiceNameEnum.KPIMANAGER)
if not port: port = get_service_port_grpc(ServiceNameEnum.KPIMANAGER) # update enum if not port: port = get_service_port_grpc(ServiceNameEnum.KPIMANAGER)
self.endpoint = '{:s}:{:s}'.format(str(host), str(port)) self.endpoint = '{:s}:{:s}'.format(str(host), str(port))
LOGGER.debug('Creating channel to {:s}...'.format(str(self.endpoint))) LOGGER.debug('Creating channel to {:s}...'.format(str(self.endpoint)))
self.channel = None self.channel = None
...@@ -48,17 +48,17 @@ class KpiManagerClient: ...@@ -48,17 +48,17 @@ class KpiManagerClient:
self.stub = None self.stub = None
@RETRY_DECORATOR @RETRY_DECORATOR
def SetKpi(self, request : KpiDescriptor) -> KpiId: def SetKpiDescriptor(self, request : KpiDescriptor) -> KpiId:
LOGGER.debug('SetKpi: {:s}'.format(grpc_message_to_json_string(request))) LOGGER.debug('SetKpiDescriptor: {:s}'.format(grpc_message_to_json_string(request)))
response = self.stub.SetKpi(request) response = self.stub.SetKpiDescriptor(request)
LOGGER.debug('SetKpi result: {:s}'.format(grpc_message_to_json_string(response))) LOGGER.debug('SetKpiDescriptor result: {:s}'.format(grpc_message_to_json_string(response)))
return response return response
@RETRY_DECORATOR @RETRY_DECORATOR
def DeleteKpi(self,request : KpiId) -> Empty: def DeleteKpiDescriptor(self,request : KpiId) -> Empty:
LOGGER.debug('DeleteKpi: {:s}'.format(grpc_message_to_json_string(request))) LOGGER.debug('DeleteKpiDescriptor: {:s}'.format(grpc_message_to_json_string(request)))
response = self.stub.DeleteKpi(request) response = self.stub.DeleteKpiDescriptor(request)
LOGGER.info('DeleteKpi result: {:s}'.format(grpc_message_to_json_string(response))) LOGGER.info('DeleteKpiDescriptor result: {:s}'.format(grpc_message_to_json_string(response)))
return response return response
@RETRY_DECORATOR @RETRY_DECORATOR
...@@ -69,8 +69,8 @@ class KpiManagerClient: ...@@ -69,8 +69,8 @@ class KpiManagerClient:
return response return response
@RETRY_DECORATOR @RETRY_DECORATOR
def GetKpiDescriptorList(self, request : Empty) -> KpiDescriptorList: def SelectKpiDescriptor(self, request : KpiDescriptorFilter) -> KpiDescriptorList:
LOGGER.debug('GetKpiDescriptorList: {:s}'.format(grpc_message_to_json_string(request))) LOGGER.debug('SelectKpiDescriptor: {:s}'.format(grpc_message_to_json_string(request)))
response = self.stub.GetKpiDescriptorList(request) response = self.stub.SelectKpiDescriptor(request)
LOGGER.debug('GetKpiDescriptorList result: {:s}'.format(grpc_message_to_json_string(response))) LOGGER.debug('SelectKpiDescriptor result: {:s}'.format(grpc_message_to_json_string(response)))
return response return response
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment