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

Device component: 

- added timestamp to log lines

OpenConfig Driver:
- first implementation of L2-VPN configuration (under review and testing)
parent 651e2ce8

src/device/service/__main__.py

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ def main(): 
    global LOGGER # pylint: disable=global-statement



    log_level = get_log_level()

    logging.basicConfig(level=log_level)

    logging.basicConfig(level=log_level, format="[%(asctime)s] %(levelname)s:%(name)s:%(message)s")

    logging.getLogger('apscheduler.executors.default').setLevel(logging.WARNING)

    logging.getLogger('apscheduler.scheduler').setLevel(logging.WARNING)

    logging.getLogger('monitoring-client').setLevel(logging.WARNING)

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

+8 −1
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
        #interface_type = xml_interface.find('oci:config/oci:type', namespaces=NAMESPACES)

        #add_value_from_tag(interface, 'type', interface_type)



        interface_type = xml_interface.find('oci:config/oci:type', namespaces=NAMESPACES)

        interface_type.text = interface_type.text.replace('ianaift:','')

        add_value_from_tag(interface, 'type', interface_type)



        interface_mtu = xml_interface.find('oci:config/oci:mtu', namespaces=NAMESPACES)

        add_value_from_tag(interface, 'mtu', interface_mtu, cast=int)
@@ -49,12 +53,15 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
            subinterface = {}



            add_value_from_tag(subinterface, 'name', interface_name)

            add_value_from_tag(subinterface, 'mtu', interface_mtu)

            add_value_from_tag(subinterface, 'type', interface_type)





            subinterface_index = xml_subinterface.find('oci:index', namespaces=NAMESPACES)

            if subinterface_index is None or subinterface_index.text is None: continue

            add_value_from_tag(subinterface, 'index', subinterface_index, cast=int)



            vlan_id = xml_subinterface.find('ocv:vlan/ocv:config/ocv:vlan-id', namespaces=NAMESPACES)

            vlan_id = xml_subinterface.find('ocv:vlan/ocv:match/ocv:single-tagged/ocv:config/ocv:vlan-id', namespaces=NAMESPACES)

            add_value_from_tag(subinterface, 'vlan_id', vlan_id, cast=int)



            # TODO: implement support for multiple IP addresses per subinterface

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

+23 −3
Original line number Diff line number Diff line
@@ -27,6 +27,9 @@ XPATH_NI_IIP_AP = ".//ocni:inter-instance-policies/ocni:apply-policy" 
XPATH_NI_IIP_AP_IMPORT  = ".//ocni:config/ocni:import-policy"

XPATH_NI_IIP_AP_EXPORT  = ".//ocni:config/ocni:export-policy"



XPATH_NI_CPOINTS          = ".//ocni:connection-points/ocni:connection-point"

XPATH_NI_CPOINTS_ENDPOINT = ".//ocni:endpoints/ocni:endpoint/ocni:remote/ocni:config"



def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]:

    response = []

    for xml_network_instance in xml_data.xpath(XPATH_NETWORK_INSTANCES, namespaces=NAMESPACES):
@@ -39,10 +42,11 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
        add_value_from_tag(network_instance, 'name', ni_name)



        ni_type = xml_network_instance.find('ocni:config/ocni:type', namespaces=NAMESPACES)

        ni_type.text = ni_type.text.replace('oc-ni-types:','')

        add_value_from_tag(network_instance, 'type', ni_type)



        #ni_router_id = xml_network_instance.find('ocni:config/ocni:router-id', namespaces=NAMESPACES)

        #add_value_from_tag(network_instance, 'router_id', ni_router_id)

        ni_router_id = xml_network_instance.find('ocni:config/ocni:router-id', namespaces=NAMESPACES)

        add_value_from_tag(network_instance, 'router_id', ni_router_id)



        ni_route_dist = xml_network_instance.find('ocni:config/ocni:route-distinguisher', namespaces=NAMESPACES)

        add_value_from_tag(network_instance, 'route_distinguisher', ni_route_dist)
@@ -53,6 +57,20 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
        if len(network_instance) == 0: continue

        response.append(('/network_instance[{:s}]'.format(network_instance['name']), network_instance))



        for xml_cpoints in xml_network_instance.xpath(XPATH_NI_PROTOCOLS, namespaces=NAMESPACES):

            cpoint = {}

            add_value_from_tag(cpoint, 'name', ni_name)



            connection_point = xml_cpoints.find('ocni:connection-point-id', namespaces=NAMESPACES)

            add_value_from_tag(cpoint, 'connection_point', connection_point)



            for xml_endpoint in xml_cpoints.xpath(XPATH_NI_CPOINTS_ENDPOINT, namespaces=NAMESPACES):

                remote_system = xml_endpoint.find('ocni:remote-system', namespaces=NAMESPACES)

                add_value_from_tag(cpoint, 'remote_system', remote_system)



                VC_ID = xml_endpoint.find('ocni:virtual-circuit-identifier', namespaces=NAMESPACES)

                add_value_from_tag(cpoint, 'VC_ID', VC_ID)



        for xml_protocol in xml_network_instance.xpath(XPATH_NI_PROTOCOLS, namespaces=NAMESPACES):

            #LOGGER.info('xml_protocol = {:s}'.format(str(ET.tostring(xml_protocol))))
@@ -71,6 +89,8 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
            if protocol['identifier'] == 'BGP':

                bgp_as = xml_protocol.find('ocni:bgp/ocni:global/ocni:config/ocni:as', namespaces=NAMESPACES)

                add_value_from_tag(protocol, 'as', bgp_as, cast=int)

                bgp_id = xml_protocol.find('ocni:bgp/ocni:global/ocni:config/ocni:router-id', namespaces=NAMESPACES)

                add_value_from_tag(protocol, 'router_id', bgp_id)



            resource_key = '/network_instance[{:s}]/protocols[{:s}]'.format(

                network_instance['name'], protocol['identifier'])
@@ -94,7 +114,7 @@ def parse(xml_data : ET.Element) -> List[Tuple[str, Dict[str, Any]]]: 
            add_value_from_tag(table_connection, 'address_family', address_family,

                               cast=lambda s: s.replace('oc-types:', ''))



            default_import_policy = xml_table_connection.find('ocni:default-import-policy', namespaces=NAMESPACES)

            default_import_policy = xml_table_connection.find('ocni:config/ocni:default-import-policy', namespaces=NAMESPACES)

            add_value_from_tag(table_connection, 'default_import_policy', default_import_policy)



            resource_key = '/network_instance[{:s}]/table_connections[{:s}][{:s}][{:s}]'.format(

src/device/service/drivers/openconfig/templates/interface/subinterface/edit_config.xml

+25 −19
Original line number Diff line number Diff line 
<interfaces xmlns="http://openconfig.net/yang/interfaces">

<interfaces xmlns="http://openconfig.net/yang/interfaces" 

            xmlns:oc-ip="http://openconfig.net/yang/interfaces/ip" >

    <interface>

        <name>{{name}}</name>

        {% if operation is not defined or operation != 'delete' %}

        <config>

            <name>{{name}}</name>

        <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:{{type}}</type>

      {% if mtu is defined %}<mtu>{{mtu}}</mtu>{% endif%}

      <enabled>true</enabled>

        </config>

        {% endif %}

        <subinterfaces>

            <subinterface{% if operation is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %}>

            <subinterface>

                <index>{{index}}</index>

                {% if operation is not defined or operation != 'delete' %}

                <config>

                    <index>{{index}}</index>

                    <enabled>true</enabled>

                    <description>{{description}}</description>

                </config>

                <vlan xmlns="http://openconfig.net/yang/vlan">

                    <match>

                        <single-tagged>

                            <config>

                                <vlan-id>{{vlan_id}}</vlan-id>

                            </config>

                        </single-tagged>

                    </match>

                </vlan>

                <ipv4 xmlns="http://openconfig.net/yang/interfaces/ip">

                    <addresses>

                        <address>

                            <ip>{{address_ip}}</ip>

                            <config>

                                <ip>{{address_ip}}</ip>

                                <prefix-length>{{address_prefix}}</prefix-length>

                            </config>

                        </address>

                    </addresses>

                </ipv4>

        {% if address_ip is defined %}

                <oc-ip:ipv4>

                    <oc-ip:addresses>

                        <oc-ip:address>

                            <oc-ip:ip>{{address_ip}}</oc-ip:ip>

                            <oc-ip:config>

                                <oc-ip:ip>{{address_ip}}</oc-ip:ip>

                                <oc-ip:prefix-length>{{address_prefix}}</oc-ip:prefix-length>

                            </oc-ip:config>

                        </oc-ip:address>

                    </oc-ip:addresses>

                </oc-ip:ipv4>

                {% endif %}

            </subinterface>

        </subinterfaces>

src/device/service/drivers/openconfig/templates/network_instance/connection_point/edit_config.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<network-instances xmlns="http://openconfig.net/yang/network-instance">

    <network-instance>

        <name>{{name}}</name>

        <connection-points>

            <connection-point>

                <connection-point-id>{{connection_point}}</connection-point-id>

                <config>

                    <connection-point-id>{{connection_point}}</connection-point-id>

                </config>

                <endpoints>

                    <endpoint>

                        <endpoint-id>{{connection_point}}</endpoint-id>

                        <config>

                            <endpoint-id>{{connection_point}}</endpoint-id>

                            <precedence>1</precedence>

                            <type xmlns:oc-ni-types="http://openconfig.net/yang/network-instance-types">oc-ni-types:REMOTE</type>

                        </config>

                        <remote>

                            <config>

                                <virtual-circuit-identifier>{{VC_ID}}</virtual-circuit-identifier>

                                <remote-system>{{remote_system}}</remote-system>

                            </config>

                        </remote>

                    </endpoint>

                </endpoints>

            </connection-point>

        </connection-points>

    </network-instance>

</network-instances>