Pre-release CI/CD pipeline fixes (d07e31ed) · Commits · TFS / controller

src/service/tests/ServiceHandler_L3NM_EMU.py

+12 −11

Original line number	Original line	Diff line number	Diff line
	@@ -18,7 +18,7 @@ from common.tools.object_factory.Location import json_location, json_gps_positio
	from common.tools.object_factory.ConfigRule import json_config_rule_set		from common.tools.object_factory.ConfigRule import json_config_rule_set
	from common.tools.object_factory.Constraint import json_constraint_custom, json_constraint_endpoint_location_gps		from common.tools.object_factory.Constraint import json_constraint_custom, json_constraint_endpoint_location_gps
	from common.tools.object_factory.Device import (		from common.tools.object_factory.Device import (
	json_device_emulated_packet_router_disabled, json_device_emulated_tapi_disabled, json_device_id)		json_device_emulated_connect_rules, json_device_emulated_packet_router_disabled, json_device_emulated_tapi_disabled, json_device_id)
	from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id		from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_id
	from common.tools.object_factory.Link import json_link, json_link_id		from common.tools.object_factory.Link import json_link, json_link_id
	from common.tools.object_factory.Service import json_service_id, json_service_l3nm_planned		from common.tools.object_factory.Service import json_service_id, json_service_l3nm_planned
	@@ -58,9 +58,10 @@ DEVICE_R1_ENDPOINT_DEFS = [
	('EP100', 'copper', json_location(gps_position=json_gps_position(*BARCELONA_GPS)))		('EP100', 'copper', json_location(gps_position=json_gps_position(*BARCELONA_GPS)))
	]		]
	DEVICE_R1_ID = json_device_id(DEVICE_R1_UUID)		DEVICE_R1_ID = json_device_id(DEVICE_R1_UUID)
	DEVICE_R1_ENDPOINTS = json_endpoints(DEVICE_R1_ID, DEVICE_R1_ENDPOINT_DEFS)		DEVICE_R1_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_R1_ENDPOINT_DEFS)
			DEVICE_R1 = json_device_emulated_packet_router_disabled(
			DEVICE_R1_UUID, config_rules=DEVICE_R1_CONNECT_RULES)
	DEVICE_R1_ENDPOINT_IDS = json_endpoint_ids(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_emulated_packet_router_disabled(DEVICE_R1_UUID, endpoints=DEVICE_R1_ENDPOINTS)
	ENDPOINT_ID_R1_EP1 = DEVICE_R1_ENDPOINT_IDS[0]		ENDPOINT_ID_R1_EP1 = DEVICE_R1_ENDPOINT_IDS[0]
	ENDPOINT_ID_R1_EP100 = DEVICE_R1_ENDPOINT_IDS[1]		ENDPOINT_ID_R1_EP100 = DEVICE_R1_ENDPOINT_IDS[1]

	@@ -70,9 +71,10 @@ DEVICE_R2_ENDPOINT_DEFS = [
	('EP100', 'copper', json_location(gps_position=json_gps_position(*MADRID_GPS)))		('EP100', 'copper', json_location(gps_position=json_gps_position(*MADRID_GPS)))
	]		]
	DEVICE_R2_ID = json_device_id(DEVICE_R2_UUID)		DEVICE_R2_ID = json_device_id(DEVICE_R2_UUID)
	DEVICE_R2_ENDPOINTS = json_endpoints(DEVICE_R2_ID, DEVICE_R2_ENDPOINT_DEFS)		DEVICE_R2_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_R2_ENDPOINT_DEFS)
			DEVICE_R2 = json_device_emulated_packet_router_disabled(
			DEVICE_R2_UUID, config_rules=DEVICE_R2_CONNECT_RULES)
	DEVICE_R2_ENDPOINT_IDS = json_endpoint_ids(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, endpoints=DEVICE_R2_ENDPOINTS)
	ENDPOINT_ID_R2_EP1 = DEVICE_R2_ENDPOINT_IDS[0]		ENDPOINT_ID_R2_EP1 = DEVICE_R2_ENDPOINT_IDS[0]
	ENDPOINT_ID_R2_EP100 = DEVICE_R2_ENDPOINT_IDS[1]		ENDPOINT_ID_R2_EP100 = DEVICE_R2_ENDPOINT_IDS[1]

	@@ -82,9 +84,10 @@ DEVICE_R3_ENDPOINT_DEFS = [
	('EP100', 'copper', json_location(gps_position=json_gps_position(*MALAGA_GPS)))		('EP100', 'copper', json_location(gps_position=json_gps_position(*MALAGA_GPS)))
	]		]
	DEVICE_R3_ID = json_device_id(DEVICE_R3_UUID)		DEVICE_R3_ID = json_device_id(DEVICE_R3_UUID)
	DEVICE_R3_ENDPOINTS = json_endpoints(DEVICE_R3_ID, DEVICE_R3_ENDPOINT_DEFS)		DEVICE_R2_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_R2_ENDPOINT_DEFS)
			DEVICE_R3 = json_device_emulated_packet_router_disabled(
			DEVICE_R3_UUID, config_rules=DEVICE_R2_CONNECT_RULES)
	DEVICE_R3_ENDPOINT_IDS = json_endpoint_ids(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_emulated_packet_router_disabled(DEVICE_R3_UUID, endpoints=DEVICE_R3_ENDPOINTS)
	ENDPOINT_ID_R3_EP1 = DEVICE_R3_ENDPOINT_IDS[0]		ENDPOINT_ID_R3_EP1 = DEVICE_R3_ENDPOINT_IDS[0]
	ENDPOINT_ID_R3_EP100 = DEVICE_R3_ENDPOINT_IDS[1]		ENDPOINT_ID_R3_EP100 = DEVICE_R3_ENDPOINT_IDS[1]

	@@ -95,9 +98,9 @@ DEVICE_O1_ENDPOINT_DEFS = [
	('EP3', 'optical', json_location(gps_position=json_gps_position(*PONFERRADA_GPS)))		('EP3', 'optical', json_location(gps_position=json_gps_position(*PONFERRADA_GPS)))
	]		]
	DEVICE_O1_ID = json_device_id(DEVICE_O1_UUID)		DEVICE_O1_ID = json_device_id(DEVICE_O1_UUID)
	DEVICE_O1_ENDPOINTS = json_endpoints(DEVICE_O1_ID, DEVICE_O1_ENDPOINT_DEFS)		DEVICE_O1_CONNECT_RULES = json_device_emulated_connect_rules(DEVICE_O1_ENDPOINT_DEFS)
			DEVICE_O1 = json_device_emulated_tapi_disabled(DEVICE_O1_UUID, config_rules=DEVICE_O1_CONNECT_RULES)
	DEVICE_O1_ENDPOINT_IDS = json_endpoint_ids(DEVICE_O1_ID, DEVICE_O1_ENDPOINT_DEFS)		DEVICE_O1_ENDPOINT_IDS = json_endpoint_ids(DEVICE_O1_ID, DEVICE_O1_ENDPOINT_DEFS)
	DEVICE_O1 = json_device_emulated_tapi_disabled(DEVICE_O1_UUID, endpoints=DEVICE_O1_ENDPOINTS)
	ENDPOINT_ID_O1_EP1 = DEVICE_O1_ENDPOINT_IDS[0]		ENDPOINT_ID_O1_EP1 = DEVICE_O1_ENDPOINT_IDS[0]
	ENDPOINT_ID_O1_EP2 = DEVICE_O1_ENDPOINT_IDS[1]		ENDPOINT_ID_O1_EP2 = DEVICE_O1_ENDPOINT_IDS[1]
	ENDPOINT_ID_O1_EP3 = DEVICE_O1_ENDPOINT_IDS[2]		ENDPOINT_ID_O1_EP3 = DEVICE_O1_ENDPOINT_IDS[2]
	@@ -133,7 +136,6 @@ SERVICE_R1_R3_CONSTRAINTS = [
	json_constraint_custom('jitter_us', 1.2),		json_constraint_custom('jitter_us', 1.2),
	]		]


	SERVICE_R1_R3_CONSTRAINTS_LOCATION = [		SERVICE_R1_R3_CONSTRAINTS_LOCATION = [
	json_constraint_endpoint_location_gps(None, ZARAGOZA_GPS[0], ZARAGOZA_GPS[1]),		json_constraint_endpoint_location_gps(None, ZARAGOZA_GPS[0], ZARAGOZA_GPS[1]),
	json_constraint_endpoint_location_gps(None, TOLEDO_GPS[0], TOLEDO_GPS[1]),		json_constraint_endpoint_location_gps(None, TOLEDO_GPS[0], TOLEDO_GPS[1]),
	@@ -143,7 +145,6 @@ SERVICE_R1_R3_CONSTRAINTS_LOCATION_NEW = [
	json_constraint_endpoint_location_gps(None, GRANADA_GPS[0], GRANADA_GPS[1]),		json_constraint_endpoint_location_gps(None, GRANADA_GPS[0], GRANADA_GPS[1]),
	]		]


	SERVICE_R1_R3_CONFIG_RULES = [		SERVICE_R1_R3_CONFIG_RULES = [
	json_config_rule_set(		json_config_rule_set(
	'/settings',		'/settings',

src/service/tests/ServiceHandlersToTest.py

+5 −5

Original line number	Original line	Diff line number	Diff line
	@@ -22,8 +22,8 @@ try:
	except ImportError:		except ImportError:
	pass		pass

	try:		#try:
	from service.tests.ServiceHandler_L3NM_OC import TEST_SERVICE_HANDLER		# from service.tests.ServiceHandler_L3NM_OC import TEST_SERVICE_HANDLER
	SERVICE_HANDLERS_TO_TEST.append(TEST_SERVICE_HANDLER)		# SERVICE_HANDLERS_TO_TEST.append(TEST_SERVICE_HANDLER)
	except ImportError:		#except ImportError:
	pass		# pass