Commit 069da855 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/340-cttc-fix-ci-cd-pipeline-jobs-after-multiple-merges' into 'develop' 

Resolve "(CTTC) Fix CI/CD pipeline jobs after multiple merges"

See merge request !399
parents 905a4092 fa40493e

src/bgpls_speaker/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ RUN python3 -m pip install --upgrade pip 
RUN python3 -m pip install --upgrade setuptools wheel

RUN python3 -m pip install --upgrade pip-tools



# Install OpenJDK-11

# Install OpenJDK-21

RUN apt-get update && \

    apt-get install -y openjdk-17-jre && \

    apt-get install -y openjdk-21-jre && \

    apt-get clean;



# Get common Python packages

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

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

# limitations under the License.

from ast import List, Tuple

import json, logging, lxml.etree as ET, re

import time

from typing import Any, Dict, Optional

from jinja2 import Environment, PackageLoader, select_autoescape

import paramiko

from .Tools import generate_templates

from device.service.driver_api._Driver import (

    RESOURCE_ENDPOINTS, RESOURCE_INTERFACES, RESOURCE_NETWORK_INSTANCES, RESOURCE_ROUTING_POLICIES, RESOURCE_ACL, RESOURCE_INVENTORY)

from .EndPoints import parse as parse_endpoints

from .Interfaces import parse as parse_interfaces, parse_counters

from .NetworkInstances import parse as parse_network_instances

from .RoutingPolicy import parse as parse_routing_policy

from .Acl import parse as parse_acl

from .Inventory import parse as parse_inventory

from .acl.acl_adapter import acl_cr_to_dict

from .acl.acl_adapter_ipinfusion_proprietary import acl_cr_to_dict_ipinfusion_proprietary



LOGGER = logging.getLogger(__name__)



ALL_RESOURCE_KEYS = [

    RESOURCE_INVENTORY,

    RESOURCE_ENDPOINTS,

    RESOURCE_INTERFACES,

    RESOURCE_ROUTING_POLICIES,      # routing policies should come before network instances

    RESOURCE_NETWORK_INSTANCES,

    RESOURCE_ACL,

]



RESOURCE_KEY_MAPPINGS = {

    RESOURCE_INVENTORY        : 'inventory',

    RESOURCE_ENDPOINTS        : 'component',

    RESOURCE_INTERFACES       : 'interface',

    RESOURCE_NETWORK_INSTANCES: 'network_instance',

    RESOURCE_ROUTING_POLICIES : 'routing_policy',

    RESOURCE_ACL              : 'acl',

}



RESOURCE_PARSERS = {

    'inventory'       : parse_inventory,

    'component'       : parse_endpoints,

    'interface'       : parse_interfaces,

    'network_instance': parse_network_instances,

    'routing_policy'  : parse_routing_policy,

    'interfaces/interface/state/counters': parse_counters,

    'acl'             : parse_acl,

}



LOGGER = logging.getLogger(__name__)

RE_REMOVE_FILTERS = re.compile(r'\[[^\]]+\]')

RE_REMOVE_FILTERS_2 = re.compile(r'\/[a-z]+:')

EMPTY_CONFIG = '<config></config>'

EMPTY_FILTER = '<filter></filter>'

JINJA_ENV = Environment(loader=PackageLoader('device.service.drivers.openconfig'), autoescape=select_autoescape())



def get_filter(resource_key : str):

    resource_key = RESOURCE_KEY_MAPPINGS.get(resource_key, resource_key)

    resource_key = RE_REMOVE_FILTERS.sub('', resource_key)

    resource_key = RE_REMOVE_FILTERS_2.sub('/', resource_key)

    resource_key = resource_key.replace('//', '')

    template_name = '{:s}/get.xml'.format(resource_key)

    template = JINJA_ENV.get_template(template_name)

    return '<filter>{:s}</filter>'.format(template.render().strip())



def parse(resource_key : str, xml_data : ET.Element):

    resource_key = RESOURCE_KEY_MAPPINGS.get(resource_key, resource_key)

    resource_key = RE_REMOVE_FILTERS.sub('', resource_key)

    resource_key = RE_REMOVE_FILTERS_2.sub('/', resource_key)

    resource_key = resource_key.replace('//', '')

    parser = RESOURCE_PARSERS.get(resource_key)

    if parser is None: return [(resource_key, xml_data)]

    return parser(xml_data)



"""

# Method Name: compose_config

  

# Parameters:

  - resource_key:    [str]  Variable to identify the rule to be executed.

  - resource_value:  [str]  Variable with the configuration parameters of the rule to be executed.

  - delete:          [bool] Variable to identify whether to create or delete the rule.

  - vendor:          [str]  Variable to identify the vendor of the equipment to be configured.

  - message_renderer [str]  Variable to dientify template generation method. Can be "jinja" or "pyangbind".

  

# Functionality:

  This method calls the function obtains the equipment configuration template according to the value of the variable "message_renderer".

  Depending on the value of this variable, it gets the template with "jinja" or "pyangbind". 

  

# Return:

  [dict] Set of templates obtained according to the configuration method

"""



def compose_config( # template generation

    resource_key : str, resource_value : str, delete : bool = False, vendor : Optional[str] = None, message_renderer = str

) -> str:



    if (message_renderer == "pyangbind"):

        templates = (generate_templates(resource_key, resource_value, delete,vendor))

        return [

            '<config>{:s}</config>'.format(template) # format correction

            for template in templates

            ]



    elif (message_renderer == "jinja"):

        templates = []

        if "acl_ruleset" in resource_key:                                               # MANAGING ACLs

            if vendor == 'ipinfusion': # ipinfusion proprietary netconf receipe is used temporarily

                enable_ingress_filter_path = 'acl/interfaces/ingress/enable_ingress_filter.xml'

                acl_entry_path = 'acl/acl-set/acl-entry/edit_config_ipinfusion_proprietary.xml'

                acl_ingress_path = 'acl/interfaces/ingress/edit_config_ipinfusion_proprietary.xml'

                data : Dict[str, Any] = acl_cr_to_dict_ipinfusion_proprietary(resource_value, delete=delete)

            else:

                enable_ingress_filter_path = 'acl/interfaces/ingress/enable_ingress_filter.xml'

                acl_entry_path = 'acl/acl-set/acl-entry/edit_config.xml'

                acl_ingress_path = 'acl/interfaces/ingress/edit_config.xml'

                data : Dict[str, Any] = acl_cr_to_dict(resource_value, delete=delete)



            if delete: # unpair acl and interface before removing acl

                templates.append(JINJA_ENV.get_template(acl_ingress_path))

                templates.append(JINJA_ENV.get_template(acl_entry_path))

                templates.append(JINJA_ENV.get_template(enable_ingress_filter_path))

            else:

                templates.append(JINJA_ENV.get_template(enable_ingress_filter_path))

                templates.append(JINJA_ENV.get_template(acl_entry_path))

                templates.append(JINJA_ENV.get_template(acl_ingress_path))

        else:

            template_name = '{:s}/edit_config.xml'.format(RE_REMOVE_FILTERS.sub('', resource_key))

            templates.append(JINJA_ENV.get_template(template_name))

            data : Dict[str, Any] = json.loads(resource_value)



        operation = 'delete' if delete else 'merge' # others

        #operation = 'delete' if delete else '' # ipinfusion?



        return [

            '<config>{:s}</config>'.format(

            template.render(**data, operation=operation, vendor=vendor).strip())

            for template in templates

            ]

        

    else:

        raise ValueError('Invalid message_renderer value: {}'.format(message_renderer)) 



"""

# Method Name: cli_compose_config

  

# Parameters:

  - resource_key:    [str]  Variable to identify the rule to be executed.

  - resource_value:  [str]  Variable with the configuration parameters of the rule to be executed.

  - delete:          [bool] Variable to identify whether to create or delete the rule.

  - vendor:          [str]  Variable to identify the vendor of the equipment to be configured.

  - message_renderer [str]  Variable to dientify template generation method. Can be "jinja" or "pyangbind".

  

# Functionality:

  This method calls the function obtains the equipment configuration template according to the value of the variable "message_renderer".

  Depending on the value of this variable, it gets the template with "jinja" or "pyangbind". 

  

# Return:

  [dict] Set of templates obtained according to the configuration method

"""



def cli_compose_config(resources, delete: bool, host: str, user: str, passw: str):     #Method used for configuring via CLI directly L2VPN in CISCO devices

      

    key_value_data = {}



    for path, json_str in resources:

        key_value_data[path] = json_str



    # Iterate through the resources and extract parameter values dynamically

    for path, json_str in resources:

        data = json.loads(json_str)

        if 'VC_ID' in data:            vc_id = data['VC_ID']

        if 'connection_point' in data: connection_point = data['connection_point']

        if 'remote_system' in data:    remote_system = data['remote_system']

        if 'interface' in data:

            interface = data['interface']

            interface = interface.split("-")                       #New Line To Avoid Bad Endpoint Name In CISCO

            interface = interface[1]

        if 'vlan_id' in data:          vlan_id = data['vlan_id']

        if 'name' in data:             ni_name = data['name']

        if 'type' in data:             ni_type = data['type']

        if 'index' in data:            subif_index = data['index']

        if 'description' in data:      description = data['description']

        else:                          description = " "

      

    # initialize the SSH client

    ssh_client = paramiko.SSHClient()

    ssh_client.load_system_host_keys()

    # add to known hosts

    ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())

        

    try:

        ssh_client.connect(hostname=host, username=user, password=passw, look_for_keys=False)

        #print("Connection successful")

        LOGGER.warning("Connection successful")

    except:

        #print("[!] Cannot connect to the SSH Server")

        LOGGER.warning("[!] Cannot connect to the SSH Server")

        exit()

        

    try:

        # Open an SSH shell

        channel = ssh_client.invoke_shell()

        channel.send('enable\n')

        time.sleep(1)

        channel.send('conf term\n')

        time.sleep(0.1)

        channel.send(f"interface {interface} l2transport\n")

        time.sleep(0.1)

        channel.send('description l2vpn_vpws_example\n')

        time.sleep(0.1)

        channel.send(f"encapsulation dot1q {vlan_id}\n")

        time.sleep(0.1)

        channel.send('mtu 9088\n')

        time.sleep(0.1)

        channel.send('commit\n')

        time.sleep(0.1)

        

        channel.send('l2vpn\n')

        time.sleep(0.1)

        channel.send('load-balancing flow src-dst-ip\n')

        time.sleep(0.1)

        channel.send('pw-class l2vpn_vpws_profile_example\n')

        time.sleep(0.1)

        channel.send('encapsulation mpls\n')

        time.sleep(0.1)

        channel.send('transport-mode vlan passthrough\n')

        time.sleep(0.1)

        channel.send('control-word\n')

        time.sleep(0.1)

        channel.send('exit\n')

        time.sleep(0.1)

        channel.send('l2vpn\n')

        time.sleep(0.1)

        channel.send('xconnect group l2vpn_vpws_group_example\n')

        time.sleep(0.1)

        channel.send(f"p2p {ni_name}\n")

        time.sleep(0.1)

        channel.send(f"interface {interface}\n")                                #Ignore the VlanID because the interface already includes the vlanid tag

        time.sleep(0.1)

        channel.send(f"neighbor ipv4 {remote_system} pw-id {vc_id}\n")

        time.sleep(0.1)

        channel.send('pw-class l2vpn_vpws_profile_example\n')

        time.sleep(0.1)

        channel.send('exit\n')

        time.sleep(0.1)

        channel.send(f"description {description}\n")

        time.sleep(0.1)

        channel.send('commit\n')

        time.sleep(0.1) 

        # Capturar la salida del comando

        output = channel.recv(65535).decode('utf-8')

        #print(output)

        LOGGER.warning(output)

        # Close the SSH shell

        channel.close()



    except Exception as e:

        LOGGER.exception(f"Error with the CLI configuration: {e}")



    # Close the SSH client

    ssh_client.close()

    

def ufi_interface(resources, delete: bool):     #Method used for configuring via CLI directly L2VPN in CISCO devices



    key_value_data = {}



    for path, json_str in resources:

        key_value_data[path] = json_str



    # initialize the SSH client

    ssh_client = paramiko.SSHClient()

    ssh_client.load_system_host_keys()

    # add to known hosts

    ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())



    try:

        ssh_client.connect(hostname='10.95.90.75', username='dnroot', password='dnroot', look_for_keys=False)

        LOGGER.warning("Connection successful")

    except:

        LOGGER.warning("[!] Cannot connect to the SSH Server")

        exit()

    interface = 'ge100-0/0/3/1'  

    ip = '1.1.1.1'

    mask = '24'

    vlan = '1212'

    try:

        # Open an SSH shell

        channel = ssh_client.invoke_shell()

        time.sleep(5)

        channel.send('config\n')

        time.sleep(1)

        channel.send(f'interfaces {interface} \n')

        time.sleep(1)

        channel.send('admin-state enabled \n')

        time.sleep(1)

        channel.send(f'ipv4-address {ip}/{mask} \n')

        time.sleep(1)

        channel.send(f'vlan-id {vlan} \n')

        time.sleep(1)

        channel.send('commit\n')

        time.sleep(1)



        output = channel.recv(65535).decode('utf-8')

        LOGGER.warning(output)

        # Close the SSH shell

        channel.close()



    except Exception as e:

        LOGGER.exception(f"Error with the CLI configuration: {e}")



    # Close the SSH client

    ssh_client.close()



def cisco_interface(resources, delete: bool, host: str, user: str, passw: str):     #Method used for configuring via CLI directly L2VPN in CISCO devices



    key_value_data = {}



    for path, json_str in resources:

        key_value_data[path] = json_str



    # initialize the SSH client

    ssh_client = paramiko.SSHClient()

    ssh_client.load_system_host_keys()

    # add to known hosts

    ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy())



    try:

        ssh_client.connect(hostname='10.90.95.150', username='cisco', password='cisco123', look_for_keys=False)

        LOGGER.warning("Connection successful")

    except:

        LOGGER.warning("[!] Cannot connect to the SSH Server")

        exit()

    interface = 'FourHundredGigE0/0/0/10.1212'  

    ip = '1.1.1.1'

    mask = '24'

    vlan = '1212'

    try:

        # Open an SSH shell

        channel = ssh_client.invoke_shell()

        time.sleep(1)

        channel.send('config\n')

        time.sleep(0.1)

        channel.send(f'interface {interface} \n')

        time.sleep(0.1)

        channel.send('no shutdown\n')

        time.sleep(0.1)

        channel.send(f'ipv4 address {ip}/{mask} \n')

        time.sleep(0.1)

        channel.send(f'encapsulation dot1q {vlan} \n')

        time.sleep(0.1)

        channel.send('commit\n')

        time.sleep(0.1)



        output = channel.recv(65535).decode('utf-8')

        LOGGER.warning(output)

        # Close the SSH shell

        channel.close()



    except Exception as e:

        LOGGER.exception(f"Error with the CLI configuration: {e}")



    # Close the SSH client

    ssh_client.close()

src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java

+32 −4
Original line number Diff line number Diff line
@@ -1160,12 +1160,26 @@ public class Serializer { 


    public ContextOuterClass.ServiceTypeEnum serialize(ServiceTypeEnum serviceTypeEnum) {

        switch (serviceTypeEnum) {

            case L2NM:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_L2NM;

            case L3NM:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_L3NM;

            case L2NM:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_L2NM;

            case TAPI_CONNECTIVITY_SERVICE:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_TAPI_CONNECTIVITY_SERVICE;

            case TE:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_TE;

            case E2E:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_E2E;

            case OPTICAL_CONNECTIVITY:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY;

            case QKD:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_QKD;

            case L1NM:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_L1NM;

            case INT:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_INT;

            case ACL:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_ACL;

            case IP_LINK:

                return ContextOuterClass.ServiceTypeEnum.SERVICETYPE_IP_LINK;

            case UNKNOWN:
@@ -1177,12 +1191,26 @@ public class Serializer { 


    public ServiceTypeEnum deserialize(ContextOuterClass.ServiceTypeEnum serializedServiceTypeEnum) {

        switch (serializedServiceTypeEnum) {

            case SERVICETYPE_L2NM:

                return ServiceTypeEnum.L2NM;

            case SERVICETYPE_L3NM:

                return ServiceTypeEnum.L3NM;

            case SERVICETYPE_L2NM:

                return ServiceTypeEnum.L2NM;

            case SERVICETYPE_TAPI_CONNECTIVITY_SERVICE:

                return ServiceTypeEnum.TAPI_CONNECTIVITY_SERVICE;

            case SERVICETYPE_TE:

                return ServiceTypeEnum.TE;

            case SERVICETYPE_E2E:

                return ServiceTypeEnum.E2E;

            case SERVICETYPE_OPTICAL_CONNECTIVITY:

                return ServiceTypeEnum.OPTICAL_CONNECTIVITY;

            case SERVICETYPE_QKD:

                return ServiceTypeEnum.QKD;

            case SERVICETYPE_L1NM:

                return ServiceTypeEnum.L1NM;

            case SERVICETYPE_INT:

                return ServiceTypeEnum.INT;

            case SERVICETYPE_ACL:

                return ServiceTypeEnum.ACL;

            case SERVICETYPE_IP_LINK:

                return ServiceTypeEnum.IP_LINK;

            case SERVICETYPE_UNKNOWN:

src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceTypeEnum.java

+9 −1
Original line number Diff line number Diff line
@@ -20,5 +20,13 @@ public enum ServiceTypeEnum { 
    UNKNOWN,

    L3NM,

    L2NM,

    TAPI_CONNECTIVITY_SERVICE

    TAPI_CONNECTIVITY_SERVICE,

    TE,

    E2E,

    OPTICAL_CONNECTIVITY,

    QKD,

    L1NM,

    INT,

    ACL,

    IP_LINK

}

src/policy/src/main/proto/ip_link.proto

0 → 120000
+1 −0
Original line number Diff line number Diff line 
../../../../../proto/ip_link.proto
 
 No newline at end of file