Commit 5e8130ad authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

All components: 

- migrated from DEFAULT_CONTEXT_UUID to DEFAULT_CONTEXT_NAME
- migrated from DEFAULT_TOPOLOGY_UUID to DEFAULT_TOPOLOGY_NAME
- migrated from INTERDOMAIN_TOPOLOGY_UUID to INTERDOMAIN_TOPOLOGY_NAME
parent 641ddae8

hackfest/p4/tests/Objects.py

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


import os

from typing import Dict, List, Tuple

from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID

from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME

from common.tools.object_factory.Context import json_context, json_context_id

from common.tools.object_factory.Device import (

    json_device_connect_rules, json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled,
@@ -28,12 +28,12 @@ from common.tools.object_factory.Topology import json_topology, json_topology_id 
from common.proto.kpi_sample_types_pb2 import KpiSampleType



# ----- Context --------------------------------------------------------------------------------------------------------

CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)

CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)

CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_NAME)

CONTEXT    = json_context(DEFAULT_CONTEXT_NAME)



# ----- Topology -------------------------------------------------------------------------------------------------------

TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)

TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_UUID, context_id=CONTEXT_ID)

TOPOLOGY_ID = json_topology_id(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)

TOPOLOGY    = json_topology(DEFAULT_TOPOLOGY_NAME, context_id=CONTEXT_ID)



# ----- Monitoring Samples ---------------------------------------------------------------------------------------------

PACKET_PORT_SAMPLE_TYPES = [

src/common/Constants.py

+1 −4
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



import logging #, uuid

import logging

from enum import Enum



# Default logging level
@@ -33,9 +33,6 @@ DEFAULT_METRICS_PORT = 9192 
DEFAULT_CONTEXT_NAME      = 'admin'

DEFAULT_TOPOLOGY_NAME     = 'admin'     # contains the detailed local topology

INTERDOMAIN_TOPOLOGY_NAME = 'inter'     # contains the abstract inter-domain topology

#DEFAULT_CONTEXT_UUID      = str(uuid.uuid5(uuid.NAMESPACE_OID, DEFAULT_CONTEXT_NAME     ))

#DEFAULT_TOPOLOGY_UUID     = str(uuid.uuid5(uuid.NAMESPACE_OID, DEFAULT_TOPOLOGY_NAME    ))

#INTERDOMAIN_TOPOLOGY_UUID = str(uuid.uuid5(uuid.NAMESPACE_OID, INTERDOMAIN_TOPOLOGY_NAME))



# Default service names

class ServiceNameEnum(Enum):

src/compute/service/rest_server/nbi_plugins/ietf_l2vpn/L2VPN_Services.py

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ from flask import request 
from flask.json import jsonify

from flask_restful import Resource

from werkzeug.exceptions import UnsupportedMediaType

from common.Constants import DEFAULT_CONTEXT_UUID

from common.Constants import DEFAULT_CONTEXT_NAME

from common.proto.context_pb2 import SliceStatusEnum, Slice

from slice.client.SliceClient import SliceClient

from .schemas.vpn_service import SCHEMA_VPN_SERVICE
@@ -45,7 +45,7 @@ class L2VPN_Services(Resource): 
            try:

                # pylint: disable=no-member

                slice_request = Slice()

                slice_request.slice_id.context_id.context_uuid.uuid = DEFAULT_CONTEXT_UUID

                slice_request.slice_id.context_id.context_uuid.uuid = DEFAULT_CONTEXT_NAME

                slice_request.slice_id.slice_uuid.uuid = vpn_service['vpn-id']

                slice_request.slice_status.slice_status = SliceStatusEnum.SLICESTATUS_PLANNED

src/compute/tests/test_debug_api.py

+14 −14
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


import logging, os, pytest, requests, time, urllib

from typing import Tuple

from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID, ServiceNameEnum

from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME, ServiceNameEnum

from common.proto.context_pb2 import Connection, Context, Device, Link, Service, Slice, Topology

from common.proto.policy_pb2 import PolicyRuleIdList, PolicyRuleId, PolicyRuleList, PolicyRule

from common.Settings import (
@@ -119,54 +119,54 @@ def test_rest_get_contexts(context_service_rest : RestServer): # pylint: disable 
    validate_contexts(reply)



def test_rest_get_context(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    reply = do_rest_request('/context/{:s}'.format(context_uuid))

    validate_context(reply)



def test_rest_get_topology_ids(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    reply = do_rest_request('/context/{:s}/topology_ids'.format(context_uuid))

    validate_topology_ids(reply)



def test_rest_get_topologies(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    reply = do_rest_request('/context/{:s}/topologies'.format(context_uuid))

    validate_topologies(reply)



def test_rest_get_topology(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    topology_uuid = urllib.parse.quote(DEFAULT_TOPOLOGY_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    topology_uuid = urllib.parse.quote(DEFAULT_TOPOLOGY_NAME)

    reply = do_rest_request('/context/{:s}/topology/{:s}'.format(context_uuid, topology_uuid))

    validate_topology(reply, num_devices=3, num_links=3)



def test_rest_get_service_ids(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    reply = do_rest_request('/context/{:s}/service_ids'.format(context_uuid))

    validate_service_ids(reply)



def test_rest_get_services(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    reply = do_rest_request('/context/{:s}/services'.format(context_uuid))

    validate_services(reply)



def test_rest_get_service(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    service_uuid = urllib.parse.quote(SERVICE_R1_R2_UUID, safe='')

    reply = do_rest_request('/context/{:s}/service/{:s}'.format(context_uuid, service_uuid))

    validate_service(reply)



def test_rest_get_slice_ids(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    reply = do_rest_request('/context/{:s}/slice_ids'.format(context_uuid))

    #validate_slice_ids(reply)



def test_rest_get_slices(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    reply = do_rest_request('/context/{:s}/slices'.format(context_uuid))

    #validate_slices(reply)



def test_rest_get_slice(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    slice_uuid = urllib.parse.quote(SLICE_R1_R3_UUID, safe='')

    reply = do_rest_request('/context/{:s}/slice/{:s}'.format(context_uuid, slice_uuid))

    #validate_slice(reply)
@@ -198,13 +198,13 @@ def test_rest_get_link(context_service_rest : RestServer): # pylint: disable=red 
    validate_link(reply)



def test_rest_get_connection_ids(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    service_uuid = urllib.parse.quote(SERVICE_R1_R3_UUID, safe='')

    reply = do_rest_request('/context/{:s}/service/{:s}/connection_ids'.format(context_uuid, service_uuid))

    validate_connection_ids(reply)



def test_rest_get_connections(context_service_rest : RestServer): # pylint: disable=redefined-outer-name

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_UUID)

    context_uuid = urllib.parse.quote(DEFAULT_CONTEXT_NAME)

    service_uuid = urllib.parse.quote(SERVICE_R1_R3_UUID, safe='')

    reply = do_rest_request('/context/{:s}/service/{:s}/connections'.format(context_uuid, service_uuid))

    validate_connections(reply)

src/dlt/connector/service/event_dispatcher/DltEventDispatcher.py

+12 −12
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


import grpc, json, logging, threading

from typing import Any, Dict, Set

from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID, INTERDOMAIN_TOPOLOGY_UUID

from common.Constants import DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME, INTERDOMAIN_TOPOLOGY_NAME

from common.proto.context_pb2 import ContextId, Device, EventTypeEnum, Link, Slice, TopologyId

from common.proto.dlt_connector_pb2 import DltSliceId

from common.proto.dlt_gateway_pb2 import DltRecordEvent, DltRecordOperationEnum, DltRecordTypeEnum
@@ -35,7 +35,7 @@ LOGGER = logging.getLogger(__name__) 


GET_EVENT_TIMEOUT = 0.5



ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_UUID))

ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))



class Clients:

    def __init__(self) -> None:
@@ -66,9 +66,9 @@ class DltEventDispatcher(threading.Thread): 


    def run(self) -> None:

        clients = Clients()

        create_context(clients.context_client, DEFAULT_CONTEXT_UUID)

        create_topology(clients.context_client, DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID)

        create_topology(clients.context_client, DEFAULT_CONTEXT_UUID, INTERDOMAIN_TOPOLOGY_UUID)

        create_context(clients.context_client, DEFAULT_CONTEXT_NAME)

        create_topology(clients.context_client, DEFAULT_CONTEXT_NAME, DEFAULT_TOPOLOGY_NAME)

        create_topology(clients.context_client, DEFAULT_CONTEXT_NAME, INTERDOMAIN_TOPOLOGY_NAME)



        dlt_events_collector = DltEventsCollector(clients.dlt_gateway_client, log_events_received=True)

        dlt_events_collector.start()
@@ -81,8 +81,8 @@ class DltEventDispatcher(threading.Thread): 
            local_domain_uuids = {

                topology_id.topology_uuid.uuid for topology_id in existing_topology_ids.topology_ids

            }

            local_domain_uuids.discard(DEFAULT_TOPOLOGY_UUID)

            local_domain_uuids.discard(INTERDOMAIN_TOPOLOGY_UUID)

            local_domain_uuids.discard(DEFAULT_TOPOLOGY_NAME)

            local_domain_uuids.discard(INTERDOMAIN_TOPOLOGY_NAME)



            self.dispatch_event(clients, local_domain_uuids, event)
@@ -118,13 +118,13 @@ class DltEventDispatcher(threading.Thread): 
            LOGGER.info('[_dispatch_device] record={:s}'.format(grpc_message_to_json_string(record)))



            create_context(clients.context_client, domain_uuid)

            create_topology(clients.context_client, domain_uuid, DEFAULT_TOPOLOGY_UUID)

            create_topology(clients.context_client, domain_uuid, DEFAULT_TOPOLOGY_NAME)

            device = Device(**json.loads(record.data_json))

            clients.context_client.SetDevice(device)

            device_uuid = device.device_id.device_uuid.uuid # pylint: disable=no-member

            add_device_to_topology(clients.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_UUID, device_uuid)

            add_device_to_topology(clients.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_NAME, device_uuid)

            domain_context_id = ContextId(**json_context_id(domain_uuid))

            add_device_to_topology(clients.context_client, domain_context_id, DEFAULT_TOPOLOGY_UUID, device_uuid)

            add_device_to_topology(clients.context_client, domain_context_id, DEFAULT_TOPOLOGY_NAME, device_uuid)

        elif event_type in {EventTypeEnum.EVENTTYPE_DELETE}:

            raise NotImplementedError('Delete Device')
@@ -148,7 +148,7 @@ class DltEventDispatcher(threading.Thread): 
            link = Link(**json.loads(record.data_json))

            clients.context_client.SetLink(link)

            link_uuid = link.link_id.link_uuid.uuid # pylint: disable=no-member

            add_link_to_topology(clients.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_UUID, link_uuid)

            add_link_to_topology(clients.context_client, ADMIN_CONTEXT_ID, INTERDOMAIN_TOPOLOGY_NAME, link_uuid)

        elif event_type in {EventTypeEnum.EVENTTYPE_DELETE}:

            raise NotImplementedError('Delete Link')
@@ -165,7 +165,7 @@ class DltEventDispatcher(threading.Thread): 
        context_uuid = slice_.slice_id.context_id.context_uuid.uuid

        owner_uuid = slice_.slice_owner.owner_uuid.uuid

        create_context(clients.context_client, context_uuid)

        create_topology(clients.context_client, context_uuid, DEFAULT_TOPOLOGY_UUID)

        create_topology(clients.context_client, context_uuid, DEFAULT_TOPOLOGY_NAME)



        if domain_uuid in local_domain_uuids:

            # it is for "me"