Commit 1d16da8d authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/245-cttc-define-fields-to-specify-type-of-link' into 'develop' 

Resolve "(CTTC) Define fields to specify type of link"

See merge request !315
parents aed5f50e d8db8904

proto/context.proto

+11 −11
Original line number Diff line number Diff line
@@ -258,6 +258,14 @@ message LinkId { 
  Uuid link_uuid = 1;

}



enum LinkTypeEnum {

  LINKTYPE_UNKNOWN = 0;

  LINKTYPE_COPPER  = 1;

  LINKTYPE_FIBER   = 2;

  LINKTYPE_RADIO   = 3;

  LINKTYPE_VIRTUAL = 4;

}



message LinkAttributes {

  float total_capacity_gbps = 1;

  float used_capacity_gbps  = 2;
@@ -266,9 +274,9 @@ message LinkAttributes { 
message Link {

  LinkId link_id = 1;

  string name = 2;

  repeated EndPointId link_endpoint_ids = 3;

  LinkAttributes attributes = 4;

  LinkTypeEnum link_type = 5;

  LinkTypeEnum link_type = 3;

  repeated EndPointId link_endpoint_ids = 4;

  LinkAttributes attributes = 5;

}



message LinkIdList {
@@ -284,14 +292,6 @@ message LinkEvent { 
  LinkId link_id = 2;

}



enum LinkTypeEnum {

  LINKTYPE_UNKNOWN = 0;

  LINKTYPE_COPPER = 1;

  LINKTYPE_VIRTUAL_COPPER = 2;

  LINKTYPE_OPTICAL = 3;

  LINKTYPE_VIRTUAL_OPTICAL = 4;

}



// ----- Service -------------------------------------------------------------------------------------------------------

message ServiceId {

  ContextId context_id = 1;

src/context/service/database/Connection.py

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ def connection_set(db_engine : Engine, messagebroker : MessageBroker, request : 
    _,service_uuid = service_get_uuid(request.service_id, allow_random=False)

    settings = grpc_message_to_json_string(request.settings),



    now = datetime.datetime.utcnow()

    now = datetime.datetime.now(datetime.timezone.utc)



    connection_data = [{

        'connection_uuid': connection_uuid,

src/context/service/database/Context.py

+2 −1
Original line number Diff line number Diff line
@@ -82,7 +82,8 @@ def context_set(db_engine : Engine, messagebroker : MessageBroker, request : Con 
    if len(request.slice_ids) > 0:      # pragma: no cover

        LOGGER.warning('Items in field "slice_ids" ignored. This field is used for retrieval purposes only.')



    now = datetime.datetime.utcnow()

    now = datetime.datetime.now(datetime.timezone.utc)



    context_data = [{

        'context_uuid': context_uuid,

        'context_name': context_name,

src/context/service/database/Device.py

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ def device_set(db_engine : Engine, messagebroker : MessageBroker, request : Devi 
    oper_status = grpc_to_enum__device_operational_status(request.device_operational_status)

    device_drivers = [grpc_to_enum__device_driver(d) for d in request.device_drivers]



    now = datetime.datetime.utcnow()

    now = datetime.datetime.now(datetime.timezone.utc)



    topology_uuids : Set[str] = set()

    related_topologies : List[Dict] = list()

src/context/service/database/Link.py

+7 −2
Original line number Diff line number Diff line
@@ -22,11 +22,12 @@ from common.proto.context_pb2 import Empty, EventTypeEnum, Link, LinkId, LinkIdL 
from common.message_broker.MessageBroker import MessageBroker

from common.method_wrappers.ServiceExceptions import NotFoundException

from common.tools.object_factory.Link import json_link_id

from context.service.database.uuids.Topology import topology_get_uuid

from .models.enums.LinkType import grpc_to_enum__link_type_enum

from .models.LinkModel import LinkModel, LinkEndPointModel

from .models.TopologyModel import TopologyLinkModel, TopologyModel

from .uuids.EndPoint import endpoint_get_uuid

from .uuids.Link import link_get_uuid

from .uuids.Topology import topology_get_uuid

from .Events import notify_event_context, notify_event_link, notify_event_topology



LOGGER = logging.getLogger(__name__)
@@ -68,7 +69,9 @@ def link_set(db_engine : Engine, messagebroker : MessageBroker, request : Link) 
    link_name = raw_link_uuid if len(raw_link_name) == 0 else raw_link_name

    link_uuid = link_get_uuid(request.link_id, link_name=link_name, allow_random=True)



    now = datetime.datetime.utcnow()

    link_type = grpc_to_enum__link_type_enum(request.link_type)



    now = datetime.datetime.now(datetime.timezone.utc)



    topology_uuids : Set[str] = set()

    related_topologies : List[Dict] = list()
@@ -117,6 +120,7 @@ def link_set(db_engine : Engine, messagebroker : MessageBroker, request : Link) 
    link_data = [{

        'link_uuid'           : link_uuid,

        'link_name'           : link_name,

        'link_type'           : link_type,

        'total_capacity_gbps' : total_capacity_gbps,

        'used_capacity_gbps'  : used_capacity_gbps,

        'created_at'          : now,
@@ -129,6 +133,7 @@ def link_set(db_engine : Engine, messagebroker : MessageBroker, request : Link) 
            index_elements=[LinkModel.link_uuid],

            set_=dict(

                link_name           = stmt.excluded.link_name,

                link_type           = stmt.excluded.link_type,

                total_capacity_gbps = stmt.excluded.total_capacity_gbps,

                used_capacity_gbps  = stmt.excluded.used_capacity_gbps,

                updated_at          = stmt.excluded.updated_at,