Commit 99fbcd44 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/fix-compute-service' into 'develop' 

Fix renaming of compute.proto methods from snake-case to camel-case in component.

See merge request teraflow-h2020/controller!16
parents 8e7897b6 d9a2b5e0

proto/compute.proto

+7 −7
Original line number Diff line number Diff line
@@ -5,11 +5,11 @@ import "context.proto"; 
import "service.proto";



service ComputeService {

  rpc checkCredentials (context.TeraFlowController) returns (context.AuthenticationResult) {}

  rpc getConnectivityServiceStatus ( service.ServiceId ) returns (service.ServiceState) {}

  rpc createConnectivityService ( service.Service ) returns (service.ServiceId) {}

  rpc editConnectivityService ( service.Service ) returns (service.ServiceId) {}

  rpc deleteConnectivityService ( service.Service ) returns ( context.Empty ) {}

  rpc getAllActiveConnectivityServices ( context.Empty ) returns ( service.ServiceIdList ) {}

  rpc clearAllConnectivityServices ( context.Empty ) returns ( context.Empty ) {}

  rpc CheckCredentials (context.TeraFlowController) returns (context.AuthenticationResult) {}

  rpc GetConnectivityServiceStatus ( service.ServiceId ) returns (service.ServiceState) {}

  rpc CreateConnectivityService ( service.Service ) returns (service.ServiceId) {}

  rpc EditConnectivityService ( service.Service ) returns (service.ServiceId) {}

  rpc DeleteConnectivityService ( service.Service ) returns ( context.Empty ) {}

  rpc GetAllActiveConnectivityServices ( context.Empty ) returns ( service.ServiceIdList ) {}

  rpc ClearAllConnectivityServices ( context.Empty ) returns ( context.Empty ) {}

}

src/compute/client/ComputeClient.py

+7 −13
Original line number Diff line number Diff line
@@ -29,54 +29,48 @@ 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))

        response = self.stub.check_credentials(request)

        response = self.stub.CheckCredentials(request)

        LOGGER.debug('CheckCredentials result: {}'.format(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))

        response = self.stub.get_connectivity_service_status(request)

        response = self.stub.GetConnectivityServiceStatus(request)

        LOGGER.debug('GetConnectivityServiceStatus result: {}'.format(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))

        response = self.stub.create_connectivity_service(request)

        response = self.stub.CreateConnectivityService(request)

        LOGGER.debug('CreateConnectivityService result: {}'.format(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))

        response = self.stub.edit_connectivity_service(request)

        response = self.stub.EditConnectivityService(request)

        LOGGER.debug('EditConnectivityService result: {}'.format(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))

        response = self.stub.delete_connectivity_service(request)

        response = self.stub.DeleteConnectivityService(request)

        LOGGER.debug('DeleteConnectivityService result: {}'.format(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))

        response = self.stub.get_all_active_connectivity_services(request)

        response = self.stub.GetAllActiveConnectivityServices(request)

        LOGGER.debug('GetAllActiveConnectivityServices result: {}'.format(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))

        response = self.stub.clear_all_connectivity_services(request)

        response = self.stub.ClearAllConnectivityServices(request)

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

        return response

src/compute/proto/compute_pb2.py

+16 −16
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ DESCRIPTOR = _descriptor.FileDescriptor( 
  syntax='proto3',

  serialized_options=None,

  create_key=_descriptor._internal_create_key,

  serialized_pb=b'\n\rcompute.proto\x12\x07\x63ompute\x1a\rcontext.proto\x1a\rservice.proto2\x99\x04\n\x0e\x43omputeService\x12Q\n\x11\x63heck_credentials\x12\x1b.context.TeraFlowController\x1a\x1d.context.AuthenticationResult\"\x00\x12N\n\x1fget_connectivity_service_status\x12\x12.service.ServiceId\x1a\x15.service.ServiceState\"\x00\x12\x45\n\x1b\x63reate_connectivity_service\x12\x10.service.Service\x1a\x12.service.ServiceId\"\x00\x12\x43\n\x19\x65\x64it_connectivity_service\x12\x10.service.Service\x1a\x12.service.ServiceId\"\x00\x12\x41\n\x1b\x64\x65lete_connectivity_service\x12\x10.service.Service\x1a\x0e.context.Empty\"\x00\x12P\n$get_all_active_connectivity_services\x12\x0e.context.Empty\x1a\x16.service.ServiceIdList\"\x00\x12\x43\n\x1f\x63lear_all_connectivity_services\x12\x0e.context.Empty\x1a\x0e.context.Empty\"\x00\x62\x06proto3'

  serialized_pb=b'\n\rcompute.proto\x12\x07\x63ompute\x1a\rcontext.proto\x1a\rservice.proto2\x88\x04\n\x0e\x43omputeService\x12P\n\x10\x43heckCredentials\x12\x1b.context.TeraFlowController\x1a\x1d.context.AuthenticationResult\"\x00\x12K\n\x1cGetConnectivityServiceStatus\x12\x12.service.ServiceId\x1a\x15.service.ServiceState\"\x00\x12\x43\n\x19\x43reateConnectivityService\x12\x10.service.Service\x1a\x12.service.ServiceId\"\x00\x12\x41\n\x17\x45\x64itConnectivityService\x12\x10.service.Service\x1a\x12.service.ServiceId\"\x00\x12?\n\x19\x44\x65leteConnectivityService\x12\x10.service.Service\x1a\x0e.context.Empty\"\x00\x12L\n GetAllActiveConnectivityServices\x12\x0e.context.Empty\x1a\x16.service.ServiceIdList\"\x00\x12@\n\x1c\x43learAllConnectivityServices\x12\x0e.context.Empty\x1a\x0e.context.Empty\"\x00\x62\x06proto3'

  ,

  dependencies=[context__pb2.DESCRIPTOR,service__pb2.DESCRIPTOR,])
@@ -39,11 +39,11 @@ _COMPUTESERVICE = _descriptor.ServiceDescriptor( 
  serialized_options=None,

  create_key=_descriptor._internal_create_key,

  serialized_start=57,

  serialized_end=594,

  serialized_end=577,

  methods=[

  _descriptor.MethodDescriptor(

    name='check_credentials',

    full_name='compute.ComputeService.check_credentials',

    name='CheckCredentials',

    full_name='compute.ComputeService.CheckCredentials',

    index=0,

    containing_service=None,

    input_type=context__pb2._TERAFLOWCONTROLLER,
@@ -52,8 +52,8 @@ _COMPUTESERVICE = _descriptor.ServiceDescriptor( 
    create_key=_descriptor._internal_create_key,

  ),

  _descriptor.MethodDescriptor(

    name='get_connectivity_service_status',

    full_name='compute.ComputeService.get_connectivity_service_status',

    name='GetConnectivityServiceStatus',

    full_name='compute.ComputeService.GetConnectivityServiceStatus',

    index=1,

    containing_service=None,

    input_type=service__pb2._SERVICEID,
@@ -62,8 +62,8 @@ _COMPUTESERVICE = _descriptor.ServiceDescriptor( 
    create_key=_descriptor._internal_create_key,

  ),

  _descriptor.MethodDescriptor(

    name='create_connectivity_service',

    full_name='compute.ComputeService.create_connectivity_service',

    name='CreateConnectivityService',

    full_name='compute.ComputeService.CreateConnectivityService',

    index=2,

    containing_service=None,

    input_type=service__pb2._SERVICE,
@@ -72,8 +72,8 @@ _COMPUTESERVICE = _descriptor.ServiceDescriptor( 
    create_key=_descriptor._internal_create_key,

  ),

  _descriptor.MethodDescriptor(

    name='edit_connectivity_service',

    full_name='compute.ComputeService.edit_connectivity_service',

    name='EditConnectivityService',

    full_name='compute.ComputeService.EditConnectivityService',

    index=3,

    containing_service=None,

    input_type=service__pb2._SERVICE,
@@ -82,8 +82,8 @@ _COMPUTESERVICE = _descriptor.ServiceDescriptor( 
    create_key=_descriptor._internal_create_key,

  ),

  _descriptor.MethodDescriptor(

    name='delete_connectivity_service',

    full_name='compute.ComputeService.delete_connectivity_service',

    name='DeleteConnectivityService',

    full_name='compute.ComputeService.DeleteConnectivityService',

    index=4,

    containing_service=None,

    input_type=service__pb2._SERVICE,
@@ -92,8 +92,8 @@ _COMPUTESERVICE = _descriptor.ServiceDescriptor( 
    create_key=_descriptor._internal_create_key,

  ),

  _descriptor.MethodDescriptor(

    name='get_all_active_connectivity_services',

    full_name='compute.ComputeService.get_all_active_connectivity_services',

    name='GetAllActiveConnectivityServices',

    full_name='compute.ComputeService.GetAllActiveConnectivityServices',

    index=5,

    containing_service=None,

    input_type=context__pb2._EMPTY,
@@ -102,8 +102,8 @@ _COMPUTESERVICE = _descriptor.ServiceDescriptor( 
    create_key=_descriptor._internal_create_key,

  ),

  _descriptor.MethodDescriptor(

    name='clear_all_connectivity_services',

    full_name='compute.ComputeService.clear_all_connectivity_services',

    name='ClearAllConnectivityServices',

    full_name='compute.ComputeService.ClearAllConnectivityServices',

    index=6,

    containing_service=None,

    input_type=context__pb2._EMPTY,

src/compute/proto/compute_pb2_grpc.py

+49 −49
Original line number Diff line number Diff line
@@ -15,38 +15,38 @@ class ComputeServiceStub(object): 
        Args:

            channel: A grpc.Channel.

        """

        self.check_credentials = channel.unary_unary(

                '/compute.ComputeService/check_credentials',

        self.CheckCredentials = channel.unary_unary(

                '/compute.ComputeService/CheckCredentials',

                request_serializer=context__pb2.TeraFlowController.SerializeToString,

                response_deserializer=context__pb2.AuthenticationResult.FromString,

                )

        self.get_connectivity_service_status = channel.unary_unary(

                '/compute.ComputeService/get_connectivity_service_status',

        self.GetConnectivityServiceStatus = channel.unary_unary(

                '/compute.ComputeService/GetConnectivityServiceStatus',

                request_serializer=service__pb2.ServiceId.SerializeToString,

                response_deserializer=service__pb2.ServiceState.FromString,

                )

        self.create_connectivity_service = channel.unary_unary(

                '/compute.ComputeService/create_connectivity_service',

        self.CreateConnectivityService = channel.unary_unary(

                '/compute.ComputeService/CreateConnectivityService',

                request_serializer=service__pb2.Service.SerializeToString,

                response_deserializer=service__pb2.ServiceId.FromString,

                )

        self.edit_connectivity_service = channel.unary_unary(

                '/compute.ComputeService/edit_connectivity_service',

        self.EditConnectivityService = channel.unary_unary(

                '/compute.ComputeService/EditConnectivityService',

                request_serializer=service__pb2.Service.SerializeToString,

                response_deserializer=service__pb2.ServiceId.FromString,

                )

        self.delete_connectivity_service = channel.unary_unary(

                '/compute.ComputeService/delete_connectivity_service',

        self.DeleteConnectivityService = channel.unary_unary(

                '/compute.ComputeService/DeleteConnectivityService',

                request_serializer=service__pb2.Service.SerializeToString,

                response_deserializer=context__pb2.Empty.FromString,

                )

        self.get_all_active_connectivity_services = channel.unary_unary(

                '/compute.ComputeService/get_all_active_connectivity_services',

        self.GetAllActiveConnectivityServices = channel.unary_unary(

                '/compute.ComputeService/GetAllActiveConnectivityServices',

                request_serializer=context__pb2.Empty.SerializeToString,

                response_deserializer=service__pb2.ServiceIdList.FromString,

                )

        self.clear_all_connectivity_services = channel.unary_unary(

                '/compute.ComputeService/clear_all_connectivity_services',

        self.ClearAllConnectivityServices = channel.unary_unary(

                '/compute.ComputeService/ClearAllConnectivityServices',

                request_serializer=context__pb2.Empty.SerializeToString,

                response_deserializer=context__pb2.Empty.FromString,

                )
@@ -55,43 +55,43 @@ class ComputeServiceStub(object): 
class ComputeServiceServicer(object):

    """Missing associated documentation comment in .proto file."""



    def check_credentials(self, request, context):

    def CheckCredentials(self, request, context):

        """Missing associated documentation comment in .proto file."""

        context.set_code(grpc.StatusCode.UNIMPLEMENTED)

        context.set_details('Method not implemented!')

        raise NotImplementedError('Method not implemented!')



    def get_connectivity_service_status(self, request, context):

    def GetConnectivityServiceStatus(self, request, context):

        """Missing associated documentation comment in .proto file."""

        context.set_code(grpc.StatusCode.UNIMPLEMENTED)

        context.set_details('Method not implemented!')

        raise NotImplementedError('Method not implemented!')



    def create_connectivity_service(self, request, context):

    def CreateConnectivityService(self, request, context):

        """Missing associated documentation comment in .proto file."""

        context.set_code(grpc.StatusCode.UNIMPLEMENTED)

        context.set_details('Method not implemented!')

        raise NotImplementedError('Method not implemented!')



    def edit_connectivity_service(self, request, context):

    def EditConnectivityService(self, request, context):

        """Missing associated documentation comment in .proto file."""

        context.set_code(grpc.StatusCode.UNIMPLEMENTED)

        context.set_details('Method not implemented!')

        raise NotImplementedError('Method not implemented!')



    def delete_connectivity_service(self, request, context):

    def DeleteConnectivityService(self, request, context):

        """Missing associated documentation comment in .proto file."""

        context.set_code(grpc.StatusCode.UNIMPLEMENTED)

        context.set_details('Method not implemented!')

        raise NotImplementedError('Method not implemented!')



    def get_all_active_connectivity_services(self, request, context):

    def GetAllActiveConnectivityServices(self, request, context):

        """Missing associated documentation comment in .proto file."""

        context.set_code(grpc.StatusCode.UNIMPLEMENTED)

        context.set_details('Method not implemented!')

        raise NotImplementedError('Method not implemented!')



    def clear_all_connectivity_services(self, request, context):

    def ClearAllConnectivityServices(self, request, context):

        """Missing associated documentation comment in .proto file."""

        context.set_code(grpc.StatusCode.UNIMPLEMENTED)

        context.set_details('Method not implemented!')
@@ -100,38 +100,38 @@ class ComputeServiceServicer(object): 


def add_ComputeServiceServicer_to_server(servicer, server):

    rpc_method_handlers = {

            'check_credentials': grpc.unary_unary_rpc_method_handler(

                    servicer.check_credentials,

            'CheckCredentials': grpc.unary_unary_rpc_method_handler(

                    servicer.CheckCredentials,

                    request_deserializer=context__pb2.TeraFlowController.FromString,

                    response_serializer=context__pb2.AuthenticationResult.SerializeToString,

            ),

            'get_connectivity_service_status': grpc.unary_unary_rpc_method_handler(

                    servicer.get_connectivity_service_status,

            'GetConnectivityServiceStatus': grpc.unary_unary_rpc_method_handler(

                    servicer.GetConnectivityServiceStatus,

                    request_deserializer=service__pb2.ServiceId.FromString,

                    response_serializer=service__pb2.ServiceState.SerializeToString,

            ),

            'create_connectivity_service': grpc.unary_unary_rpc_method_handler(

                    servicer.create_connectivity_service,

            'CreateConnectivityService': grpc.unary_unary_rpc_method_handler(

                    servicer.CreateConnectivityService,

                    request_deserializer=service__pb2.Service.FromString,

                    response_serializer=service__pb2.ServiceId.SerializeToString,

            ),

            'edit_connectivity_service': grpc.unary_unary_rpc_method_handler(

                    servicer.edit_connectivity_service,

            'EditConnectivityService': grpc.unary_unary_rpc_method_handler(

                    servicer.EditConnectivityService,

                    request_deserializer=service__pb2.Service.FromString,

                    response_serializer=service__pb2.ServiceId.SerializeToString,

            ),

            'delete_connectivity_service': grpc.unary_unary_rpc_method_handler(

                    servicer.delete_connectivity_service,

            'DeleteConnectivityService': grpc.unary_unary_rpc_method_handler(

                    servicer.DeleteConnectivityService,

                    request_deserializer=service__pb2.Service.FromString,

                    response_serializer=context__pb2.Empty.SerializeToString,

            ),

            'get_all_active_connectivity_services': grpc.unary_unary_rpc_method_handler(

                    servicer.get_all_active_connectivity_services,

            'GetAllActiveConnectivityServices': grpc.unary_unary_rpc_method_handler(

                    servicer.GetAllActiveConnectivityServices,

                    request_deserializer=context__pb2.Empty.FromString,

                    response_serializer=service__pb2.ServiceIdList.SerializeToString,

            ),

            'clear_all_connectivity_services': grpc.unary_unary_rpc_method_handler(

                    servicer.clear_all_connectivity_services,

            'ClearAllConnectivityServices': grpc.unary_unary_rpc_method_handler(

                    servicer.ClearAllConnectivityServices,

                    request_deserializer=context__pb2.Empty.FromString,

                    response_serializer=context__pb2.Empty.SerializeToString,

            ),
@@ -146,7 +146,7 @@ class ComputeService(object): 
    """Missing associated documentation comment in .proto file."""



    @staticmethod

    def check_credentials(request,

    def CheckCredentials(request,

            target,

            options=(),

            channel_credentials=None,
@@ -156,14 +156,14 @@ class ComputeService(object): 
            wait_for_ready=None,

            timeout=None,

            metadata=None):

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/check_credentials',

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/CheckCredentials',

            context__pb2.TeraFlowController.SerializeToString,

            context__pb2.AuthenticationResult.FromString,

            options, channel_credentials,

            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)



    @staticmethod

    def get_connectivity_service_status(request,

    def GetConnectivityServiceStatus(request,

            target,

            options=(),

            channel_credentials=None,
@@ -173,14 +173,14 @@ class ComputeService(object): 
            wait_for_ready=None,

            timeout=None,

            metadata=None):

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/get_connectivity_service_status',

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/GetConnectivityServiceStatus',

            service__pb2.ServiceId.SerializeToString,

            service__pb2.ServiceState.FromString,

            options, channel_credentials,

            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)



    @staticmethod

    def create_connectivity_service(request,

    def CreateConnectivityService(request,

            target,

            options=(),

            channel_credentials=None,
@@ -190,14 +190,14 @@ class ComputeService(object): 
            wait_for_ready=None,

            timeout=None,

            metadata=None):

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/create_connectivity_service',

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/CreateConnectivityService',

            service__pb2.Service.SerializeToString,

            service__pb2.ServiceId.FromString,

            options, channel_credentials,

            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)



    @staticmethod

    def edit_connectivity_service(request,

    def EditConnectivityService(request,

            target,

            options=(),

            channel_credentials=None,
@@ -207,14 +207,14 @@ class ComputeService(object): 
            wait_for_ready=None,

            timeout=None,

            metadata=None):

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/edit_connectivity_service',

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/EditConnectivityService',

            service__pb2.Service.SerializeToString,

            service__pb2.ServiceId.FromString,

            options, channel_credentials,

            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)



    @staticmethod

    def delete_connectivity_service(request,

    def DeleteConnectivityService(request,

            target,

            options=(),

            channel_credentials=None,
@@ -224,14 +224,14 @@ class ComputeService(object): 
            wait_for_ready=None,

            timeout=None,

            metadata=None):

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/delete_connectivity_service',

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/DeleteConnectivityService',

            service__pb2.Service.SerializeToString,

            context__pb2.Empty.FromString,

            options, channel_credentials,

            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)



    @staticmethod

    def get_all_active_connectivity_services(request,

    def GetAllActiveConnectivityServices(request,

            target,

            options=(),

            channel_credentials=None,
@@ -241,14 +241,14 @@ class ComputeService(object): 
            wait_for_ready=None,

            timeout=None,

            metadata=None):

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/get_all_active_connectivity_services',

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/GetAllActiveConnectivityServices',

            context__pb2.Empty.SerializeToString,

            service__pb2.ServiceIdList.FromString,

            options, channel_credentials,

            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)



    @staticmethod

    def clear_all_connectivity_services(request,

    def ClearAllConnectivityServices(request,

            target,

            options=(),

            channel_credentials=None,
@@ -258,7 +258,7 @@ class ComputeService(object): 
            wait_for_ready=None,

            timeout=None,

            metadata=None):

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/clear_all_connectivity_services',

        return grpc.experimental.unary_unary(request, target, '/compute.ComputeService/ClearAllConnectivityServices',

            context__pb2.Empty.SerializeToString,

            context__pb2.Empty.FromString,

            options, channel_credentials,

src/compute/service/ComputeServiceServicerImpl.py

+35 −35

File changed.

Preview size limit exceeded, changes collapsed.