Merge branch 'develop' of ssh://gifrerenom_labs.etsi.org/tfs/controller into... (1dbceaaf) · Commits · TFS / controller

src/device/service/driver_api/_Driver.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,8 @@ class _Driver:
		def __init__(self, name : str, address: str, port: int, **settings) -> None:
		""" Initialize Driver.
		Parameters:
		name : str
		Device driver name
		address : str
		The address of the device
		port : int

+4 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,8 @@ from common.tools.grpc.Tools import grpc_message_to_json_string
		DEVICE_TYPE_TO_DEEPNESS = {
		DeviceTypeEnum.EMULATED_DATACENTER.value : 90,
		DeviceTypeEnum.DATACENTER.value : 90,
		DeviceTypeEnum.EMULATED_CLIENT.value : 90,
		DeviceTypeEnum.CLIENT.value : 90,

		DeviceTypeEnum.TERAFLOWSDN_CONTROLLER.value : 80,
		DeviceTypeEnum.EMULATED_IP_SDN_CONTROLLER.value : 80,
		@@ -50,6 +52,8 @@ DEVICE_TYPE_TO_DEEPNESS = {
		DeviceTypeEnum.OPTICAL_TRANSPONDER.value : 10,
		DeviceTypeEnum.EMULATED_OPTICAL_ROADM.value : 10,
		DeviceTypeEnum.OPTICAL_ROADM.value : 10,
		DeviceTypeEnum.QKD_NODE.value : 10,
		DeviceTypeEnum.OPEN_ROADM.value : 10,

		DeviceTypeEnum.EMULATED_OPTICAL_SPLITTER.value : 0,
		DeviceTypeEnum.NETWORK.value : 0, # network out of our control; always delegate

+3 −9

Original line number	Diff line number	Diff line
		@@ -13,18 +13,12 @@
		# limitations under the License.

		import os
		from typing import Dict, List, Tuple
		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,
		json_device_connect_rules, json_device_id, json_device_p4_disabled,
		json_device_emulated_tapi_disabled, json_device_id, json_device_packetrouter_disabled, json_device_tapi_disabled)
		from common.tools.object_factory.Service import (
		get_service_uuid, json_service_l3nm_planned,json_service_p4_planned)
		from common.tools.object_factory.ConfigRule import (
		json_config_rule_set, json_config_rule_delete)
		from common.tools.object_factory.EndPoint import json_endpoint, json_endpoint_ids, json_endpoints, json_endpoint_id
		json_device_connect_rules, json_device_id, json_device_p4_disabled)
		from common.tools.object_factory.Service import get_service_uuid, json_service_p4_planned
		from common.tools.object_factory.EndPoint import json_endpoint_ids, json_endpoints
		from common.tools.object_factory.EndPoint import json_endpoint_descriptor
		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

+1 −6

Original line number	Diff line number	Diff line
		@@ -14,14 +14,9 @@

		import copy, logging, pytest
		from common.Settings import get_setting
		from common.tests.EventTools import EVENT_CREATE, EVENT_UPDATE, check_events
		from common.tools.object_factory.Context import json_context_id
		from common.tools.object_factory.Device import json_device_id
		from common.tools.object_factory.Link import json_link_id
		from common.tools.object_factory.Topology import json_topology_id
		from context.client.ContextClient import ContextClient
		from context.client.EventsCollector import EventsCollector
		from common.proto.context_pb2 import ConfigActionEnum, Context, ContextId, Device, Empty, Link, Topology, DeviceOperationalStatusEnum
		from common.proto.context_pb2 import Context, ContextId, Device, Empty, Link, Topology, DeviceOperationalStatusEnum
		from device.client.DeviceClient import DeviceClient
		from .Objects import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES

+3 −8

Original line number	Diff line number	Diff line
		@@ -12,18 +12,13 @@
		# See the License for the specific language governing permissions and
		# limitations under the License.

		import copy, logging, pytest
		import logging, pytest
		from common.Settings import get_setting
		from common.tests.EventTools import EVENT_REMOVE, check_events
		from common.tools.object_factory.Context import json_context_id
		from common.tools.object_factory.Device import json_device_id
		from common.tools.object_factory.Link import json_link_id
		from common.tools.object_factory.Topology import json_topology_id
		from context.client.ContextClient import ContextClient
		from context.client.EventsCollector import EventsCollector
		from common.proto.context_pb2 import ConfigActionEnum, ContextId, Device, DeviceId, Empty, Link, LinkId, TopologyId, DeviceOperationalStatusEnum
		from common.proto.context_pb2 import ContextId, DeviceId, Empty, LinkId, TopologyId
		from device.client.DeviceClient import DeviceClient
		from .Objects import CONTEXT_ID, CONTEXTS, DEVICES, LINKS, TOPOLOGIES
		from .Objects import CONTEXTS, DEVICES, LINKS, TOPOLOGIES

		LOGGER = logging.getLogger(__name__)
		LOGGER.setLevel(logging.DEBUG)