diff --git a/src/device/service/drivers/openconfig/OpenConfigDriver.py b/src/device/service/drivers/openconfig/OpenConfigDriver.py index 378ea195763a6fea8de5a95f0177a5c2823c4d59..f15ea649aab73a7a23832910aeed412a8f26062c 100644 --- a/src/device/service/drivers/openconfig/OpenConfigDriver.py +++ b/src/device/service/drivers/openconfig/OpenConfigDriver.py @@ -319,7 +319,7 @@ class OpenConfigDriver(_Driver): try: chk_string(str_resource_name, resource_key, allow_empty=False) str_filter = get_filter(resource_key) - self.__logger.debug('[GetConfig] str_filter = {:s}'.format(str(str_filter))) + # self.__logger.debug('[GetConfig] str_filter = {:s}'.format(str(str_filter))) if str_filter is None: str_filter = resource_key if self.__netconf_handler.vendor == 'PHOTONPATH' and not 'amplifier' in str(str_filter): continue xml_data = self.__netconf_handler.get(filter=str_filter).data_ele diff --git a/src/device/service/drivers/openconfig/templates/Namespace.py b/src/device/service/drivers/openconfig/templates/Namespace.py index 170160d6610cd6f5b0adf5f6cbad4816ac67f3f0..b79386cb387a65013c82a7b7fcb9a8db685e17dc 100644 --- a/src/device/service/drivers/openconfig/templates/Namespace.py +++ b/src/device/service/drivers/openconfig/templates/Namespace.py @@ -47,5 +47,5 @@ NAMESPACES = { 'ocrp' : NAMESPACE_ROUTING_POLICY, 'ocv' : NAMESPACE_VLAN, 'ocptr': NAMESPACE_PLATFORM_TRANSCEIVER, - 'ocpp' : NAMESPACE_PHOTONPATH + 'ocpp' : NAMESPACE_PHOTONPATH, } diff --git a/src/device/service/drivers/openconfig/templates/__init__.py b/src/device/service/drivers/openconfig/templates/__init__.py index 57934b1497e736e07eced902fdddd1d829b437e4..eecfa91fd526a40d3a3cb79eed51c9aaf452c156 100644 --- a/src/device/service/drivers/openconfig/templates/__init__.py +++ b/src/device/service/drivers/openconfig/templates/__init__.py @@ -40,7 +40,7 @@ ALL_RESOURCE_KEYS = [ RESOURCE_ROUTING_POLICIES, # routing policies should come before network instances RESOURCE_NETWORK_INSTANCES, RESOURCE_ACL, - RESOURCE_PHOTONPATH + RESOURCE_PHOTONPATH, ] RESOURCE_KEY_MAPPINGS = { diff --git a/src/device/service/drivers/openconfig/templates/photonpath/get.xml b/src/device/service/drivers/openconfig/templates/photonpath/get.xml index 7ee85a4c61382022cb494042fdd618534d5e5d91..5be71d372edaf8b2a93d397891397fc688f1b104 100644 --- a/src/device/service/drivers/openconfig/templates/photonpath/get.xml +++ b/src/device/service/drivers/openconfig/templates/photonpath/get.xml @@ -1,3 +1,2 @@ <amplifier-ols xmlns="http://photon-path.com/yang/optical-amplifier"> - </amplifier-ols> diff --git a/src/webui/service/templates/device/amplifier.html b/src/webui/service/templates/device/amplifier.html index a9ae90a295fa1c794a2c6bb1d15908e88e8a4e43..24724ad9fbeb7b721becc811779fb628b5809fff 100644 --- a/src/webui/service/templates/device/amplifier.html +++ b/src/webui/service/templates/device/amplifier.html @@ -1,3 +1,19 @@ +<!-- + Copyright 2022-2024 ETSI 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. + --> + {% extends 'base.html' %} {% block content %}