Commit e7486cf8 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Code CleanUP

parent e2fd2d90

src/device/service/drivers/openconfig/OpenConfigDriver.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -319,7 +319,7 @@ class OpenConfigDriver(_Driver): 
                try:

                try:

                    chk_string(str_resource_name, resource_key, allow_empty=False)

                    chk_string(str_resource_name, resource_key, allow_empty=False)

                    str_filter = get_filter(resource_key)

                    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 str_filter is None: str_filter = resource_key

                    if self.__netconf_handler.vendor == 'PHOTONPATH' and not 'amplifier' in str(str_filter): continue

                    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

                    xml_data = self.__netconf_handler.get(filter=str_filter).data_ele

src/device/service/drivers/openconfig/templates/Namespace.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,5 +47,5 @@ NAMESPACES = { 
    'ocrp' : NAMESPACE_ROUTING_POLICY,

    'ocrp' : NAMESPACE_ROUTING_POLICY,

    'ocv'  : NAMESPACE_VLAN,

    'ocv'  : NAMESPACE_VLAN,

    'ocptr': NAMESPACE_PLATFORM_TRANSCEIVER,

    'ocptr': NAMESPACE_PLATFORM_TRANSCEIVER,

    'ocpp' : NAMESPACE_PHOTONPATH

    'ocpp' : NAMESPACE_PHOTONPATH,

}
 
}

src/device/service/drivers/openconfig/templates/__init__.py

+1 −1
Original line number Original line Diff line number Diff line
@@ -40,7 +40,7 @@ ALL_RESOURCE_KEYS = [ 
    RESOURCE_ROUTING_POLICIES,      # routing policies should come before network instances

    RESOURCE_ROUTING_POLICIES,      # routing policies should come before network instances

    RESOURCE_NETWORK_INSTANCES,

    RESOURCE_NETWORK_INSTANCES,

    RESOURCE_ACL,

    RESOURCE_ACL,

    RESOURCE_PHOTONPATH

    RESOURCE_PHOTONPATH,

]

]





RESOURCE_KEY_MAPPINGS = {

RESOURCE_KEY_MAPPINGS = {

src/device/service/drivers/openconfig/templates/photonpath/get.xml

+0 −1
Original line number Original line Diff line number Diff line 
<amplifier-ols xmlns="http://photon-path.com/yang/optical-amplifier">

<amplifier-ols xmlns="http://photon-path.com/yang/optical-amplifier">



</amplifier-ols>
 
</amplifier-ols>

src/webui/service/templates/device/amplifier.html

+16 −0
Original line number Original line Diff line number Diff line 
<!--

    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' %}

{% extends 'base.html' %}





{% block content %}

{% block content %}