Commit 17129bae authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

OFC'22 test: 

- updated test scripts
parent 12b2c871

src/tests/ofc22/tests/Fixtures.py

+0 −39
Original line number Diff line number Diff line
@@ -17,45 +17,6 @@ from common.Settings import get_setting 
from compute.tests.mock_osm.MockOSM import MockOSM

from .Objects import WIM_MAPPING, WIM_PASSWORD, WIM_USERNAME



# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



import pytest

from common.Settings import get_setting

from compute.tests.mock_osm.MockOSM import MockOSM

from context.client.ContextClient import ContextClient

from device.client.DeviceClient import DeviceClient

from monitoring.client.MonitoringClient import MonitoringClient



@pytest.fixture(scope='session')

def context_client():

    _client = ContextClient()

    yield _client

    _client.close()



@pytest.fixture(scope='session')

def device_client():

    _client = DeviceClient()

    yield _client

    _client.close()



@pytest.fixture(scope='session')

def monitoring_client():

    _client = MonitoringClient()

    yield _client

    _client.close()



@pytest.fixture(scope='session')

def osm_wim():

    wim_url = 'http://{:s}:{:s}'.format(

src/tests/ofc22/tests/Objects.py

+13 −341
Original line number Diff line number Diff line 
##### LLUIS GIFRE (CTTC): CODE UNDER REARRANGEMENT #####



# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");
@@ -14,353 +12,27 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



import os, uuid

from typing import Dict, List, Tuple

from common.Constants import DEFAULT_CONTEXT_UUID, DEFAULT_TOPOLOGY_UUID

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_datacenter_disabled,

    json_device_emulated_packet_router_disabled, json_device_emulated_tapi_disabled, json_device_id,

    json_device_packetrouter_disabled, json_device_tapi_disabled)

from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id, json_endpoints

from common.tools.object_factory.Link import get_link_uuid, json_link, json_link_id

from common.tools.object_factory.Topology import json_topology, json_topology_id

from common.tools.object_factory.Service import get_service_uuid, json_service_l3nm_planned

from common.tools.object_factory.Topology import json_topology, json_topology_id

from common.proto.kpi_sample_types_pb2 import KpiSampleType



# ----- Device Credentials and Settings --------------------------------------------------------------------------------



# if true, Device component is present and will infeer the endpoints from connect-rules

# if false, Device component is not present and device objects must contain preconfigured endpoints

ADD_CONNECT_RULES_TO_DEVICES = os.environ.get('ADD_CONNECT_RULES_TO_DEVICES', 'True')

ADD_CONNECT_RULES_TO_DEVICES = ADD_CONNECT_RULES_TO_DEVICES.upper() in {'T', 'TRUE', '1', 'Y', 'YES'}



try:

    from .Credentials import DEVICE_R1_ADDRESS, DEVICE_R1_PORT, DEVICE_R1_USERNAME, DEVICE_R1_PASSWORD

    from .Credentials import DEVICE_R3_ADDRESS, DEVICE_R3_PORT, DEVICE_R3_USERNAME, DEVICE_R3_PASSWORD

    from .Credentials import DEVICE_O1_ADDRESS, DEVICE_O1_PORT

    USE_REAL_DEVICES = True     # Use real devices

except ImportError:

    USE_REAL_DEVICES = False    # Use emulated devices



    DEVICE_R1_ADDRESS, DEVICE_R1_PORT, DEVICE_R1_USERNAME, DEVICE_R1_PASSWORD = '0.0.0.0', 830, 'admin', 'admin'

    DEVICE_R3_ADDRESS, DEVICE_R3_PORT, DEVICE_R3_USERNAME, DEVICE_R3_PASSWORD = '0.0.0.0', 830, 'admin', 'admin'

    DEVICE_O1_ADDRESS, DEVICE_O1_PORT = '0.0.0.0', 4900



#USE_REAL_DEVICES = False     # Uncomment to force to use emulated devices



if not USE_REAL_DEVICES:

    json_device_packetrouter_disabled = json_device_emulated_packet_router_disabled

    json_device_tapi_disabled         = json_device_emulated_tapi_disabled



def compose_router(device_uuid, endpoint_uuids, topology_id=None):

    device_id = json_device_id(device_uuid)

    r_endpoints = [(endpoint_uuid, 'copper', []) for endpoint_uuid in endpoint_uuids]

    config_rules = json_device_emulated_connect_rules(r_endpoints) if ADD_CONNECT_RULES_TO_DEVICES else []

    endpoints = json_endpoints(device_id, r_endpoints, topology_id=topology_id)

    j_endpoints = [] if ADD_CONNECT_RULES_TO_DEVICES else endpoints

    device = json_device_emulated_packet_router_disabled(device_uuid, config_rules=config_rules, endpoints=j_endpoints)

    return device_id, endpoints, device



def compose_ols(device_uuid, endpoint_uuids, topology_id=None):

    device_id = json_device_id(device_uuid)

    r_endpoints = [(endpoint_uuid, 'optical', []) for endpoint_uuid in endpoint_uuids]

    config_rules = json_device_emulated_connect_rules(r_endpoints) if ADD_CONNECT_RULES_TO_DEVICES else []

    endpoints = json_endpoints(device_id, r_endpoints, topology_id=topology_id)

    j_endpoints = [] if ADD_CONNECT_RULES_TO_DEVICES else endpoints

    device = json_device_emulated_tapi_disabled(device_uuid, config_rules=config_rules, endpoints=j_endpoints)

    return device_id, endpoints, device



def compose_datacenter(device_uuid, endpoint_uuids, topology_id=None):

    device_id = json_device_id(device_uuid)

    r_endpoints = [(endpoint_uuid, 'copper', []) for endpoint_uuid in endpoint_uuids]

    config_rules = json_device_emulated_connect_rules(r_endpoints) if ADD_CONNECT_RULES_TO_DEVICES else []

    endpoints = json_endpoints(device_id, r_endpoints, topology_id=topology_id)

    j_endpoints = [] if ADD_CONNECT_RULES_TO_DEVICES else endpoints

    device = json_device_emulated_datacenter_disabled(device_uuid, config_rules=config_rules, endpoints=j_endpoints)

    return device_id, endpoints, device



def compose_service(endpoint_a, endpoint_z, constraints=[]):

    service_uuid = get_service_uuid(endpoint_a['endpoint_id'], endpoint_z['endpoint_id'])

    endpoint_ids = [endpoint_a['endpoint_id'], endpoint_z['endpoint_id']]

    service = json_service_l3nm_planned(service_uuid, endpoint_ids=endpoint_ids, constraints=constraints)

    return service



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

CONTEXT_ID = json_context_id(DEFAULT_CONTEXT_UUID)

CONTEXT    = json_context(DEFAULT_CONTEXT_UUID)



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

TOPO_ADMIN_UUID = DEFAULT_TOPOLOGY_UUID

TOPO_ADMIN_ID   = json_topology_id(TOPO_ADMIN_UUID, context_id=CONTEXT_ID)

TOPO_ADMIN      = json_topology(TOPO_ADMIN_UUID, context_id=CONTEXT_ID)



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

PACKET_PORT_SAMPLE_TYPES = [

    KpiSampleType.KPISAMPLETYPE_PACKETS_TRANSMITTED,

    KpiSampleType.KPISAMPLETYPE_PACKETS_RECEIVED,

    KpiSampleType.KPISAMPLETYPE_BYTES_TRANSMITTED,

    KpiSampleType.KPISAMPLETYPE_BYTES_RECEIVED,

]



# ----- Devices --------------------------------------------------------------------------------------------------------



DEVICE_R1_UUID          = 'R1-EMU'

DEVICE_R1_TIMEOUT       = 120

DEVICE_R1_ENDPOINT_DEFS = [('13/0/0', 'optical', []), ('13/1/2', 'copper', PACKET_PORT_SAMPLE_TYPES)]

DEVICE_R1_ID            = json_device_id(DEVICE_R1_UUID)

#DEVICE_R1_ENDPOINTS     = json_endpoints(DEVICE_R1_ID, DEVICE_R1_ENDPOINT_DEFS)

DEVICE_R1_ENDPOINT_IDS  = json_endpoint_ids(DEVICE_R1_ID, DEVICE_R1_ENDPOINT_DEFS)

DEVICE_R1               = json_device_packetrouter_disabled(DEVICE_R1_UUID)

ENDPOINT_ID_R1_13_0_0   = DEVICE_R1_ENDPOINT_IDS[0]

ENDPOINT_ID_R1_13_1_2   = DEVICE_R1_ENDPOINT_IDS[1]

DEVICE_R1_CONNECT_RULES = json_device_connect_rules(DEVICE_R1_ADDRESS, DEVICE_R1_PORT, ) if USE_REAL_DEVICES else json_device_emulated_connect_rules(DEVICE_R1_ENDPOINT_DEFS)



def json_device_connect_rules(address : str, port : int, settings : Dict = {}):

    return [

        json_config_rule_set('_connect/address',  address),

        json_config_rule_set('_connect/port',     port),

        json_config_rule_set('_connect/settings', {

    'username': DEVICE_R1_USERNAME,

    'password': DEVICE_R1_PASSWORD,

    'timeout' : DEVICE_R1_TIMEOUT,

}),

    ]







DEVICE_R2_UUID          = 'R2-EMU'

DEVICE_R2_ENDPOINT_DEFS = [('13/0/0', 'optical', []), ('13/1/2', 'copper', PACKET_PORT_SAMPLE_TYPES)]

DEVICE_R2_ID            = json_device_id(DEVICE_R2_UUID)

#DEVICE_R2_ENDPOINTS     = json_endpoints(DEVICE_R2_ID, DEVICE_R2_ENDPOINT_DEFS)

DEVICE_R2_ENDPOINT_IDS  = json_endpoint_ids(DEVICE_R2_ID, DEVICE_R2_ENDPOINT_DEFS)

DEVICE_R2               = json_device_emulated_packet_router_disabled(DEVICE_R2_UUID)

ENDPOINT_ID_R2_13_0_0   = DEVICE_R2_ENDPOINT_IDS[0]

ENDPOINT_ID_R2_13_1_2   = DEVICE_R2_ENDPOINT_IDS[1]

DEVICE_R2_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_R2_ENDPOINT_DEFS)





DEVICE_R3_UUID          = 'R3-EMU'

DEVICE_R3_TIMEOUT       = 120

DEVICE_R3_ENDPOINT_DEFS = [('13/0/0', 'optical', []), ('13/1/2', 'copper', PACKET_PORT_SAMPLE_TYPES)]

DEVICE_R3_ID            = json_device_id(DEVICE_R3_UUID)

#DEVICE_R3_ENDPOINTS     = json_endpoints(DEVICE_R3_ID, DEVICE_R3_ENDPOINT_DEFS)

DEVICE_R3_ENDPOINT_IDS  = json_endpoint_ids(DEVICE_R3_ID, DEVICE_R3_ENDPOINT_DEFS)

DEVICE_R3               = json_device_packetrouter_disabled(DEVICE_R3_UUID)

ENDPOINT_ID_R3_13_0_0   = DEVICE_R3_ENDPOINT_IDS[0]

ENDPOINT_ID_R3_13_1_2   = DEVICE_R3_ENDPOINT_IDS[1]

DEVICE_R3_CONNECT_RULES = json_device_connect_rules(DEVICE_R3_ADDRESS, DEVICE_R3_PORT, {

    'username': DEVICE_R3_USERNAME,

    'password': DEVICE_R3_PASSWORD,

    'timeout' : DEVICE_R3_TIMEOUT,

}) if USE_REAL_DEVICES else json_device_emulated_connect_rules(DEVICE_R3_ENDPOINT_DEFS)





DEVICE_R4_UUID          = 'R4-EMU'

DEVICE_R4_ENDPOINT_DEFS = [('13/0/0', 'optical', []), ('13/1/2', 'copper', PACKET_PORT_SAMPLE_TYPES)]

DEVICE_R4_ID            = json_device_id(DEVICE_R4_UUID)

#DEVICE_R4_ENDPOINTS     = json_endpoints(DEVICE_R4_ID, DEVICE_R4_ENDPOINT_DEFS)

DEVICE_R4_ENDPOINT_IDS  = json_endpoint_ids(DEVICE_R4_ID, DEVICE_R4_ENDPOINT_DEFS)

DEVICE_R4               = json_device_emulated_packet_router_disabled(DEVICE_R4_UUID)

ENDPOINT_ID_R4_13_0_0   = DEVICE_R4_ENDPOINT_IDS[0]

ENDPOINT_ID_R4_13_1_2   = DEVICE_R4_ENDPOINT_IDS[1]

DEVICE_R4_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_R4_ENDPOINT_DEFS)





DEVICE_O1_UUID          = 'O1-OLS'

DEVICE_O1_TIMEOUT       = 120

DEVICE_O1_ENDPOINT_DEFS = [

    ('aade6001-f00b-5e2f-a357-6a0a9d3de870', 'optical', []), # node_1_port_13

    ('eb287d83-f05e-53ec-ab5a-adf6bd2b5418', 'optical', []), # node_2_port_13

    ('0ef74f99-1acc-57bd-ab9d-4b958b06c513', 'optical', []), # node_3_port_13

    ('50296d99-58cc-5ce7-82f5-fc8ee4eec2ec', 'optical', []), # node_4_port_13

]

DEVICE_O1_ID            = json_device_id(DEVICE_O1_UUID)

DEVICE_O1               = json_device_tapi_disabled(DEVICE_O1_UUID)

#DEVICE_O1_ENDPOINTS     = json_endpoints(DEVICE_O1_ID, DEVICE_O1_ENDPOINT_DEFS)

DEVICE_O1_ENDPOINT_IDS  = json_endpoint_ids(DEVICE_O1_ID, DEVICE_O1_ENDPOINT_DEFS)

ENDPOINT_ID_O1_EP1      = DEVICE_O1_ENDPOINT_IDS[0]

ENDPOINT_ID_O1_EP2      = DEVICE_O1_ENDPOINT_IDS[1]

ENDPOINT_ID_O1_EP3      = DEVICE_O1_ENDPOINT_IDS[2]

ENDPOINT_ID_O1_EP4      = DEVICE_O1_ENDPOINT_IDS[3]

DEVICE_O1_CONNECT_RULES = json_device_connect_rules(DEVICE_O1_ADDRESS, DEVICE_O1_PORT, {

    'timeout' : DEVICE_O1_TIMEOUT,

}) if USE_REAL_DEVICES else json_device_emulated_connect_rules(DEVICE_O1_ENDPOINT_DEFS)





# ----- Devices --------------------------------------------------------------------------------------------------------

DEV_CS1GW1_ID, DEV_CS1GW1_EPS, DEV_CS1GW1 = compose_router('CS1-GW1', ['10/1', '1/1', '1/2'])

DEV_CS1GW2_ID, DEV_CS1GW2_EPS, DEV_CS1GW2 = compose_router('CS1-GW2', ['10/1', '1/1', '1/2'])

DEV_CS2GW1_ID, DEV_CS2GW1_EPS, DEV_CS2GW1 = compose_router('CS2-GW1', ['10/1', '1/1', '1/2'])

DEV_CS2GW2_ID, DEV_CS2GW2_EPS, DEV_CS2GW2 = compose_router('CS2-GW2', ['10/1', '1/1', '1/2'])



# Transport Network

DEV_TNR1_ID, DEV_TNR1_EPS, DEV_TNR1 = compose_router('TN-R1', ['1/1', '1/2', '2/1'])

DEV_TNR2_ID, DEV_TNR2_EPS, DEV_TNR2 = compose_router('TN-R2', ['1/1', '1/2', '2/1'])

DEV_TNR3_ID, DEV_TNR3_EPS, DEV_TNR3 = compose_router('TN-R3', ['1/1', '1/2', '2/1'])

DEV_TNR4_ID, DEV_TNR4_EPS, DEV_TNR4 = compose_router('TN-R4', ['1/1', '1/2', '2/1'])



#tols_ep_uuids = [str(uuid.uuid4()).split('-')[-1] for _ in range(4)]

tols_ep_uuids = ['afd8ffbb5403', '04b84e213e83', '3169ae676ac6', '93506f786270']

DEV_TOLS_ID, DEV_TOLS_EPS, DEV_TOLS = compose_ols('TN-OLS', tols_ep_uuids)







# ----- Links ----------------------------------------------------------------------------------------------------------

LINK_R1_O1_UUID = get_link_uuid(DEVICE_R1_ID, ENDPOINT_ID_R1_13_0_0, DEVICE_O1_ID, ENDPOINT_ID_O1_EP1)

LINK_R1_O1_ID   = json_link_id(LINK_R1_O1_UUID)

LINK_R1_O1      = json_link(LINK_R1_O1_UUID, [ENDPOINT_ID_R1_13_0_0, ENDPOINT_ID_O1_EP1])



LINK_R2_O1_UUID = get_link_uuid(DEVICE_R2_ID, ENDPOINT_ID_R2_13_0_0, DEVICE_O1_ID, ENDPOINT_ID_O1_EP2)

LINK_R2_O1_ID   = json_link_id(LINK_R2_O1_UUID)

LINK_R2_O1      = json_link(LINK_R2_O1_UUID, [ENDPOINT_ID_R2_13_0_0, ENDPOINT_ID_O1_EP2])



LINK_R3_O1_UUID = get_link_uuid(DEVICE_R3_ID, ENDPOINT_ID_R3_13_0_0, DEVICE_O1_ID, ENDPOINT_ID_O1_EP3)

LINK_R3_O1_ID   = json_link_id(LINK_R3_O1_UUID)

LINK_R3_O1      = json_link(LINK_R3_O1_UUID, [ENDPOINT_ID_R3_13_0_0, ENDPOINT_ID_O1_EP3])



LINK_R4_O1_UUID = get_link_uuid(DEVICE_R4_ID, ENDPOINT_ID_R4_13_0_0, DEVICE_O1_ID, ENDPOINT_ID_O1_EP4)

LINK_R4_O1_ID   = json_link_id(LINK_R4_O1_UUID)

LINK_R4_O1      = json_link(LINK_R4_O1_UUID, [ENDPOINT_ID_R4_13_0_0, ENDPOINT_ID_O1_EP4])





# ----- Links ----------------------------------------------------------------------------------------------------------

# InterDomain DC-CSGW

LINK_DC1GW_CS1GW1_ID, LINK_DC1GW_CS1GW1 = compose_link(DEV_DC1GW_EPS[0], DEV_CS1GW1_EPS[0])

LINK_DC1GW_CS1GW2_ID, LINK_DC1GW_CS1GW2 = compose_link(DEV_DC1GW_EPS[1], DEV_CS1GW2_EPS[0])

LINK_DC2GW_CS2GW1_ID, LINK_DC2GW_CS2GW1 = compose_link(DEV_DC2GW_EPS[0], DEV_CS2GW1_EPS[0])

LINK_DC2GW_CS2GW2_ID, LINK_DC2GW_CS2GW2 = compose_link(DEV_DC2GW_EPS[1], DEV_CS2GW2_EPS[0])



# InterDomain CSGW-TN

LINK_CS1GW1_TNR1_ID, LINK_CS1GW1_TNR1 = compose_link(DEV_CS1GW1_EPS[1], DEV_TNR1_EPS[0])

LINK_CS1GW2_TNR2_ID, LINK_CS1GW2_TNR2 = compose_link(DEV_CS1GW2_EPS[1], DEV_TNR2_EPS[0])

LINK_CS1GW1_TNR2_ID, LINK_CS1GW1_TNR2 = compose_link(DEV_CS1GW1_EPS[2], DEV_TNR2_EPS[1])

LINK_CS1GW2_TNR1_ID, LINK_CS1GW2_TNR1 = compose_link(DEV_CS1GW2_EPS[2], DEV_TNR1_EPS[1])

LINK_CS2GW1_TNR3_ID, LINK_CS2GW1_TNR3 = compose_link(DEV_CS2GW1_EPS[1], DEV_TNR3_EPS[0])

LINK_CS2GW2_TNR4_ID, LINK_CS2GW2_TNR4 = compose_link(DEV_CS2GW2_EPS[1], DEV_TNR4_EPS[0])

LINK_CS2GW1_TNR4_ID, LINK_CS2GW1_TNR4 = compose_link(DEV_CS2GW1_EPS[2], DEV_TNR4_EPS[1])

LINK_CS2GW2_TNR3_ID, LINK_CS2GW2_TNR3 = compose_link(DEV_CS2GW2_EPS[2], DEV_TNR3_EPS[1])



# IntraDomain TN

LINK_TNR1_TOLS_ID, LINK_TNR1_TOLS = compose_link(DEV_TNR1_EPS[2], DEV_TOLS_EPS[0])

LINK_TNR2_TOLS_ID, LINK_TNR2_TOLS = compose_link(DEV_TNR2_EPS[2], DEV_TOLS_EPS[1])

LINK_TNR3_TOLS_ID, LINK_TNR3_TOLS = compose_link(DEV_TNR3_EPS[2], DEV_TOLS_EPS[2])

LINK_TNR4_TOLS_ID, LINK_TNR4_TOLS = compose_link(DEV_TNR4_EPS[2], DEV_TOLS_EPS[3])





from common.tools.object_factory.Device import json_device_id

from common.tools.object_factory.EndPoint import json_endpoint_id

from compute.tests.mock_osm.Tools import compose_service_endpoint_id, connection_point, wim_mapping



# ----- WIM Service Settings -------------------------------------------------------------------------------------------

WIM_USERNAME = 'admin'

WIM_PASSWORD = 'admin'



def compose_service_endpoint_id(endpoint_id):

    device_uuid = endpoint_id['device_id']['device_uuid']['uuid']

    endpoint_uuid = endpoint_id['endpoint_uuid']['uuid']

    return ':'.join([device_uuid, endpoint_uuid])



WIM_SEP_R1_ID      = compose_service_endpoint_id(ENDPOINT_ID_R1_13_1_2)

DEV_R1_ID          = json_device_id('R1-EMU')

DEV_R1_ENDPOINT_ID = compose_service_endpoint_id(json_endpoint_id(DEV_R1_ID, '13/1/2'))

WIM_SEP_R1_SITE_ID = '1'

WIM_SEP_R1_BEARER  = WIM_SEP_R1_ID

WIM_SRV_R1_VLAN_ID = 400



WIM_SEP_R3_ID      = compose_service_endpoint_id(ENDPOINT_ID_R3_13_1_2)

DEV_R3_ID          = json_device_id('R3-EMU')

DEV_R3_ENDPOINT_ID = compose_service_endpoint_id(json_endpoint_id(DEV_R3_ID, '13/1/2'))

WIM_SEP_R3_SITE_ID = '2'

WIM_SEP_R3_BEARER  = WIM_SEP_R3_ID

WIM_SRV_R3_VLAN_ID = 500



WIM_MAPPING  = [

    {'device-id': DEVICE_R1_UUID, 'service_endpoint_id': WIM_SEP_R1_ID,

     'service_mapping_info': {'bearer': {'bearer-reference': WIM_SEP_R1_BEARER}, 'site-id': WIM_SEP_R1_SITE_ID}},

    {'device-id': DEVICE_R3_UUID, 'service_endpoint_id': WIM_SEP_R3_ID,

     'service_mapping_info': {'bearer': {'bearer-reference': WIM_SEP_R3_BEARER}, 'site-id': WIM_SEP_R3_SITE_ID}},

]

WIM_SERVICE_TYPE = 'ELINE'

WIM_SERVICE_CONNECTION_POINTS = [

    {'service_endpoint_id': WIM_SEP_R1_ID,

        'service_endpoint_encapsulation_type': 'dot1q',

        'service_endpoint_encapsulation_info': {'vlan': WIM_SRV_R1_VLAN_ID}},

    {'service_endpoint_id': WIM_SEP_R3_ID,

        'service_endpoint_encapsulation_type': 'dot1q',

        'service_endpoint_encapsulation_info': {'vlan': WIM_SRV_R3_VLAN_ID}},

]



# New code:

def mapping(site_id, ce_endpoint_id, pe_device_id, priority=None, redundant=[]):

    ce_endpoint_id = ce_endpoint_id['endpoint_id']

    ce_device_uuid = ce_endpoint_id['device_id']['device_uuid']['uuid']

    ce_endpoint_uuid = ce_endpoint_id['endpoint_uuid']['uuid']

    pe_device_uuid = pe_device_id['device_uuid']['uuid']

    service_endpoint_id = '{:s}:{:s}:{:s}'.format(site_id, ce_device_uuid, ce_endpoint_uuid)

    bearer = '{:s}:{:s}'.format(ce_device_uuid, pe_device_uuid)

    _mapping = {

        'service_endpoint_id': service_endpoint_id,

        'datacenter_id': site_id, 'device_id': ce_device_uuid, 'device_interface_id': ce_endpoint_uuid,

        'service_mapping_info': {

            'site-id': site_id,

            'bearer': {'bearer-reference': bearer},

        }

    }

    if priority is not None: _mapping['service_mapping_info']['priority'] = priority

    if len(redundant) > 0: _mapping['service_mapping_info']['redundant'] = redundant

    return service_endpoint_id, _mapping



WIM_SEP_DC1_PRI, WIM_MAP_DC1_PRI = mapping('DC1', DEV_DC1GW_EPS[0], DEV_CS1GW1_ID, priority=10, redundant=['DC1:DC1-GW:eth2'])

WIM_SEP_DC1_SEC, WIM_MAP_DC1_SEC = mapping('DC1', DEV_DC1GW_EPS[1], DEV_CS1GW2_ID, priority=20, redundant=['DC1:DC1-GW:eth1'])

WIM_SEP_DC2_PRI, WIM_MAP_DC2_PRI = mapping('DC2', DEV_DC2GW_EPS[0], DEV_CS2GW1_ID, priority=10, redundant=['DC2:DC2-GW:eth2'])

WIM_SEP_DC2_SEC, WIM_MAP_DC2_SEC = mapping('DC2', DEV_DC2GW_EPS[1], DEV_CS2GW2_ID, priority=20, redundant=['DC2:DC2-GW:eth1'])



WIM_MAPPING  = [WIM_MAP_DC1_PRI, WIM_MAP_DC1_SEC, WIM_MAP_DC2_PRI, WIM_MAP_DC2_SEC]

WIM_SEP_DC1, WIM_MAP_DC1 = wim_mapping(WIM_SEP_R1_SITE_ID, DEV_DC1GW_EPS[0], DEV_CS1GW1_ID)

WIM_SEP_DC2, WIM_MAP_DC2 = wim_mapping(WIM_SEP_R3_SITE_ID, DEV_DC2GW_EPS[0], DEV_CS2GW1_ID)

WIM_MAPPING  = [WIM_MAP_DC1, WIM_MAP_DC2]



WIM_SRV_VLAN_ID = 300

WIM_SERVICE_TYPE = 'ELAN'

WIM_SERVICE_TYPE = 'ELINE'

WIM_SERVICE_CONNECTION_POINTS = [

    {'service_endpoint_id': WIM_SEP_DC1_PRI,

        'service_endpoint_encapsulation_type': 'dot1q',

        'service_endpoint_encapsulation_info': {'vlan': WIM_SRV_VLAN_ID}},

    {'service_endpoint_id': WIM_SEP_DC2_PRI,

        'service_endpoint_encapsulation_type': 'dot1q',

        'service_endpoint_encapsulation_info': {'vlan': WIM_SRV_VLAN_ID}},

]









# ----- Containers -----------------------------------------------------------------------------------------------------

CONTEXTS   = [CONTEXT ]

TOPOLOGIES = [TOPOLOGY]

DEVICES    = [DEVICE_R1, DEVICE_R2, DEVICE_R3, DEVICE_R4, DEVICE_O1]

LINKS      = [LINK_R1_O1, LINK_R2_O1, LINK_R3_O1, LINK_R4_O1]



OBJECTS_PER_TOPOLOGY = [

    (TOPO_ADMIN_ID,

        [   DEV_DC1GW_ID, DEV_DC2GW_ID,

            DEV_CS1GW1_ID, DEV_CS1GW2_ID, DEV_CS2GW1_ID, DEV_CS2GW2_ID,

            DEV_TNR1_ID, DEV_TNR2_ID, DEV_TNR3_ID, DEV_TNR4_ID,

            DEV_TOLS_ID,

        ],

        [   LINK_DC1GW_CS1GW1_ID, LINK_DC1GW_CS1GW2_ID, LINK_DC2GW_CS2GW1_ID, LINK_DC2GW_CS2GW2_ID,

            LINK_CS1GW1_TNR1_ID, LINK_CS1GW2_TNR2_ID, LINK_CS1GW1_TNR2_ID, LINK_CS1GW2_TNR1_ID,

            LINK_CS2GW1_TNR3_ID, LINK_CS2GW2_TNR4_ID, LINK_CS2GW1_TNR4_ID, LINK_CS2GW2_TNR3_ID,

            LINK_TNR1_TOLS_ID, LINK_TNR2_TOLS_ID, LINK_TNR3_TOLS_ID, LINK_TNR4_TOLS_ID,

        ],

    ),

    (TOPO_DC1_ID,

        [DEV_DC1GW_ID],

        []),

    (TOPO_DC2_ID,

        [DEV_DC2GW_ID],

        []),

    (TOPO_CS1_ID,

        [DEV_CS1GW1_ID, DEV_CS1GW2_ID],

        []),

    (TOPO_CS2_ID,

        [DEV_CS2GW1_ID, DEV_CS2GW2_ID],

        []),

    (TOPO_TN_ID,

        [   DEV_TNR1_ID, DEV_TNR2_ID, DEV_TNR3_ID, DEV_TNR4_ID,

            DEV_TOLS_ID,

        ],

        [   LINK_TNR1_TOLS_ID, LINK_TNR2_TOLS_ID, LINK_TNR3_TOLS_ID, LINK_TNR4_TOLS_ID,

        ]),

    connection_point(WIM_SEP_R1_ID, 'dot1q', WIM_SRV_VLAN_ID),

    connection_point(WIM_SEP_R3_ID, 'dot1q', WIM_SRV_VLAN_ID),

]

src/tests/ofc22/tests/test_functional_bootstrap.py

+19 −14
Original line number Diff line number Diff line
@@ -15,9 +15,10 @@ 
# limitations under the License.



import logging

from common.proto.context_pb2 import Empty

from common.proto.context_pb2 import ContextId, Empty

from common.proto.monitoring_pb2 import KpiDescriptorList

from common.tests.LoadScenario import load_scenario_from_descriptor

from common.tools.object_factory.Context import json_context_id

from context.client.ContextClient import ContextClient

from device.client.DeviceClient import DeviceClient

from monitoring.client.MonitoringClient import MonitoringClient
@@ -44,27 +45,31 @@ def test_scenario_empty( 




    # ----- Load Scenario ----------------------------------------------------------------------------------------------

    load_scenario_from_descriptor(DESCRIPTOR_FILE, context_client, device_client, None, None)

    descriptor_loader = load_scenario_from_descriptor(

        DESCRIPTOR_FILE, context_client, device_client, None, None)





    # ----- List entities - Ensure scenario is ready -------------------------------------------------------------------

    #response = context_client.ListContexts(Empty())

    #assert len(response.contexts) == len(CONTEXTS)



    #response = context_client.ListTopologies(ContextId(**CONTEXT_ID))

    #assert len(response.topologies) == len(TOPOLOGIES)

    response = context_client.ListContexts(Empty())

    assert len(response.contexts) == descriptor_loader.num_contexts



    #response = context_client.ListDevices(Empty())

    #assert len(response.devices) == len(DEVICES)

    for context_uuid, num_topologies in descriptor_loader.num_topologies.items():

        response = context_client.ListTopologies(ContextId(**json_context_id(context_uuid)))

        assert len(response.topologies) == num_topologies



    #response = context_client.ListLinks(Empty())

    #assert len(response.links) == len(LINKS)

    response = context_client.ListDevices(Empty())

    assert len(response.devices) == descriptor_loader.num_devices



    #response = context_client.ListServices(ContextId(**CONTEXT_ID))

    #assert len(response.services) == 0

    response = context_client.ListLinks(Empty())

    assert len(response.links) == descriptor_loader.num_links



    for context_uuid, _ in descriptor_loader.num_services.items():

        response = context_client.ListServices(ContextId(**json_context_id(context_uuid)))

        assert len(response.services) == 0



def test_scenario_kpis_created(monitoring_client: MonitoringClient):

def test_scenario_kpis_created(

    monitoring_client: MonitoringClient,    # pylint: disable=redefined-outer-name

) -> None:

    """

    This test validates that KPIs related to the service/device/endpoint were created

    during the service creation process.

src/tests/ofc22/tests/test_functional_cleanup.py

+44 −54

File changed.

Preview size limit exceeded, changes collapsed.

src/tests/ofc22/tests/test_functional_create_service.py

+46 −72

File changed.

Preview size limit exceeded, changes collapsed.