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

Pre-merge code cleanup and addition of headers

parent 41146366

src/service/service/service_handlers/l2nm_emulated/ConfigRules.py

+1 −13
Original line number Diff line number Diff line
@@ -27,12 +27,6 @@ def setup_config_rules( 
    json_settings          : Dict = service_settings.value

    json_endpoint_settings : Dict = endpoint_settings.value



    if service_settings  is None: return []

    if endpoint_settings is None: return []



    json_settings          : Dict = service_settings.value

    json_endpoint_settings : Dict = endpoint_settings.value



    #mtu                 = json_settings.get('mtu',                 1450 )    # 1512

    #address_families    = json_settings.get('address_families',    []   )    # ['IPV4']

    #bgp_as              = json_settings.get('bgp_as',              0    )    # 65000
@@ -72,7 +66,7 @@ def setup_config_rules( 
            {'name': network_instance_name, 'type': 'L2VSI'}),



        json_config_rule_set(

            '/interface[{:s}]/subinterface[{:s}]'.format(if_cirid_name, sub_interface_index),

            '/interface[{:s}]/subinterface[{:d}]'.format(if_cirid_name, sub_interface_index),

            {'name': if_cirid_name, 'type': 'l2vlan', 'index': sub_interface_index, 'vlan_id': vlan_id}),



        json_config_rule_set(
@@ -95,12 +89,6 @@ def teardown_config_rules( 
    if service_settings  is None: return []

    if endpoint_settings is None: return []



    json_settings          : Dict = service_settings.value

    json_endpoint_settings : Dict = endpoint_settings.value



    if service_settings  is None: return []

    if endpoint_settings is None: return []



    #json_settings          : Dict = service_settings.value

    json_endpoint_settings : Dict = endpoint_settings.value

src/service/service/service_handlers/l2nm_openconfig/ConfigRules.py

+3 −6
Original line number Diff line number Diff line
@@ -24,12 +24,9 @@ def setup_config_rules( 
    if service_settings  is None: return []

    if endpoint_settings is None: return []



    #json_settings          : Dict = service_settings.value

    json_settings          : Dict = service_settings.value

    json_endpoint_settings : Dict = endpoint_settings.value



    json_settings          : Dict = {} if service_settings  is None else service_settings.value

    json_endpoint_settings : Dict = {} if endpoint_settings is None else endpoint_settings.value



    mtu                     = json_settings.get('mtu',                 1450 )    # 1512

    #address_families       = json_settings.get('address_families',    []   )    # ['IPV4']

    #bgp_as                 = json_settings.get('bgp_as',              0    )    # 65000
@@ -61,7 +58,7 @@ def setup_config_rules( 
            {'name': network_instance_name, 'type': 'L2VSI'}),



        json_config_rule_set(

            '/interface[{:s}]/subinterface[{:s}]'.format(if_cirid_name, sub_interface_index),

            '/interface[{:s}]/subinterface[{:d}]'.format(if_cirid_name, sub_interface_index),

            {'name': if_cirid_name, 'type': 'l2vlan', 'index': sub_interface_index, 'vlan_id': vlan_id}),



        json_config_rule_set(
@@ -125,7 +122,7 @@ def teardown_config_rules( 
            {'name': network_instance_name}),



        json_config_rule_delete(

            '/interface[{:s}]/subinterface[{:s}]'.format(if_cirid_name, sub_interface_index),

            '/interface[{:s}]/subinterface[{:d}]'.format(if_cirid_name, sub_interface_index),

            {'name': if_cirid_name, 'index': sub_interface_index}),



    ]

src/service/service/service_handlers/l3nm_emulated/ConfigRules.py

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ def setup_config_rules( 
                'name': endpoint_name, 'description': network_interface_desc, 'mtu': mtu,

        }),

        json_config_rule_set(

            '/interface[{:s}]/subinterface[{:s}]'.format(endpoint_name, sub_interface_index), {

            '/interface[{:s}]/subinterface[{:d}]'.format(endpoint_name, sub_interface_index), {

                'name': endpoint_name, 'index': sub_interface_index,

                'description': network_subinterface_desc, 'vlan_id': vlan_id,

                'address_ip': address_ip, 'address_prefix': address_prefix,
@@ -175,7 +175,7 @@ def teardown_config_rules( 
                'name': network_instance_name, 'id': if_subif_name,

        }),

        json_config_rule_delete(

            '/interface[{:s}]/subinterface[{:s}]'.format(endpoint_name, sub_interface_index), {

            '/interface[{:s}]/subinterface[{:d}]'.format(endpoint_name, sub_interface_index), {

                'name': endpoint_name, 'index': sub_interface_index,

        }),

        json_config_rule_delete(

src/service/service/service_handlers/l3nm_openconfig/ConfigRules.py

+1 −5
Original line number Diff line number Diff line
@@ -29,16 +29,12 @@ def setup_config_rules( 
    json_settings          : Dict = service_settings.value

    json_endpoint_settings : Dict = endpoint_settings.value



    json_settings          : Dict = {} if service_settings  is None else service_settings.value

    json_endpoint_settings : Dict = {} if endpoint_settings is None else endpoint_settings.value



    mtu                       = json_settings.get('mtu',                          1450     )  # 1512

    #address_families         = json_settings.get('address_families',             []       )  # ['IPV4']

    bgp_as                    = json_settings.get('bgp_as',                       65000    )  # 65000



    router_id                 = json_endpoint_settings.get('router_id',           '0.0.0.0')  # '10.95.0.10'

    route_distinguisher       = json_settings.get('route_distinguisher',          '65000:101'    )  # '60001:801'

    LOGGER.warning('RD value={:s}'.format(str(route_distinguisher)))     

    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'
@@ -105,7 +101,7 @@ def setup_config_rules( 


        #Create interface with subinterface

        json_config_rule_set(

            '/interface[{:s}]/subinterface[{:s}]'.format(if_subif_name, sub_interface_index), {

            '/interface[{:s}]/subinterface[{:d}]'.format(if_subif_name, sub_interface_index), {

                'name'          : if_subif_name,

                'type'          :'l3ipvlan',

                'mtu'           : mtu,