diff --git a/src/tests/ofc22/tests/Objects.py b/src/tests/ofc22/tests/Objects.py index 6205b5e4ada67749f8230e99badca048a2372c2b..fd48210fa4c4ed507e090c8d225aa3755805446f 100644 --- a/src/tests/ofc22/tests/Objects.py +++ b/src/tests/ofc22/tests/Objects.py @@ -181,20 +181,29 @@ LINK_R4_O1 = json_link(LINK_R4_O1_UUID, [ENDPOINT_ID_R4_13_0_0, ENDPOINT_ID # ----- WIM Service Settings ------------------------------------------------------------------------------------------- -def endpoint_id__to__sep_id(endpoint_id): +def compose_service_endpoint_id(endpoint_id): device_uuid = endpoint_id['device_id']['device_uuid']['uuid'] endpoint_uuid = endpoint_id['endpoint_uuid']['uuid'] - return '{:s}:{:s}'.format(device_uuid, endpoint_uuid) + return ':'.join([device_uuid, endpoint_uuid]) -WIM_SEP_R1_ID = endpoint_id__to__sep_id(ENDPOINT_ID_R1_13_1_2) -WIM_SEP_R1_IP = '10.0.0.1' -WIM_SEP_R1_SITE_ID = '1' -WIM_SEP_R1_BEARER = '{:s}:{:s}'.format(WIM_SEP_R1_ID, WIM_SEP_R1_IP) - -WIM_SEP_R3_ID = endpoint_id__to__sep_id(ENDPOINT_ID_R3_13_1_2) -WIM_SEP_R3_IP = '10.0.0.2' -WIM_SEP_R3_SITE_ID = '2' -WIM_SEP_R3_BEARER = '{:s}:{:s}'.format(WIM_SEP_R3_ID, WIM_SEP_R3_IP) +def compose_bearer(endpoint_id, router_id, route_distinguisher): + device_uuid = endpoint_id['device_id']['device_uuid']['uuid'] + endpoint_uuid = endpoint_id['endpoint_uuid']['uuid'] + return '#'.join([device_uuid, endpoint_uuid, router_id, route_distinguisher]) + +WIM_SEP_R1_ID = compose_service_endpoint_id(ENDPOINT_ID_R1_13_1_2) +WIM_SEP_R1_ROUTER_ID = '10.10.10.1' +WIM_SEP_R1_ROUTER_DIST = '65000:111' +WIM_SEP_R1_SITE_ID = '1' +WIM_SEP_R1_BEARER = compose_bearer(ENDPOINT_ID_R1_13_1_2, WIM_SEP_R1_ROUTER_ID, WIM_SEP_R1_ROUTER_DIST) +WIM_SRV_R1_VLAN_ID = 400 + +WIM_SEP_R3_ID = compose_service_endpoint_id(ENDPOINT_ID_R3_13_1_2) +WIM_SEP_R3_ROUTER_ID = '20.20.20.1' +WIM_SEP_R3_ROUTER_DIST = '65000:222' +WIM_SEP_R3_SITE_ID = '2' +WIM_SEP_R3_BEARER = compose_bearer(ENDPOINT_ID_R3_13_1_2, WIM_SEP_R3_ROUTER_ID, WIM_SEP_R3_ROUTER_DIST) +WIM_SRV_R3_VLAN_ID = 500 WIM_USERNAME = 'admin' WIM_PASSWORD = 'admin' @@ -206,14 +215,13 @@ WIM_MAPPING = [ 'service_mapping_info': {'bearer': {'bearer-reference': WIM_SEP_R3_BEARER}, 'site-id': WIM_SEP_R3_SITE_ID}}, ] WIM_SERVICE_TYPE = 'ELINE' -WIM_SERVICE_VLAN_ID = 1234 WIM_SERVICE_CONNECTION_POINTS = [ {'service_endpoint_id': WIM_SEP_R1_ID, 'service_endpoint_encapsulation_type': 'dot1q', - 'service_endpoint_encapsulation_info': {'vlan': WIM_SERVICE_VLAN_ID}}, + '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_SERVICE_VLAN_ID}}, + 'service_endpoint_encapsulation_info': {'vlan': WIM_SRV_R3_VLAN_ID}}, ] # ----- Object Collections ---------------------------------------------------------------------------------------------