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

Service:

- Added run-test-locally specific for device component.

L3NMEmulated/L3NMOpenConfig Service Handlers:
- Added routing policy configuration rules
- Corrected unitary tests incorporating missing configuration attributes.
parent b5002f42
Loading
Loading
Loading
Loading
+28 −0
Original line number Diff line number Diff line
#!/bin/bash
# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)
#
# 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

# Useful flags for pytest:
#-o log_cli=true -o log_file=service.log -o log_file_level=DEBUG

coverage run --rcfile=$RCFILE --append -m pytest --log-level=INFO --verbose \
    service/tests/test_unitary.py
+157 −16
Original line number Diff line number Diff line
@@ -66,12 +66,13 @@ class L3NMEmulatedServiceHandler(_ServiceHandler):
        network_interface_desc    = '{:s}-NetIf'.format(service_uuid)
        network_subinterface_desc = '{:s}-NetSubIf'.format(service_uuid)

        settings : TreeNode = get_subnode(self.__resolver, self.__config, 'settings', None)
        settings : TreeNode = get_subnode(self.__resolver, self.__config, '/settings', None)
        if settings is None: raise Exception('Unable to retrieve service settings')
        json_settings : Dict = settings.value
        route_distinguisher = json_settings.get('route_distinguisher', '0:0')    # '60001:801'
        mtu                 = json_settings.get('mtu',                 1450 )    # 1512
        address_families    = json_settings.get('address_families',    []   )    # ['IPV4']
        #address_families    = json_settings.get('address_families',    []   )    # ['IPV4']
        bgp_as              = json_settings.get('bgp_as',              0    )    # 65000
        bgp_route_target    = json_settings.get('bgp_route_target',    '0:0')    # 65000:333

        results = []
        for endpoint in endpoints:
@@ -83,14 +84,19 @@ class L3NMEmulatedServiceHandler(_ServiceHandler):
                else:
                    device_uuid, endpoint_uuid, _ = endpoint # ignore topology_uuid by now

                endpoint_settings_uri = 'device[{:s}]/endpoint[{:s}]/settings'.format(device_uuid, endpoint_uuid)
                endpoint_settings_uri = '/device[{:s}]/endpoint[{:s}]/settings'.format(device_uuid, endpoint_uuid)
                endpoint_settings : TreeNode = get_subnode(self.__resolver, self.__config, endpoint_settings_uri, None)
                if endpoint_settings is None:
                    raise Exception('Unable to retrieve service settings for endpoint({:s})'.format(
                        str(endpoint_settings_uri)))
                json_endpoint_settings : Dict = endpoint_settings.value
                router_id           = json_endpoint_settings.get('router_id',           '0.0.0.0')  # '10.95.0.10'
                #router_id           = json_endpoint_settings.get('router_id',           '0.0.0.0')  # '10.95.0.10'
                route_distinguisher = json_endpoint_settings.get('route_distinguisher', '0:0'    )  # '60001:801'
                sub_interface_index = json_endpoint_settings.get('sub_interface_index', 0        )  # 1
                vlan_id             = json_endpoint_settings.get('vlan_id',             1        )  # 400
                address_ip          = json_endpoint_settings.get('address_ip',          '0.0.0.0')  # '2.2.2.1'
                address_prefix      = json_endpoint_settings.get('address_prefix',      24       )  # 30
                if_subif_name       = '{:s}.{:d}'.format(endpoint_uuid, vlan_id)

                db_device : DeviceModel = get_object(self.__database, DeviceModel, device_uuid, raise_if_not_found=True)
                json_device = db_device.dump(include_config_rules=False, include_drivers=True, include_endpoints=True)
@@ -100,8 +106,8 @@ class L3NMEmulatedServiceHandler(_ServiceHandler):
                    config_rule_set(
                        '/network_instance[{:s}]'.format(network_instance_name), {
                            'name': network_instance_name, 'description': network_interface_desc, 'type': 'L3VRF',
                            'router_id': router_id, 'route_distinguisher': route_distinguisher,
                            'address_families': address_families,
                            'route_distinguisher': route_distinguisher,
                            #'router_id': router_id, 'address_families': address_families,
                    }),
                    config_rule_set(
                        '/interface[{:s}]'.format(endpoint_uuid), {
@@ -110,15 +116,82 @@ class L3NMEmulatedServiceHandler(_ServiceHandler):
                    config_rule_set(
                        '/interface[{:s}]/subinterface[{:d}]'.format(endpoint_uuid, sub_interface_index), {
                            'name': endpoint_uuid, 'index': sub_interface_index,
                            'description': network_subinterface_desc, 'mtu': mtu,
                            'description': network_subinterface_desc, 'vlan_id': vlan_id,
                            'address_ip': address_ip, 'address_prefix': address_prefix,
                    }),
                    config_rule_set(
                        '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, endpoint_uuid), {
                            'name': network_instance_name, 'id': endpoint_uuid,
                        '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, if_subif_name), {
                            'name': network_instance_name, 'id': if_subif_name, 'interface': endpoint_uuid,
                            'subinterface': sub_interface_index,
                    }),
                    config_rule_set(
                        '/network_instance[{:s}]/table_connections'.format(network_instance_name), {
                            'name': network_instance_name,
                        '/network_instance[{:s}]/protocols[BGP]'.format(network_instance_name), {
                            'name': network_instance_name, 'identifier': 'BGP', 'protocol_name': 'BGP', 'as': bgp_as,
                    }),
                    config_rule_set(
                        '/network_instance[{:s}]/table_connections[STATIC][BGP][IPV4]'.format(network_instance_name), {
                            'name': network_instance_name, 'src_protocol': 'STATIC', 'dst_protocol': 'BGP',
                            'address_family': 'IPV4', #'default_import_policy': 'REJECT_ROUTE',
                    }),
                    config_rule_set(
                        '/network_instance[{:s}]/table_connections[DIRECTLY_CONNECTED][BGP][IPV4]'.format(
                            network_instance_name), {
                            'name': network_instance_name, 'src_protocol': 'DIRECTLY_CONNECTED', 'dst_protocol': 'BGP',
                            'address_family': 'IPV4', #'default_import_policy': 'REJECT_ROUTE',
                    }),
                    config_rule_set(
                        '/routing_policy/bgp_defined_set[{:s}_rt_import]'.format(network_instance_name), {
                            'ext_community_set_name': '{:s}_rt_import'.format(network_instance_name),
                    }),
                    config_rule_set(
                        '/routing_policy/bgp_defined_set[{:s}_rt_import][route-target:{:s}]'.format(
                            network_instance_name, bgp_route_target), {
                            'ext_community_set_name': '{:s}_rt_import'.format(network_instance_name),
                            'ext_community_member'  : 'route-target:{:s}'.format(bgp_route_target),
                    }),
                    config_rule_set(
                        '/routing_policy/policy_definition[{:s}_import]'.format(network_instance_name), {
                            'policy_name': '{:s}_import'.format(network_instance_name),
                    }),
                    config_rule_set(
                        '/routing_policy/policy_definition[{:s}_import]/statement[{:s}]'.format(
                            network_instance_name, '3'), {
                            'policy_name': '{:s}_import'.format(network_instance_name), 'statement_name': '3',
                            'ext_community_set_name': '{:s}_rt_import'.format(network_instance_name),
                            'match_set_options': 'ANY', 'policy_result': 'ACCEPT_ROUTE',
                    }),
                    config_rule_set(
                        # pylint: disable=duplicate-string-formatting-argument
                        '/network_instance[{:s}]/inter_instance_policies[{:s}_import]'.format(
                            network_instance_name, network_instance_name), {
                            'name': network_instance_name, 'import_policy': '{:s}_import'.format(network_instance_name),
                    }),
                    config_rule_set(
                        '/routing_policy/bgp_defined_set[{:s}_rt_export]'.format(network_instance_name), {
                            'ext_community_set_name': '{:s}_rt_export'.format(network_instance_name),
                    }),
                    config_rule_set(
                        '/routing_policy/bgp_defined_set[{:s}_rt_export][route-target:{:s}]'.format(
                            network_instance_name, bgp_route_target), {
                            'ext_community_set_name': '{:s}_rt_export'.format(network_instance_name),
                            'ext_community_member'  : 'route-target:{:s}'.format(bgp_route_target),
                    }),
                    config_rule_set(
                        '/routing_policy/policy_definition[{:s}_export]'.format(network_instance_name), {
                            'policy_name': '{:s}_export'.format(network_instance_name),
                    }),
                    config_rule_set(
                        '/routing_policy/policy_definition[{:s}_export]/statement[{:s}]'.format(
                            network_instance_name, '3'), {
                            'policy_name': '{:s}_export'.format(network_instance_name), 'statement_name': '3',
                            'ext_community_set_name': '{:s}_rt_export'.format(network_instance_name),
                            'match_set_options': 'ANY', 'policy_result': 'ACCEPT_ROUTE',
                    }),
                    config_rule_set(
                        # pylint: disable=duplicate-string-formatting-argument
                        '/network_instance[{:s}]/inter_instance_policies[{:s}_export]'.format(
                            network_instance_name, network_instance_name), {
                            'name': network_instance_name, 'export_policy': '{:s}_export'.format(network_instance_name),
                    }),
                ])
                self.__device_client.ConfigureDevice(Device(**json_device))
@@ -137,6 +210,11 @@ class L3NMEmulatedServiceHandler(_ServiceHandler):
        service_short_uuid        = service_uuid.split('-')[-1]
        network_instance_name     = '{:s}-NetInst'.format(service_short_uuid)

        settings : TreeNode = get_subnode(self.__resolver, self.__config, '/settings', None)
        if settings is None: raise Exception('Unable to retrieve service settings')
        json_settings : Dict = settings.value
        bgp_route_target    = json_settings.get('bgp_route_target',    '0:0')    # 65000:333

        results = []
        for endpoint in endpoints:
            try:
@@ -147,13 +225,15 @@ class L3NMEmulatedServiceHandler(_ServiceHandler):
                else:
                    device_uuid, endpoint_uuid, _ = endpoint # ignore topology_uuid by now

                endpoint_settings_uri = 'device[{:s}]/endpoint[{:s}]/settings'.format(device_uuid, endpoint_uuid)
                endpoint_settings_uri = '/device[{:s}]/endpoint[{:s}]/settings'.format(device_uuid, endpoint_uuid)
                endpoint_settings : TreeNode = get_subnode(self.__resolver, self.__config, endpoint_settings_uri, None)
                if endpoint_settings is None:
                    raise Exception('Unable to retrieve service settings for endpoint({:s})'.format(
                        str(endpoint_settings_uri)))
                json_endpoint_settings : Dict = endpoint_settings.value
                sub_interface_index = json_endpoint_settings.get('sub_interface_index', 0        )  # 1
                vlan_id             = json_endpoint_settings.get('vlan_id',             1        )  # 400
                if_subif_name       = '{:s}.{:d}'.format(endpoint_uuid, vlan_id)

                db_device : DeviceModel = get_object(self.__database, DeviceModel, device_uuid, raise_if_not_found=True)
                json_device = db_device.dump(include_config_rules=False, include_drivers=True, include_endpoints=True)
@@ -161,8 +241,8 @@ class L3NMEmulatedServiceHandler(_ServiceHandler):
                json_device_config_rules : List = json_device_config.setdefault('config_rules', [])
                json_device_config_rules.extend([
                    config_rule_delete(
                        '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, endpoint_uuid), {
                            'name': network_instance_name, 'id': endpoint_uuid
                        '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, if_subif_name), {
                            'name': network_instance_name, 'id': if_subif_name,
                    }),
                    config_rule_delete(
                        '/interface[{:s}]/subinterface[{:d}]'.format(endpoint_uuid, sub_interface_index), {
@@ -173,9 +253,70 @@ class L3NMEmulatedServiceHandler(_ServiceHandler):
                            'name': endpoint_uuid,
                    }),
                    config_rule_delete(
                        '/network_instance[{:s}]/table_connections'.format(network_instance_name), {
                        '/network_instance[{:s}]/table_connections[DIRECTLY_CONNECTED][BGP][IPV4]'.format(
                            network_instance_name), {
                            'name': network_instance_name, 'src_protocol': 'DIRECTLY_CONNECTED', 'dst_protocol': 'BGP',
                            'address_family': 'IPV4',
                    }),
                    config_rule_delete(
                        '/network_instance[{:s}]/table_connections[STATIC][BGP][IPV4]'.format(network_instance_name), {
                            'name': network_instance_name, 'src_protocol': 'STATIC', 'dst_protocol': 'BGP',
                            'address_family': 'IPV4',
                    }),
                    config_rule_delete(
                        '/network_instance[{:s}]/protocols[BGP]'.format(network_instance_name), {
                            'name': network_instance_name, 'identifier': 'BGP', 'protocol_name': 'BGP',
                    }),
                    config_rule_delete(
                        # pylint: disable=duplicate-string-formatting-argument
                        '/network_instance[{:s}]/inter_instance_policies[{:s}_import]'.format(
                            network_instance_name, network_instance_name), {
                        'name': network_instance_name,
                    }),
                    config_rule_delete(
                        '/routing_policy/policy_definition[{:s}_import]/statement[{:s}]'.format(
                            network_instance_name, '3'), {
                            'policy_name': '{:s}_import'.format(network_instance_name), 'statement_name': '3',
                    }),
                    config_rule_delete(
                        '/routing_policy/policy_definition[{:s}_import]'.format(network_instance_name), {
                            'policy_name': '{:s}_import'.format(network_instance_name),
                    }),
                    config_rule_delete(
                        '/routing_policy/bgp_defined_set[{:s}_rt_import][route-target:{:s}]'.format(
                            network_instance_name, bgp_route_target), {
                            'ext_community_set_name': '{:s}_rt_import'.format(network_instance_name),
                            'ext_community_member'  : 'route-target:{:s}'.format(bgp_route_target),
                    }),
                    config_rule_delete(
                        '/routing_policy/bgp_defined_set[{:s}_rt_import]'.format(network_instance_name), {
                            'ext_community_set_name': '{:s}_rt_import'.format(network_instance_name),
                    }),
                    config_rule_delete(
                        # pylint: disable=duplicate-string-formatting-argument
                        '/network_instance[{:s}]/inter_instance_policies[{:s}_export]'.format(
                            network_instance_name, network_instance_name), {
                            'name': network_instance_name,
                    }),
                    config_rule_delete(
                        '/routing_policy/policy_definition[{:s}_export]/statement[{:s}]'.format(
                            network_instance_name, '3'), {
                            'policy_name': '{:s}_export'.format(network_instance_name), 'statement_name': '3',
                    }),
                    config_rule_delete(
                        '/routing_policy/policy_definition[{:s}_export]'.format(network_instance_name), {
                            'policy_name': '{:s}_export'.format(network_instance_name),
                    }),
                    config_rule_delete(
                        '/routing_policy/bgp_defined_set[{:s}_rt_export][route-target:{:s}]'.format(
                            network_instance_name, bgp_route_target), {
                            'ext_community_set_name': '{:s}_rt_export'.format(network_instance_name),
                            'ext_community_member'  : 'route-target:{:s}'.format(bgp_route_target),
                    }),
                    config_rule_delete(
                        '/routing_policy/bgp_defined_set[{:s}_rt_export]'.format(network_instance_name), {
                            'ext_community_set_name': '{:s}_rt_export'.format(network_instance_name),
                    }),
                    config_rule_delete(
                        '/network_instance[{:s}]'.format(network_instance_name), {
                            'name': network_instance_name
+144 −9

File changed.

Preview size limit exceeded, changes collapsed.

+8 −6
Original line number Diff line number Diff line
@@ -106,14 +106,16 @@ SERVICE_R1_R3_CONSTRAINTS = [
]
SERVICE_R1_R3_CONFIG_RULES = [
    json_config_rule_set(
        'settings',
        {'route_distinguisher': '60001:801', 'mtu': 1512, 'address_families': ['IPV4']}),
        '/settings',
        {'mtu': 1512, 'address_families': ['IPV4'], 'bgp_as': 65000, 'bgp_route_target': '65000:333'}),
    json_config_rule_set(
        'device[{:s}]/endpoint[{:s}]/settings'.format(DEVICE_R1_UUID, ENDPOINT_ID_R1_EP100['endpoint_uuid']['uuid']),
        {'router_id': '10.0.0.1', 'sub_interface_index': 1}),
        '/device[{:s}]/endpoint[{:s}]/settings'.format(DEVICE_R1_UUID, ENDPOINT_ID_R1_EP100['endpoint_uuid']['uuid']),
        {'router_id': '10.10.10.1', 'route_distinguisher': '65000:123', 'sub_interface_index': 400, 'vlan_id': 400,
        'address_ip': '3.3.2.1', 'address_prefix': 24}),
    json_config_rule_set(
        'device[{:s}]/endpoint[{:s}]/settings'.format(DEVICE_R3_UUID, ENDPOINT_ID_R3_EP100['endpoint_uuid']['uuid']),
        {'router_id': '10.0.0.3', 'sub_interface_index': 1}),
        '/device[{:s}]/endpoint[{:s}]/settings'.format(DEVICE_R3_UUID, ENDPOINT_ID_R3_EP100['endpoint_uuid']['uuid']),
        {'router_id': '20.20.20.1', 'route_distinguisher': '65000:321', 'sub_interface_index': 400, 'vlan_id': 500,
        'address_ip': '3.3.1.1', 'address_prefix': 24}),
]
SERVICE_R1_R3_ID           = json_service_id(SERVICE_R1_R3_UUID, context_id=CONTEXT_ID)
SERVICE_R1_R3_DESCRIPTOR   = json_service_l3nm_planned(SERVICE_R1_R3_UUID)
+10 −9
Original line number Diff line number Diff line
@@ -28,13 +28,13 @@ SERVICE_HANDLER_NAME = 'l3nm_openconfig'

def json_endpoint_ids(device_id : Dict, endpoint_descriptors : List[Tuple[str, str]]):
    return [
        json_endpoint_id(device_id, ep_uuid, topology_id=TOPOLOGY_ID)
        json_endpoint_id(device_id, ep_uuid)
        for ep_uuid, _ in endpoint_descriptors
    ]

def json_endpoints(device_id : Dict, endpoint_descriptors : List[Tuple[str, str]]):
    return [
        json_endpoint(device_id, ep_uuid, ep_type, topology_id=TOPOLOGY_ID, kpi_sample_types=PACKET_PORT_SAMPLE_TYPES)
        json_endpoint(device_id, ep_uuid, ep_type, kpi_sample_types=PACKET_PORT_SAMPLE_TYPES)
        for ep_uuid, ep_type in endpoint_descriptors
    ]

@@ -102,7 +102,6 @@ LINK_R1_O1_UUID = '{:s}/{:s}-{:s}/{:s}'.format(
LINK_R1_O1_ID   = json_link_id(LINK_R1_O1_UUID)
LINK_R1_O1      = json_link(LINK_R1_O1_UUID, [ENDPOINT_ID_R1_EP1, ENDPOINT_ID_O1_EP1])


LINK_R2_O1_UUID = '{:s}/{:s}-{:s}/{:s}'.format(
    DEVICE_R2_UUID, ENDPOINT_ID_R2_EP1['endpoint_uuid']['uuid'],
    DEVICE_O1_UUID, ENDPOINT_ID_O1_EP2['endpoint_uuid']['uuid'])
@@ -121,14 +120,16 @@ SERVICE_R1_R2_CONSTRAINTS = [
]
SERVICE_R1_R2_CONFIG_RULES = [
    json_config_rule_set(
        'settings',
        {'route_distinguisher': '60001:801', 'mtu': 1512, 'address_families': ['IPV4']}),
        '/settings',
        {'mtu': 1512, 'address_families': ['IPV4'], 'bgp_as': 65000, 'bgp_route_target': '65000:333'}),
    json_config_rule_set(
        'device[{:s}]/endpoint[{:s}]/settings'.format(DEVICE_R1_UUID, ENDPOINT_ID_R1_EP100['endpoint_uuid']['uuid']),
        {'router_id': '10.0.0.1', 'sub_interface_index': 1}),
        '/device[{:s}]/endpoint[{:s}]/settings'.format(DEVICE_R1_UUID, ENDPOINT_ID_R1_EP100['endpoint_uuid']['uuid']),
        {'router_id': '10.10.10.1', 'route_distinguisher': '65000:123', 'sub_interface_index': 400, 'vlan_id': 400,
        'address_ip': '3.3.2.1', 'address_prefix': 24}),
    json_config_rule_set(
        'device[{:s}]/endpoint[{:s}]/settings'.format(DEVICE_R2_UUID, ENDPOINT_ID_R2_EP100['endpoint_uuid']['uuid']),
        {'router_id': '10.0.0.3', 'sub_interface_index': 1}),
        '/device[{:s}]/endpoint[{:s}]/settings'.format(DEVICE_R2_UUID, ENDPOINT_ID_R2_EP100['endpoint_uuid']['uuid']),
        {'router_id': '20.20.20.1', 'route_distinguisher': '65000:321', 'sub_interface_index': 400, 'vlan_id': 500,
        'address_ip': '3.3.1.1', 'address_prefix': 24}),
]
SERVICE_R1_R2_ID           = json_service_id(SERVICE_R1_R2_UUID, context_id=CONTEXT_ID)
SERVICE_R1_R2_DESCRIPTOR   = json_service_l3nm_planned(SERVICE_R1_R2_UUID)