Commit e85e7af4 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Changes: 

- Corrections in Service to prevent errors in GitLab CI/CD pipeline.
- Minor improvements in random classes.
parent eff7b2f2

proto/service.proto

+1 −3
Original line number Diff line number Diff line
@@ -4,10 +4,8 @@ package service; 
import "context.proto";



service ServiceService {

  rpc GetServiceList   (context.Empty    ) returns (context.ServiceList   ) {}

  rpc CreateService    (context.Service  ) returns (context.ServiceId     ) {}

  rpc UpdateService    (context.Service  ) returns (context.ServiceId     ) {}

  rpc DeleteService    (context.ServiceId) returns (context.Empty         ) {}

  rpc GetServiceById   (context.ServiceId) returns (context.Service       ) {}

  rpc GetConnectionList(context.Empty    ) returns (context.ConnectionList) {}

  rpc GetConnectionList(context.ServiceId) returns (context.ConnectionList) {}

}

src/compute/client/ComputeClient.py

+16 −16
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ DELAY_FUNCTION = delay_exponential(initial=0.01, increment=2.0, maximum=5.0) 


class ComputeClient:

    def __init__(self, address, port):

        self.endpoint = '{}:{}'.format(address, port)

        LOGGER.debug('Creating channel to {}...'.format(self.endpoint))

        self.endpoint = '{:s}:{:s}'.format(str(address), str(port))

        LOGGER.debug('Creating channel to {:s}...'.format(str(self.endpoint)))

        self.channel = None

        self.stub = None

        self.connect()
@@ -28,49 +28,49 @@ class ComputeClient: 


    @retry(exceptions=set(), max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

    def CheckCredentials(self, request : TeraFlowController) -> AuthenticationResult:

        LOGGER.debug('CheckCredentials request: {}'.format(request))

        LOGGER.debug('CheckCredentials request: {:s}'.format(str(request)))

        response = self.stub.CheckCredentials(request)

        LOGGER.debug('CheckCredentials result: {}'.format(response))

        LOGGER.debug('CheckCredentials result: {:s}'.format(str(response)))

        return response



    @retry(exceptions=set(), max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

    def GetConnectivityServiceStatus(self, request : ServiceId) -> ServiceState:

        LOGGER.debug('GetConnectivityServiceStatus request: {}'.format(request))

        LOGGER.debug('GetConnectivityServiceStatus request: {:s}'.format(str(request)))

        response = self.stub.GetConnectivityServiceStatus(request)

        LOGGER.debug('GetConnectivityServiceStatus result: {}'.format(response))

        LOGGER.debug('GetConnectivityServiceStatus result: {:s}'.format(str(response)))

        return response



    @retry(exceptions=set(), max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

    def CreateConnectivityService(self, request : Service) -> ServiceId:

        LOGGER.debug('CreateConnectivityService request: {}'.format(request))

        LOGGER.debug('CreateConnectivityService request: {:s}'.format(str(request)))

        response = self.stub.CreateConnectivityService(request)

        LOGGER.debug('CreateConnectivityService result: {}'.format(response))

        LOGGER.debug('CreateConnectivityService result: {:s}'.format(str(response)))

        return response



    @retry(exceptions=set(), max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

    def EditConnectivityService(self, request : Service) -> ServiceId:

        LOGGER.debug('EditConnectivityService request: {}'.format(request))

        LOGGER.debug('EditConnectivityService request: {:s}'.format(str(request)))

        response = self.stub.EditConnectivityService(request)

        LOGGER.debug('EditConnectivityService result: {}'.format(response))

        LOGGER.debug('EditConnectivityService result: {:s}'.format(str(response)))

        return response



    @retry(exceptions=set(), max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

    def DeleteConnectivityService(self, request : Service) -> Empty:

        LOGGER.debug('DeleteConnectivityService request: {}'.format(request))

        LOGGER.debug('DeleteConnectivityService request: {:s}'.format(str(request)))

        response = self.stub.DeleteConnectivityService(request)

        LOGGER.debug('DeleteConnectivityService result: {}'.format(response))

        LOGGER.debug('DeleteConnectivityService result: {:s}'.format(str(response)))

        return response



    @retry(exceptions=set(), max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

    def GetAllActiveConnectivityServices(self, request : Empty) -> ServiceIdList:

        LOGGER.debug('GetAllActiveConnectivityServices request: {}'.format(request))

        LOGGER.debug('GetAllActiveConnectivityServices request: {:s}'.format(str(request)))

        response = self.stub.GetAllActiveConnectivityServices(request)

        LOGGER.debug('GetAllActiveConnectivityServices result: {}'.format(response))

        LOGGER.debug('GetAllActiveConnectivityServices result: {:s}'.format(str(response)))

        return response



    @retry(exceptions=set(), max_retries=MAX_RETRIES, delay_function=DELAY_FUNCTION, prepare_method_name='connect')

    def ClearAllConnectivityServices(self, request : Empty) -> Empty:

        LOGGER.debug('ClearAllConnectivityServices request: {}'.format(request))

        LOGGER.debug('ClearAllConnectivityServices request: {:s}'.format(str(request)))

        response = self.stub.ClearAllConnectivityServices(request)

        LOGGER.debug('ClearAllConnectivityServices result: {}'.format(response))

        LOGGER.debug('ClearAllConnectivityServices result: {:s}'.format(str(response)))

        return response

src/context/client/ContextClient.py

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ DELAY_FUNCTION = delay_exponential(initial=0.01, increment=2.0, maximum=5.0) 


class ContextClient:

    def __init__(self, address, port):

        self.endpoint = '{}:{}'.format(address, port)

        self.endpoint = '{:s}:{:s}'.format(str(address), str(port))

        LOGGER.debug('Creating channel to {:s}...'.format(self.endpoint))

        self.channel = None

        self.stub = None

src/context/service/__main__.py

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ from context.service.rest_server.Resources import RESOURCES 
terminate = threading.Event()

LOGGER = None



def signal_handler(signal_, frame):

def signal_handler(signal, frame):

    LOGGER.warning('Terminate signal received')

    terminate.set()

src/context/service/grpc_server/ContextService.py

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ class ContextService: 
        self.server = None



    def start(self):

        self.endpoint = '{:s}:{:s}'.format(self.address, str(self.port))

        self.endpoint = '{:s}:{:s}'.format(str(self.address), str(self.port))

        LOGGER.info('Starting Service (tentative endpoint: {:s}, max_workers: {:s})...'.format(

            str(self.endpoint), str(self.max_workers)))