Commit 86a17a52 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

End-to-End Tests using IETF L2VPN (OFC'22, ECOC'22, OECC/PSC'22): 

- Fixed bearer prefix
parent c6dd3898

src/tests/ecoc22/tests/Objects.py

+16 −4
Original line number Diff line number Diff line
@@ -33,10 +33,22 @@ EP_ID_DC2_BKP = json_endpoint_id(DEV_ID_DC2, 'eth2') 
DEV_ID_CS2GW1 = json_device_id('CS2-GW1')

DEV_ID_CS2GW2 = json_device_id('CS2-GW2')



WIM_SEP_DC1_PRI, WIM_MAP_DC1_PRI = wim_mapping(SITE_ID_DC1, EP_ID_DC1_PRI, DEV_ID_CS1GW1, priority=10, redundant=['DC1:DC1-GW:eth2'])

WIM_SEP_DC1_BKP, WIM_MAP_DC1_BKP = wim_mapping(SITE_ID_DC1, EP_ID_DC1_BKP, DEV_ID_CS1GW2, priority=20, redundant=['DC1:DC1-GW:eth1'])

WIM_SEP_DC2_PRI, WIM_MAP_DC2_PRI = wim_mapping(SITE_ID_DC2, EP_ID_DC2_PRI, DEV_ID_CS2GW1, priority=10, redundant=['DC2:DC2-GW:eth2'])

WIM_SEP_DC2_BKP, WIM_MAP_DC2_BKP = wim_mapping(SITE_ID_DC2, EP_ID_DC2_BKP, DEV_ID_CS2GW2, priority=20, redundant=['DC2:DC2-GW:eth1'])

WIM_SEP_DC1_PRI, WIM_MAP_DC1_PRI = wim_mapping(

    SITE_ID_DC1, EP_ID_DC1_PRI, pe_device_id=DEV_ID_CS1GW1,

    bearer_prefix='ECOC22', priority=10, redundant=['DC1:DC1-GW:eth2']

)

WIM_SEP_DC1_BKP, WIM_MAP_DC1_BKP = wim_mapping(

    SITE_ID_DC1, EP_ID_DC1_BKP, pe_device_id=DEV_ID_CS1GW2,

    bearer_prefix='ECOC22', priority=20, redundant=['DC1:DC1-GW:eth1']

)

WIM_SEP_DC2_PRI, WIM_MAP_DC2_PRI = wim_mapping(

    SITE_ID_DC2, EP_ID_DC2_PRI, pe_device_id=DEV_ID_CS2GW1,

    bearer_prefix='ECOC22', priority=10, redundant=['DC2:DC2-GW:eth2']

)

WIM_SEP_DC2_BKP, WIM_MAP_DC2_BKP = wim_mapping(

    SITE_ID_DC2, EP_ID_DC2_BKP, pe_device_id=DEV_ID_CS2GW2,

    bearer_prefix='ECOC22', priority=20, redundant=['DC2:DC2-GW:eth1']

)



WIM_MAPPING  = [

    WIM_MAP_DC1_PRI, WIM_MAP_DC1_BKP,

src/tests/oeccpsc22/tests/Objects_Service.py

+2 −2
Original line number Diff line number Diff line
@@ -21,14 +21,14 @@ WIM_SEP_D1R1_ID = compose_service_endpoint_id(D1_ENDPOINT_IDS[D1_DEVICE 
WIM_SEP_D1R1_ROUTER_ID   = '10.10.10.1'

WIM_SEP_D1R1_ROUTER_DIST = '65000:111'

WIM_SEP_D1R1_SITE_ID     = '1'

WIM_SEP_D1R1_BEARER      = compose_bearer(D1_ENDPOINT_IDS[D1_DEVICE_D1R1_UUID]['3/1'])

WIM_SEP_D1R1_BEARER      = compose_bearer(D1_ENDPOINT_IDS[D1_DEVICE_D1R1_UUID]['3/1'], 'OECCPSC22D1')

WIM_SRV_D1R1_VLAN_ID     = 400



WIM_SEP_D2R4_ID          = compose_service_endpoint_id(D2_ENDPOINT_IDS[D2_DEVICE_D2R4_UUID]['3/3'])

WIM_SEP_D2R4_ROUTER_ID   = '20.20.20.1'

WIM_SEP_D2R4_ROUTER_DIST = '65000:222'

WIM_SEP_D2R4_SITE_ID     = '2'

WIM_SEP_D2R4_BEARER      = compose_bearer(D2_ENDPOINT_IDS[D2_DEVICE_D2R4_UUID]['3/3'])

WIM_SEP_D2R4_BEARER      = compose_bearer(D2_ENDPOINT_IDS[D2_DEVICE_D2R4_UUID]['3/3'], 'OECCPSC22D2')

WIM_SRV_D2R4_VLAN_ID     = 500



WIM_USERNAME = 'admin'

src/tests/oeccpsc22/tests/Tools.py

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ def compose_service_endpoint_id(endpoint_id): 
    endpoint_uuid = endpoint_id['endpoint_uuid']['uuid']

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



def compose_bearer(endpoint_id):

def compose_bearer(endpoint_id : Dict, bearer_prefix : str):

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

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

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

src/tests/ofc22/tests/Objects.py

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ SITE_ID_DC2 = '2' 
DEV_ID_DC2  = json_device_id('R3-EMU')

EP_ID_DC2   = json_endpoint_id(DEV_ID_DC2, '13/1/2')



WIM_SEP_DC1, WIM_MAP_DC1 = wim_mapping(SITE_ID_DC1, EP_ID_DC1)

WIM_SEP_DC2, WIM_MAP_DC2 = wim_mapping(SITE_ID_DC2, EP_ID_DC2)

WIM_SEP_DC1, WIM_MAP_DC1 = wim_mapping(SITE_ID_DC1, EP_ID_DC1, bearer_prefix='OFC22')

WIM_SEP_DC2, WIM_MAP_DC2 = wim_mapping(SITE_ID_DC2, EP_ID_DC2, bearer_prefix='OFC22')



WIM_MAPPING  = [

    WIM_MAP_DC1,