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

proto/context.proto

+3 −0

Original line number	Diff line number	Diff line
		@@ -223,6 +223,9 @@ enum DeviceDriverEnum {
		DEVICEDRIVER_IETF_ACTN = 10;
		DEVICEDRIVER_OC = 11;
		DEVICEDRIVER_QKD = 12;
		DEVICEDRIVER_IETF_L3VPN = 13;
		DEVICEDRIVER_IETF_SLICE = 14;
		DEVICEDRIVER_NCE = 15;
		}

		enum DeviceOperationalStatusEnum {

scripts/run_tests_locally-nbi-ietf-slice.sh

0 → 100755

+25 −0

Original line number	Diff line number	Diff line
		#!/bin/bash
		# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)
		#
		# 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.


		PROJECTDIR=`pwd`

		cd $PROJECTDIR/src
		RCFILE=$PROJECTDIR/coverage/.coveragerc

		# Run unitary tests and analyze coverage of code at same time
		# helpful pytest flags: --log-level=INFO -o log_cli=true --verbose --maxfail=1 --durations=0
		coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
		nbi/tests/test_slice_2.py

src/common/DeviceTypes.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -38,6 +38,7 @@ class DeviceTypeEnum(Enum):
		CLIENT = 'client'
		DATACENTER = 'datacenter'
		IP_SDN_CONTROLLER = 'ip-sdn-controller'
		NCE = 'nce'
		MICROWAVE_RADIO_SYSTEM = 'microwave-radio-system'
		OPEN_LINE_SYSTEM = 'open-line-system'
		OPTICAL_ROADM = 'optical-roadm'
		@@ -52,3 +53,4 @@ class DeviceTypeEnum(Enum):

		# ETSI TeraFlowSDN controller
		TERAFLOWSDN_CONTROLLER = 'teraflowsdn'
		IETF_SLICE = 'ietf-slice'

src/common/tools/context_queries/Slice.py

+104 −3

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

		import grpc, logging
		from typing import Optional
		import logging
		import grpc
		from typing import Optional, Tuple, Union
		from uuid import UUID, uuid5
		from common.Constants import DEFAULT_CONTEXT_NAME
		from common.proto.context_pb2 import Slice, SliceFilter, SliceId
		from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
		from common.proto.context_pb2 import ContextId, Slice, SliceFilter, SliceId
		from common.method_wrappers.ServiceExceptions import InvalidArgumentsException
		from common.proto.context_pb2 import ContextId, Slice, SliceFilter, SliceId
		from context.client.ContextClient import ContextClient


		NAMESPACE_TFS = UUID("200e3a1f-2223-534f-a100-758e29c37f40")

		LOGGER = logging.getLogger(__name__)

		def get_slice_by_id(
		@@ -59,3 +67,96 @@ def get_slice_by_uuid(
		context_client, slice_id, rw_copy=rw_copy, include_endpoint_ids=include_endpoint_ids,
		include_constraints=include_constraints, include_service_ids=include_service_ids,
		include_subslice_ids=include_subslice_ids, include_config_rules=include_config_rules)


		def get_uuid_from_string(
		str_uuid_or_name: Union[str, UUID], prefix_for_name: Optional[str] = None
		) -> str:
		# if UUID given, assume it is already a valid UUID
		if isinstance(str_uuid_or_name, UUID):
		return str_uuid_or_name
		if not isinstance(str_uuid_or_name, str):
		MSG = "Parameter({:s}) cannot be used to produce a UUID"
		raise Exception(MSG.format(str(repr(str_uuid_or_name))))
		try:
		# try to parse as UUID
		return str(UUID(str_uuid_or_name))
		except: # pylint: disable=bare-except
		# produce a UUID within TFS namespace from parameter
		if prefix_for_name is not None:
		str_uuid_or_name = "{:s}/{:s}".format(prefix_for_name, str_uuid_or_name)
		return str(uuid5(NAMESPACE_TFS, str_uuid_or_name))


		def context_get_uuid(
		context_id: ContextId,
		context_name: str = "",
		allow_random: bool = False,
		allow_default: bool = False,
		) -> str:
		context_uuid = context_id.context_uuid.uuid

		if len(context_uuid) > 0:
		return get_uuid_from_string(context_uuid)
		if len(context_name) > 0:
		return get_uuid_from_string(context_name)
		if allow_default:
		return get_uuid_from_string(DEFAULT_CONTEXT_NAME)

		raise InvalidArgumentsException(
		[
		("context_id.context_uuid.uuid", context_uuid),
		("name", context_name),
		],
		extra_details=["At least one is required to produce a Context UUID"],
		)


		def slice_get_uuid(slice_id: SliceId) -> Tuple[str, str]:
		context_uuid = context_get_uuid(slice_id.context_id, allow_random=False)
		raw_slice_uuid = slice_id.slice_uuid.uuid

		if len(raw_slice_uuid) > 0:
		return context_uuid, get_uuid_from_string(
		raw_slice_uuid, prefix_for_name=context_uuid
		)

		raise InvalidArgumentsException(
		[
		("slice_id.slice_uuid.uuid", raw_slice_uuid),
		],
		extra_details=["At least one is required to produce a Slice UUID"],
		)

		def get_slice_by_defualt_id(
		context_client : ContextClient, default_slice_id : SliceId, context_uuid : str = DEFAULT_CONTEXT_NAME,
		rw_copy : bool = False, include_endpoint_ids : bool = True, include_constraints : bool = True,
		include_service_ids : bool = True, include_subslice_ids : bool = True, include_config_rules : bool = True
		) -> Optional[Slice]:
		context_uuid, slice_uuid = slice_get_uuid(default_slice_id)
		LOGGER.debug(f'P60: {context_uuid} {slice_uuid}')
		slice_id = SliceId()
		slice_id.context_id.context_uuid.uuid = context_uuid # pylint: disable=no-member
		slice_id.slice_uuid.uuid = slice_uuid # pylint: disable=no-member
		return get_slice_by_id(
		context_client, slice_id, rw_copy=rw_copy, include_endpoint_ids=include_endpoint_ids,
		include_constraints=include_constraints, include_service_ids=include_service_ids,
		include_subslice_ids=include_subslice_ids, include_config_rules=include_config_rules)


		def get_slice_by_defualt_name(
		context_client : ContextClient, slice_name : str, context_uuid : str = DEFAULT_CONTEXT_NAME,
		rw_copy : bool = False, include_endpoint_ids : bool = True, include_constraints : bool = True,
		include_service_ids : bool = True, include_subslice_ids : bool = True, include_config_rules : bool = True
		) -> Optional[Slice]:
		default_slice_id = SliceId()
		default_slice_id.context_id.context_uuid.uuid = context_uuid # pylint: disable=no-member
		default_slice_id.slice_uuid.uuid = slice_name # pylint: disable=no-member
		context_uuid, slice_uuid = slice_get_uuid(default_slice_id)
		slice_id = SliceId()
		slice_id.context_id.context_uuid.uuid = context_uuid # pylint: disable=no-member
		slice_id.slice_uuid.uuid = slice_uuid # pylint: disable=no-member
		return get_slice_by_id(
		context_client, slice_id, rw_copy=rw_copy, include_endpoint_ids=include_endpoint_ids,
		include_constraints=include_constraints, include_service_ids=include_service_ids,
		include_subslice_ids=include_subslice_ids, include_config_rules=include_config_rules)

src/common/tools/descriptor/Tools.py

+2 −0

Original line number	Diff line number	Diff line
		@@ -115,6 +115,8 @@ CONTROLLER_DEVICE_TYPES = {
		DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM.value,
		DeviceTypeEnum.OPEN_LINE_SYSTEM.value,
		DeviceTypeEnum.TERAFLOWSDN_CONTROLLER.value,
		DeviceTypeEnum.IETF_SLICE.value,
		DeviceTypeEnum.NCE.value,
		}

		def split_controllers_and_network_devices(devices : List[Dict]) -> Tuple[List[Dict], List[Dict]]:

Admin message