Commit acdeb35a authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/110-cttc-incorrect-endpoint-lookup-in-nbi-etsi-bwm-plugin' into 'develop' 

Resolve "(CTTC) Incorrect endpoint lookup in NBI ETSI BWM plugin"

See merge request !196
parents b309a76c 02aade12

scripts/run_tests_locally-device-openconfig-ocnos.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 -o log_cli=true --verbose \

    device/tests/test_unitary_openconfig_ocnos.py

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

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



import time

import json

import anytree, copy, logging, pytz, queue, re, threading

#import lxml.etree as ET
@@ -237,6 +238,8 @@ def edit_config( 
                        test_option=test_option, error_option=error_option, format=format)

                    if commit_per_rule:

                        netconf_handler.commit()                                                                               # configuration commit

                    if 'table_connections' in resource_key:

                        time.sleep(5) # CPU usage might exceed critical level after route redistribution, BGP daemon needs time to reload

                

                #results[i] = True

                results.append(True)

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

+2 −1
Original line number Diff line number Diff line
@@ -61,7 +61,8 @@ def generate_templates(resource_key: str, resource_value: str, delete: bool,vend 
        elif "inter_instance_policies" in resource_key:

            result_templates.append(associate_RP_to_NI(data))

        elif "protocols" in resource_key:

            if vendor == "ADVA": result_templates.append(add_protocol_NI(data, vendor, delete))

            if vendor is None or vendor == "ADVA":

                result_templates.append(add_protocol_NI(data, vendor, delete))

        elif "table_connections" in resource_key:

            result_templates.append(create_table_conns(data, delete))

        elif "interface" in resource_key:

src/device/service/drivers/openconfig/templates/VPN/Interfaces_multivendor.py

+4 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ def create_If_SubIf(data,vendor, DEL): 
                    with tag('enabled'):text('true')    

                with tag('subinterfaces'):

                    with tag('subinterface'):

                        if vendor == 'ADVA':

                        if vendor is None or vendor == 'ADVA':

                            with tag('index'): text('0')

                        with tag('config'):

                            with tag('index'): text('0')
@@ -65,8 +65,10 @@ def create_If_SubIf(data,vendor, DEL): 
                                with tag('single-tagged'):

                                    with tag('config'):

                                        with tag('vlan-id'):text(data['vlan_id'])

                        if "l3ipvlan" in data['type']: 

                        if "l3ipvlan" in data['type'] and 'address_ip' in data: 

                            with tag('ipv4',  xmlns="http://openconfig.net/yang/interfaces/ip"):

                                if 'mtu' in data:

                                    with tag('mtu'):text(data['mtu'])

                                with tag('addresses'):

                                    with tag('address'):

                                        with tag('ip'):text(data['address_ip'])

src/device/service/drivers/openconfig/templates/VPN/Network_instance_multivendor.py

+28 −6
Original line number Diff line number Diff line
@@ -64,10 +64,12 @@ def create_NI(parameters,vendor,DEL): 
                elif "L3VRF" in parameters['type']: 

                    with tag('config'):

                        with tag('name'):text(parameters['name'])

                        if vendor == "ADVA": 

                        if "router_id" in parameters: 

                            with tag('router-id'):text(parameters['router_id'])

                        if vendor is None or vendor == 'ADVA':

                            with tag('type', 'xmlns:oc-ni-types="http://openconfig.net/yang/network-instance-types"'):text('oc-ni-types:',parameters['type'])

                            with tag('route-distinguisher'):text(parameters['route_distinguisher'])

                    if vendor == "ADVA": 

                    if vendor is None or vendor == 'ADVA':

                        with tag('encapsulation'):

                            with tag('config'):

                                with tag('encapsulation-type', 'xmlns:oc-ni-types="http://openconfig.net/yang/network-instance-types"')  :text('oc-ni-types:MPLS')
@@ -123,14 +125,29 @@ def add_protocol_NI(parameters,vendor, DEL): 
                        with tag('config'):

                            with tag('identifier', 'xmlns:oc-pol-types="http://openconfig.net/yang/policy-types"'):text('oc-pol-types:',parameters['identifier'])

                            with tag('name')      :text(parameters['protocol_name'])

                            with tag('enabled'): text('true')

                        if "BGP" in parameters['identifier']:

                            with tag('bgp'):

                                with tag('name'): text(parameters['as'])

                                with tag('global'):

                                    with tag('config'):

                                        with tag('as')       :text(parameters['as'])

                                        if "router-id" in parameters: 

                                            with tag('router-id'):text(parameters['router-id'])

                if vendor == "ADVA": 

                                        if "router_id" in parameters: 

                                            with tag('router-id'):text(parameters['router_id'])

                                if 'neighbors' in parameters:

                                    with tag('neighbors'):

                                        for neighbor in parameters['neighbors']:

                                            with tag('neighbor'):

                                                with tag('neighbor-address'): text(neighbor['ip_address'])

                                                with tag('afi-safis'):

                                                    with tag('afi-safi', 'xmlns:oc-bgp-types="http://openconfig.net/yang/bgp-types"'):

                                                        with tag('afi-safi-name'): text('oc-bgp-types:IPV4_UNICAST')

                                                        with tag('enabled'): text('true')

                                                with tag('config'):

                                                    with tag('neighbor-address'): text(neighbor['ip_address'])

                                                    with tag('enabled'): text('true')

                                                    with tag('peer-as'): text(parameters['as'])

                if vendor is None or vendor == 'ADVA':

                    with tag('tables'):

                      with tag('table'):

                          with tag('protocol', 'xmlns:oc-pol-types="http://openconfig.net/yang/policy-types"'):text('oc-pol-types:',parameters['identifier'])
@@ -177,6 +194,9 @@ def associate_If_to_NI(parameters, DEL): 
        else:

            with tag('network-instance'):

                with tag('name'):text(parameters['name'])

                with tag('config'):

                    with tag('name'):text(parameters['name'])

                    with tag('type', 'xmlns:oc-ni-types="http://openconfig.net/yang/network-instance-types"'):text('oc-ni-types:',parameters['type'])

                with tag('interfaces'):

                    with tag('interface'):

                        with tag('id'):text(parameters['id'])
@@ -315,7 +335,7 @@ def create_table_conns(parameters,DEL): 
                    with tag('table-connection','xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="delete"'):

                      with tag('src-protocol','xmlns:oc-pol-types="http://openconfig.net/yang/policy-types"'):   text('oc-pol-types:',parameters['src_protocol'])

                      with tag('dst-protocol','xmlns:oc-pol-types="http://openconfig.net/yang/policy-types"'):   text('oc-pol-types:',parameters['dst_protocol'])

                      with tag('address-family', 'xmlns:oc-types="http://openconfig.net/yang/openconfig-types"'):text('oc-types:',parameters['dst_protocol'])     

                      with tag('address-family', 'xmlns:oc-types="http://openconfig.net/yang/openconfig-types"'):text('oc-types:',parameters['address_family'])     

            else:

                with tag('table-connections'):

                    with tag('table-connection'):
@@ -326,6 +346,8 @@ def create_table_conns(parameters,DEL): 
                        with tag('src-protocol','xmlns:oc-pol-types="http://openconfig.net/yang/policy-types"'):   text('oc-pol-types:',parameters['src_protocol'])

                        with tag('dst-protocol','xmlns:oc-pol-types="http://openconfig.net/yang/policy-types"'):   text('oc-pol-types:',parameters['dst_protocol'])

                        with tag('address-family', 'xmlns:oc-types="http://openconfig.net/yang/openconfig-types"'):text('oc-types:',parameters['address_family'])    

                        # for OCNOS: check if needed

                        #with tag('dst-instance', 'xmlns="http://www.ipinfusion.com/yang/ocnos/ipi-oc-ni-augments"'):text('65000')

                        if len(parameters['default_import_policy']) != 0:

                            with tag('default-import-policy'):text(parameters['default_import_policy'])

    result = indent(