Commit 03c1ef9d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/context-connections' into 'develop' 

Added support for Connections handling in Context

See merge request teraflow-h2020/controller!67
parents b96dc0d5 8bf869c0

proto/context.proto

+67 −54
Original line number Diff line number Diff line
@@ -38,6 +38,13 @@ service ContextService { 
  rpc SetService         (Service     ) returns (       ServiceId       ) {}

  rpc RemoveService      (ServiceId   ) returns (       Empty           ) {}

  rpc GetServiceEvents   (Empty       ) returns (stream ServiceEvent    ) {}



  rpc ListConnectionIds  (ServiceId   ) returns (       ConnectionIdList) {}

  rpc ListConnections    (ServiceId   ) returns (       ConnectionList  ) {}

  rpc GetConnection      (ConnectionId) returns (       Connection      ) {}

  rpc SetConnection      (Connection  ) returns (       ConnectionId    ) {}

  rpc RemoveConnection   (ConnectionId) returns (       Empty           ) {}

  rpc GetConnectionEvents(Empty       ) returns (stream ConnectionEvent ) {}

}



// ----- Generic -------------------------------------------------------------------------------------------------------
@@ -233,6 +240,32 @@ message ServiceEvent { 
}





// ----- Connection ----------------------------------------------------------------------------------------------------

message ConnectionId {

  Uuid connection_uuid = 1;

}



message Connection {

  ConnectionId connection_id = 1;

  ServiceId service_id = 2;

  repeated EndPointId path_hops_endpoint_ids = 3;

  repeated ServiceId sub_service_ids = 4;

}



message ConnectionIdList {

  repeated ConnectionId connection_ids = 1;

}



message ConnectionList {

  repeated Connection connections = 1;

}



message ConnectionEvent {

  Event event = 1;

  ConnectionId connection_id = 2;

}





// ----- Endpoint ------------------------------------------------------------------------------------------------------

message EndPointId {

  TopologyId topology_id = 1;
@@ -268,26 +301,6 @@ message Constraint { 
}





// ----- Connection ----------------------------------------------------------------------------------------------------

message ConnectionId {

  Uuid connection_uuid = 1;

}



message Connection {

  ConnectionId connection_id = 1;

  ServiceId related_service_id = 2;

  repeated EndPointId path = 3;

}



message ConnectionIdList {

  repeated ConnectionId connection_ids = 1;

}



message ConnectionList {

  repeated Connection connections = 1;

}





// ----- Miscellaneous -------------------------------------------------------------------------------------------------

message TeraFlowController {

  ContextId context_id = 1;

src/common/type_checkers/Assertions.py

+34 −0
Original line number Diff line number Diff line
@@ -138,6 +138,12 @@ def validate_endpoint_id(message): 
    assert 'endpoint_uuid' in message

    validate_uuid(message['endpoint_uuid'])



def validate_connection_id(message):

    assert isinstance(message, dict)

    assert len(message.keys()) == 1

    assert 'connection_uuid' in message

    validate_uuid(message['connection_uuid'])





# ----- Lists of Identifiers -------------------------------------------------------------------------------------------
@@ -176,6 +182,13 @@ def validate_link_ids(message): 
    assert isinstance(message['link_ids'], list)

    for link_id in message['link_ids']: validate_link_id(link_id)



def validate_connection_ids(message):

    assert isinstance(message, dict)

    assert len(message.keys()) == 1

    assert 'connection_ids' in message

    assert isinstance(message['connection_ids'], list)

    for connection_id in message['connection_ids']: validate_connection_id(connection_id)





# ----- Objects --------------------------------------------------------------------------------------------------------
@@ -268,6 +281,20 @@ def validate_link(message): 
    assert isinstance(message['link_endpoint_ids'], list)

    for endpoint_id in message['link_endpoint_ids']: validate_endpoint_id(endpoint_id)



def validate_connection(message):

    assert isinstance(message, dict)

    assert len(message.keys()) == 4

    assert 'connection_id' in message

    validate_connection_id(message['connection_id'])

    assert 'service_id' in message

    validate_service_id(message['service_id'])

    assert 'path_hops_endpoint_ids' in message

    assert isinstance(message['path_hops_endpoint_ids'], list)

    for endpoint_id in message['path_hops_endpoint_ids']: validate_endpoint_id(endpoint_id)

    assert 'sub_service_ids' in message

    assert isinstance(message['sub_service_ids'], list)

    for sub_service_id in message['sub_service_ids']: validate_service_id(sub_service_id)





# ----- Lists of Objects -----------------------------------------------------------------------------------------------
@@ -305,3 +332,10 @@ def validate_links(message): 
    assert 'links' in message

    assert isinstance(message['links'], list)

    for link in message['links']: validate_link(link)



def validate_connections(message):

    assert isinstance(message, dict)

    assert len(message.keys()) == 1

    assert 'connections' in message

    assert isinstance(message['connections'], list)

    for connection in message['connections']: validate_connection(connection)

src/compute/proto/context_pb2.py

+267 −150

File changed.

Preview size limit exceeded, changes collapsed.

src/context/client/ContextClient.py

+47 −7
Original line number Diff line number Diff line 
from typing import Iterator

import grpc, logging

from common.tools.client.RetryDecorator import retry, delay_exponential

from context.proto.context_pb2 import \

    Context,  ContextEvent,  ContextId,  ContextIdList,  ContextList,  \

    Device,   DeviceEvent,   DeviceId,   DeviceIdList,   DeviceList,   \

    Empty,                                                             \

    Link,     LinkEvent,     LinkId,     LinkIdList,     LinkList,     \

    Service,  ServiceEvent,  ServiceId,  ServiceIdList,  ServiceList,  \

    Topology, TopologyEvent, TopologyId, TopologyIdList, TopologyList

from context.proto.context_pb2 import (

    Connection, ConnectionEvent, ConnectionId, ConnectionIdList, ConnectionList, Context, ContextEvent, ContextId,

    ContextIdList, ContextList, Device, DeviceEvent, DeviceId, DeviceIdList, DeviceList, Empty, Link, LinkEvent,

    LinkId, LinkIdList, LinkList, Service, ServiceEvent, ServiceId, ServiceIdList, ServiceList, Topology,

    TopologyEvent, TopologyId, TopologyIdList, TopologyList)

from context.proto.context_pb2_grpc import ContextServiceStub



LOGGER = logging.getLogger(__name__)
@@ -241,3 +239,45 @@ class ContextClient: 
        response = self.stub.GetServiceEvents(request)

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

        return response



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

    def ListConnectionIds(self, request: ServiceId) -> ConnectionIdList:

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

        response = self.stub.ListConnectionIds(request)

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

        return response



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

    def ListConnections(self, request: ServiceId) -> ConnectionList:

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

        response = self.stub.ListConnections(request)

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

        return response



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

    def GetConnection(self, request: ConnectionId) -> Connection:

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

        response = self.stub.GetConnection(request)

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

        return response



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

    def SetConnection(self, request: Connection) -> ConnectionId:

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

        response = self.stub.SetConnection(request)

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

        return response



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

    def RemoveConnection(self, request: ConnectionId) -> Empty:

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

        response = self.stub.RemoveConnection(request)

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

        return response



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

    def GetConnectionEvents(self, request: Empty) -> Iterator[ConnectionEvent]:

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

        response = self.stub.GetConnectionEvents(request)

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

        return response

src/context/proto/context_pb2.py

+267 −150

File changed.

Preview size limit exceeded, changes collapsed.