Commit 8f996309 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch... 

Merge branch 'feat/91-cttc-implement-service-handler-for-l3-services-using-actn-sbi-driver' into 'develop'

Resolve "(CTTC) Implement Service Handler for L3 services using ACTN SBI driver"

Closes #91

See merge request !199
parents 3f954d34 a7944f9e

src/common/DeviceTypes.py

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ class DeviceTypeEnum(Enum): 
    # Emulated device types

    EMULATED_CLIENT                 = 'emu-client'

    EMULATED_DATACENTER             = 'emu-datacenter'

    EMULATED_IP_SDN_CONTROLLER      = 'emu-ip-sdn-controller'

    EMULATED_MICROWAVE_RADIO_SYSTEM = 'emu-microwave-radio-system'

    EMULATED_OPEN_LINE_SYSTEM       = 'emu-open-line-system'

    EMULATED_OPTICAL_ROADM          = 'emu-optical-roadm'
@@ -36,6 +37,7 @@ class DeviceTypeEnum(Enum): 
    # Real device types

    CLIENT                          = 'client'

    DATACENTER                      = 'datacenter'

    IP_SDN_CONTROLLER               = 'ip-sdn-controller'

    MICROWAVE_RADIO_SYSTEM          = 'microwave-radio-system'

    OPEN_LINE_SYSTEM                = 'open-line-system'

    OPTICAL_ROADM                   = 'optical-roadm'

src/common/tools/descriptor/Loader.py

+20 −14
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ from slice.client.SliceClient import SliceClient 
from .Tools import (

    format_device_custom_config_rules, format_service_custom_config_rules, format_slice_custom_config_rules,

    get_descriptors_add_contexts, get_descriptors_add_services, get_descriptors_add_slices,

    get_descriptors_add_topologies, split_devices_by_rules)

    get_descriptors_add_topologies, split_controllers_and_network_devices, split_devices_by_rules)



LOGGER = logging.getLogger(__name__)

LOGGERS = {
@@ -59,6 +59,7 @@ ENTITY_TO_TEXT = { 
    # name      => singular,     plural

    'context'   : ('Context',    'Contexts'   ),

    'topology'  : ('Topology',   'Topologies' ),

    'controller': ('Controller', 'Controllers'),

    'device'    : ('Device',     'Devices'    ),

    'link'      : ('Link',       'Links'      ),

    'service'   : ('Service',    'Services'   ),
@@ -231,10 +232,12 @@ class DescriptorLoader: 


    def _load_dummy_mode(self) -> None:

        # Dummy Mode: used to pre-load databases (WebUI debugging purposes) with no smart or automated tasks.

        controllers, network_devices = split_controllers_and_network_devices(self.__devices)

        self.__ctx_cli.connect()

        self._process_descr('context',    'add',    self.__ctx_cli.SetContext,    Context,    self.__contexts_add  )

        self._process_descr('topology',   'add',    self.__ctx_cli.SetTopology,   Topology,   self.__topologies_add)

        self._process_descr('device',     'add',    self.__ctx_cli.SetDevice,     Device,     self.__devices       )

        self._process_descr('controller', 'add',    self.__ctx_cli.SetDevice,     Device,     controllers          )

        self._process_descr('device',     'add',    self.__ctx_cli.SetDevice,     Device,     network_devices      )

        self._process_descr('link',       'add',    self.__ctx_cli.SetLink,       Link,       self.__links         )

        self._process_descr('service',    'add',    self.__ctx_cli.SetService,    Service,    self.__services      )

        self._process_descr('slice',      'add',    self.__ctx_cli.SetSlice,      Slice,      self.__slices        )
@@ -262,6 +265,8 @@ class DescriptorLoader: 
        self.__services_add = get_descriptors_add_services(self.__services)

        self.__slices_add = get_descriptors_add_slices(self.__slices)



        controllers_add, network_devices_add = split_controllers_and_network_devices(self.__devices_add)



        self.__ctx_cli.connect()

        self.__dev_cli.connect()

        self.__svc_cli.connect()
@@ -269,7 +274,8 @@ class DescriptorLoader: 


        self._process_descr('context',    'add',    self.__ctx_cli.SetContext,      Context,  self.__contexts_add  )

        self._process_descr('topology',   'add',    self.__ctx_cli.SetTopology,     Topology, self.__topologies_add)

        self._process_descr('device',   'add',    self.__dev_cli.AddDevice,       Device,   self.__devices_add   )

        self._process_descr('controller', 'add',    self.__dev_cli.AddDevice,       Device,   controllers_add      )

        self._process_descr('device',     'add',    self.__dev_cli.AddDevice,       Device,   network_devices_add  )

        self._process_descr('device',     'config', self.__dev_cli.ConfigureDevice, Device,   self.__devices_config)

        self._process_descr('link',       'add',    self.__ctx_cli.SetLink,         Link,     self.__links         )

        self._process_descr('service',    'add',    self.__svc_cli.CreateService,   Service,  self.__services_add  )

src/common/tools/descriptor/Tools.py

+22 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


import copy, json

from typing import Dict, List, Optional, Tuple, Union

from common.DeviceTypes import DeviceTypeEnum



def get_descriptors_add_contexts(contexts : List[Dict]) -> List[Dict]:

    contexts_add = copy.deepcopy(contexts)
@@ -103,3 +104,24 @@ def split_devices_by_rules(devices : List[Dict]) -> Tuple[List[Dict], List[Dict] 
            devices_config.append(device)



    return devices_add, devices_config



CONTROLLER_DEVICE_TYPES = {

    DeviceTypeEnum.EMULATED_IP_SDN_CONTROLLER.value,

    DeviceTypeEnum.EMULATED_MICROWAVE_RADIO_SYSTEM.value,

    DeviceTypeEnum.EMULATED_OPEN_LINE_SYSTEM.value,

    DeviceTypeEnum.IP_SDN_CONTROLLER.value,

    DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM.value,

    DeviceTypeEnum.OPEN_LINE_SYSTEM.value,

    DeviceTypeEnum.TERAFLOWSDN_CONTROLLER.value,

}



def split_controllers_and_network_devices(devices : List[Dict]) -> Tuple[List[Dict], List[Dict]]:

    controllers     : List[Dict] = list()

    network_devices : List[Dict] = list()

    for device in devices:

        device_type = device.get('device_type')

        if device_type in CONTROLLER_DEVICE_TYPES:

            controllers.append(device)

        else:

            network_devices.append(device)

    return controllers, network_devices

src/common/tools/grpc/Constraints.py

+43 −9
Original line number Diff line number Diff line
@@ -18,11 +18,12 @@ 


import json

from typing import Any, Dict, List, Optional, Tuple

from common.proto.context_pb2 import Constraint, EndPointId

from common.proto.context_pb2 import Constraint, ConstraintActionEnum, EndPointId

from common.tools.grpc.Tools import grpc_message_to_json_string



def update_constraint_custom_scalar(

    constraints, constraint_type : str, value : Any, raise_if_differs : bool = False

    constraints, constraint_type : str, value : Any, raise_if_differs : bool = False,

    new_action : ConstraintActionEnum = ConstraintActionEnum.CONSTRAINTACTION_SET

) -> Constraint:



    for constraint in constraints:
@@ -36,6 +37,8 @@ def update_constraint_custom_scalar( 
        constraint.custom.constraint_type = constraint_type

        json_constraint_value = None



    constraint.action = new_action



    if (json_constraint_value is None) or not raise_if_differs:

        # missing or raise_if_differs=False, add/update it

        json_constraint_value = value
@@ -47,7 +50,10 @@ def update_constraint_custom_scalar( 
    constraint.custom.constraint_value = json.dumps(json_constraint_value, sort_keys=True)

    return constraint



def update_constraint_custom_dict(constraints, constraint_type : str, fields : Dict[str, Tuple[Any, bool]]) -> Constraint:

def update_constraint_custom_dict(

    constraints, constraint_type : str, fields : Dict[str, Tuple[Any, bool]],

    new_action : ConstraintActionEnum = ConstraintActionEnum.CONSTRAINTACTION_SET

) -> Constraint:

    # fields: Dict[field_name : str, Tuple[field_value : Any, raise_if_differs : bool]]



    for constraint in constraints:
@@ -61,6 +67,8 @@ def update_constraint_custom_dict(constraints, constraint_type : str, fields : D 
        constraint.custom.constraint_type = constraint_type

        json_constraint_value = {}



    constraint.action = new_action



    for field_name,(field_value, raise_if_differs) in fields.items():

        if (field_name not in json_constraint_value) or not raise_if_differs:

            # missing or raise_if_differs=False, add/update it
@@ -75,7 +83,8 @@ def update_constraint_custom_dict(constraints, constraint_type : str, fields : D 


def update_constraint_endpoint_location(

    constraints, endpoint_id : EndPointId,

    region : Optional[str] = None, gps_position : Optional[Tuple[float, float]] = None

    region : Optional[str] = None, gps_position : Optional[Tuple[float, float]] = None,

    new_action : ConstraintActionEnum = ConstraintActionEnum.CONSTRAINTACTION_SET

) -> Constraint:

    # gps_position: (latitude, longitude)

    if region is not None and gps_position is not None:
@@ -103,6 +112,8 @@ def update_constraint_endpoint_location( 
        _endpoint_id.topology_id.topology_uuid.uuid = topology_uuid

        _endpoint_id.topology_id.context_id.context_uuid.uuid = context_uuid



    constraint.action = new_action



    location = constraint.endpoint_location.location

    if region is not None:

        location.region = region
@@ -111,7 +122,10 @@ def update_constraint_endpoint_location( 
        location.gps_position.longitude = gps_position[1]

    return constraint



def update_constraint_endpoint_priority(constraints, endpoint_id : EndPointId, priority : int) -> Constraint:

def update_constraint_endpoint_priority(

    constraints, endpoint_id : EndPointId, priority : int,

    new_action : ConstraintActionEnum = ConstraintActionEnum.CONSTRAINTACTION_SET

) -> Constraint:

    endpoint_uuid = endpoint_id.endpoint_uuid.uuid

    device_uuid = endpoint_id.device_id.device_uuid.uuid

    topology_uuid = endpoint_id.topology_id.topology_uuid.uuid
@@ -134,10 +148,15 @@ def update_constraint_endpoint_priority(constraints, endpoint_id : EndPointId, p 
        _endpoint_id.topology_id.topology_uuid.uuid = topology_uuid

        _endpoint_id.topology_id.context_id.context_uuid.uuid = context_uuid



    constraint.action = new_action



    constraint.endpoint_priority.priority = priority

    return constraint



def update_constraint_sla_capacity(constraints, capacity_gbps : float) -> Constraint:

def update_constraint_sla_capacity(

    constraints, capacity_gbps : float,

    new_action : ConstraintActionEnum = ConstraintActionEnum.CONSTRAINTACTION_SET

) -> Constraint:

    for constraint in constraints:

        if constraint.WhichOneof('constraint') != 'sla_capacity': continue

        break   # found, end loop
@@ -145,10 +164,15 @@ def update_constraint_sla_capacity(constraints, capacity_gbps : float) -> Constr 
        # not found, add it

        constraint = constraints.add()      # pylint: disable=no-member



    constraint.action = new_action



    constraint.sla_capacity.capacity_gbps = capacity_gbps

    return constraint



def update_constraint_sla_latency(constraints, e2e_latency_ms : float) -> Constraint:

def update_constraint_sla_latency(

    constraints, e2e_latency_ms : float,

    new_action : ConstraintActionEnum = ConstraintActionEnum.CONSTRAINTACTION_SET

) -> Constraint:

    for constraint in constraints:

        if constraint.WhichOneof('constraint') != 'sla_latency': continue

        break   # found, end loop
@@ -156,11 +180,14 @@ def update_constraint_sla_latency(constraints, e2e_latency_ms : float) -> Constr 
        # not found, add it

        constraint = constraints.add()      # pylint: disable=no-member



    constraint.action = new_action



    constraint.sla_latency.e2e_latency_ms = e2e_latency_ms

    return constraint



def update_constraint_sla_availability(

    constraints, num_disjoint_paths : int, all_active : bool, availability : float

    constraints, num_disjoint_paths : int, all_active : bool, availability : float,

    new_action : ConstraintActionEnum = ConstraintActionEnum.CONSTRAINTACTION_SET

) -> Constraint:

    for constraint in constraints:

        if constraint.WhichOneof('constraint') != 'sla_availability': continue
@@ -169,12 +196,17 @@ def update_constraint_sla_availability( 
        # not found, add it

        constraint = constraints.add()      # pylint: disable=no-member



    constraint.action = new_action



    constraint.sla_availability.num_disjoint_paths = num_disjoint_paths

    constraint.sla_availability.all_active = all_active

    constraint.sla_availability.availability = availability

    return constraint



def update_constraint_sla_isolation(constraints, isolation_levels : List[int]) -> Constraint:

def update_constraint_sla_isolation(

    constraints, isolation_levels : List[int],

    new_action : ConstraintActionEnum = ConstraintActionEnum.CONSTRAINTACTION_SET

) -> Constraint:

    for constraint in constraints:

        if constraint.WhichOneof('constraint') != 'sla_isolation': continue

        break   # found, end loop
@@ -182,6 +214,8 @@ def update_constraint_sla_isolation(constraints, isolation_levels : List[int]) - 
        # not found, add it

        constraint = constraints.add()      # pylint: disable=no-member



    constraint.action = new_action



    for isolation_level in isolation_levels:

        if isolation_level in constraint.sla_isolation.isolation_level: continue

        constraint.sla_isolation.isolation_level.append(isolation_level)

src/device/service/DeviceServiceServicerImpl.py

+7 −0
Original line number Diff line number Diff line
@@ -73,6 +73,13 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 
            device.device_operational_status = DeviceOperationalStatusEnum.DEVICEOPERATIONALSTATUS_UNDEFINED

            device.device_drivers.extend(request.device_drivers)    # pylint: disable=no-member

            device.device_config.CopyFrom(request.device_config)    # pylint: disable=no-member



            if request.HasField('controller_id'):

                controller_id = request.controller_id

                if controller_id.HasField('device_uuid'):

                    controller_device_uuid = controller_id.device_uuid.uuid

                    device.controller_id.device_uuid.uuid = controller_device_uuid



            device_id = context_client.SetDevice(device)

            device = get_device(context_client, device_id.device_uuid.uuid, rw_copy=True)