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

Proto: 

- Added RequestSlice to Interdomain
- Separated Create and Update in Slice
parent 400bc525

proto/interdomain.proto

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import "context.proto"; 


service InterdomainService {

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

  rpc RequestSlice              (context.Slice             ) returns (context.SliceId             ) {}

  rpc LookUpSlice               (context.Slice             ) returns (context.SliceId             ) {}

  rpc OrderSliceFromCatalog     (context.Slice             ) returns (context.Slice               ) {}

  rpc CreateSliceAndAddToCatalog(context.Slice             ) returns (context.Slice               ) {}

proto/slice.proto

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package slice; 
import "context.proto";



service SliceService {

  rpc CreateUpdateSlice (context.Slice) returns (context.SliceId) {}

  rpc DeleteSlice       (context.Slice) returns (context.Empty  ) {}

  rpc CreateSlice(context.Slice  ) returns (context.SliceId) {}

  rpc UpdateSlice(context.Slice  ) returns (context.SliceId) {}

  rpc DeleteSlice(context.SliceId) returns (context.Empty  ) {}

}

src/interdomain/proto/interdomain_pb2.py

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

  serialized_options=None,

  create_key=_descriptor._internal_create_key,

  serialized_pb=b'\n\x11interdomain.proto\x12\x0binterdomain\x1a\rcontext.proto2\x90\x02\n\x12InterdomainService\x12L\n\x0c\x41uthenticate\x12\x1b.context.TeraFlowController\x1a\x1d.context.AuthenticationResult\"\x00\x12\x31\n\x0bLookUpSlice\x12\x0e.context.Slice\x1a\x10.context.SliceId\"\x00\x12\x39\n\x15OrderSliceFromCatalog\x12\x0e.context.Slice\x1a\x0e.context.Slice\"\x00\x12>\n\x1a\x43reateSliceAndAddToCatalog\x12\x0e.context.Slice\x1a\x0e.context.Slice\"\x00\x62\x06proto3'

  serialized_pb=b'\n\x11interdomain.proto\x12\x0binterdomain\x1a\rcontext.proto2\xc4\x02\n\x12InterdomainService\x12\x32\n\x0cRequestSlice\x12\x0e.context.Slice\x1a\x10.context.SliceId\"\x00\x12L\n\x0c\x41uthenticate\x12\x1b.context.TeraFlowController\x1a\x1d.context.AuthenticationResult\"\x00\x12\x31\n\x0bLookUpSlice\x12\x0e.context.Slice\x1a\x10.context.SliceId\"\x00\x12\x39\n\x15OrderSliceFromCatalog\x12\x0e.context.Slice\x1a\x0e.context.Slice\"\x00\x12>\n\x1a\x43reateSliceAndAddToCatalog\x12\x0e.context.Slice\x1a\x0e.context.Slice\"\x00\x62\x06proto3'

  ,

  dependencies=[context__pb2.DESCRIPTOR,])
@@ -38,12 +38,22 @@ _INTERDOMAINSERVICE = _descriptor.ServiceDescriptor( 
  serialized_options=None,

  create_key=_descriptor._internal_create_key,

  serialized_start=50,

  serialized_end=322,

  serialized_end=374,

  methods=[

  _descriptor.MethodDescriptor(

    name='RequestSlice',

    full_name='interdomain.InterdomainService.RequestSlice',

    index=0,

    containing_service=None,

    input_type=context__pb2._SLICE,

    output_type=context__pb2._SLICEID,

    serialized_options=None,

    create_key=_descriptor._internal_create_key,

  ),

  _descriptor.MethodDescriptor(

    name='Authenticate',

    full_name='interdomain.InterdomainService.Authenticate',

    index=0,

    index=1,

    containing_service=None,

    input_type=context__pb2._TERAFLOWCONTROLLER,

    output_type=context__pb2._AUTHENTICATIONRESULT,
@@ -53,7 +63,7 @@ _INTERDOMAINSERVICE = _descriptor.ServiceDescriptor( 
  _descriptor.MethodDescriptor(

    name='LookUpSlice',

    full_name='interdomain.InterdomainService.LookUpSlice',

    index=1,

    index=2,

    containing_service=None,

    input_type=context__pb2._SLICE,

    output_type=context__pb2._SLICEID,
@@ -63,7 +73,7 @@ _INTERDOMAINSERVICE = _descriptor.ServiceDescriptor( 
  _descriptor.MethodDescriptor(

    name='OrderSliceFromCatalog',

    full_name='interdomain.InterdomainService.OrderSliceFromCatalog',

    index=2,

    index=3,

    containing_service=None,

    input_type=context__pb2._SLICE,

    output_type=context__pb2._SLICE,
@@ -73,7 +83,7 @@ _INTERDOMAINSERVICE = _descriptor.ServiceDescriptor( 
  _descriptor.MethodDescriptor(

    name='CreateSliceAndAddToCatalog',

    full_name='interdomain.InterdomainService.CreateSliceAndAddToCatalog',

    index=3,

    index=4,

    containing_service=None,

    input_type=context__pb2._SLICE,

    output_type=context__pb2._SLICE,

src/interdomain/proto/interdomain_pb2_grpc.py

+33 −0
Original line number Diff line number Diff line
@@ -14,6 +14,11 @@ class InterdomainServiceStub(object): 
        Args:

            channel: A grpc.Channel.

        """

        self.RequestSlice = channel.unary_unary(

                '/interdomain.InterdomainService/RequestSlice',

                request_serializer=context__pb2.Slice.SerializeToString,

                response_deserializer=context__pb2.SliceId.FromString,

                )

        self.Authenticate = channel.unary_unary(

                '/interdomain.InterdomainService/Authenticate',

                request_serializer=context__pb2.TeraFlowController.SerializeToString,
@@ -39,6 +44,12 @@ class InterdomainServiceStub(object): 
class InterdomainServiceServicer(object):

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



    def RequestSlice(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 Authenticate(self, request, context):

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

        context.set_code(grpc.StatusCode.UNIMPLEMENTED)
@@ -66,6 +77,11 @@ class InterdomainServiceServicer(object): 


def add_InterdomainServiceServicer_to_server(servicer, server):

    rpc_method_handlers = {

            'RequestSlice': grpc.unary_unary_rpc_method_handler(

                    servicer.RequestSlice,

                    request_deserializer=context__pb2.Slice.FromString,

                    response_serializer=context__pb2.SliceId.SerializeToString,

            ),

            'Authenticate': grpc.unary_unary_rpc_method_handler(

                    servicer.Authenticate,

                    request_deserializer=context__pb2.TeraFlowController.FromString,
@@ -96,6 +112,23 @@ def add_InterdomainServiceServicer_to_server(servicer, server): 
class InterdomainService(object):

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



    @staticmethod

    def RequestSlice(request,

            target,

            options=(),

            channel_credentials=None,

            call_credentials=None,

            insecure=False,

            compression=None,

            wait_for_ready=None,

            timeout=None,

            metadata=None):

        return grpc.experimental.unary_unary(request, target, '/interdomain.InterdomainService/RequestSlice',

            context__pb2.Slice.SerializeToString,

            context__pb2.SliceId.FromString,

            options, channel_credentials,

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



    @staticmethod

    def Authenticate(request,

            target,

src/interdomain/proto/slice_pb2.py

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

  serialized_options=None,

  create_key=_descriptor._internal_create_key,

  serialized_pb=b'\n\x0bslice.proto\x12\x05slice\x1a\rcontext.proto2x\n\x0cSliceService\x12\x37\n\x11\x43reateUpdateSlice\x12\x0e.context.Slice\x1a\x10.context.SliceId\"\x00\x12/\n\x0b\x44\x65leteSlice\x12\x0e.context.Slice\x1a\x0e.context.Empty\"\x00\x62\x06proto3'

  serialized_pb=b'\n\x0bslice.proto\x12\x05slice\x1a\rcontext.proto2\xa7\x01\n\x0cSliceService\x12\x31\n\x0b\x43reateSlice\x12\x0e.context.Slice\x1a\x10.context.SliceId\"\x00\x12\x31\n\x0bUpdateSlice\x12\x0e.context.Slice\x1a\x10.context.SliceId\"\x00\x12\x31\n\x0b\x44\x65leteSlice\x12\x10.context.SliceId\x1a\x0e.context.Empty\"\x00\x62\x06proto3'

  ,

  dependencies=[context__pb2.DESCRIPTOR,])
@@ -37,12 +37,12 @@ _SLICESERVICE = _descriptor.ServiceDescriptor( 
  index=0,

  serialized_options=None,

  create_key=_descriptor._internal_create_key,

  serialized_start=37,

  serialized_end=157,

  serialized_start=38,

  serialized_end=205,

  methods=[

  _descriptor.MethodDescriptor(

    name='CreateUpdateSlice',

    full_name='slice.SliceService.CreateUpdateSlice',

    name='CreateSlice',

    full_name='slice.SliceService.CreateSlice',

    index=0,

    containing_service=None,

    input_type=context__pb2._SLICE,
@@ -51,11 +51,21 @@ _SLICESERVICE = _descriptor.ServiceDescriptor( 
    create_key=_descriptor._internal_create_key,

  ),

  _descriptor.MethodDescriptor(

    name='DeleteSlice',

    full_name='slice.SliceService.DeleteSlice',

    name='UpdateSlice',

    full_name='slice.SliceService.UpdateSlice',

    index=1,

    containing_service=None,

    input_type=context__pb2._SLICE,

    output_type=context__pb2._SLICEID,

    serialized_options=None,

    create_key=_descriptor._internal_create_key,

  ),

  _descriptor.MethodDescriptor(

    name='DeleteSlice',

    full_name='slice.SliceService.DeleteSlice',

    index=2,

    containing_service=None,

    input_type=context__pb2._SLICEID,

    output_type=context__pb2._EMPTY,

    serialized_options=None,

    create_key=_descriptor._internal_create_key,