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

Service component: 

- Updated config rules for L2NM Emulated/OpenConfig Service Handlers
parent 5901b3e9

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

+32 −32
Original line number Original line Diff line number Diff line
@@ -32,7 +32,7 @@ def setup_config_rules( 
    #bgp_as              = json_settings.get('bgp_as',              0    )    # 65000

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

    #bgp_route_target    = json_settings.get('bgp_route_target',    '0:0')    # 65000:333

    #bgp_route_target    = json_settings.get('bgp_route_target',    '0:0')    # 65000:333





    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'

    #route_distinguisher = json_endpoint_settings.get('route_distinguisher', '0:0'    )  # '60001:801'

    sub_interface_index = json_endpoint_settings.get('sub_interface_index', 0        )  # 1

    sub_interface_index = json_endpoint_settings.get('sub_interface_index', 0        )  # 1

    vlan_id             = json_endpoint_settings.get('vlan_id',             1        )  # 400

    vlan_id             = json_endpoint_settings.get('vlan_id',             1        )  # 400
@@ -46,17 +46,17 @@ def setup_config_rules( 
    connection_point_id   = 'VC-1'

    connection_point_id   = 'VC-1'





    json_config_rules = [

    json_config_rules = [

        json_config_rule_set(

        #json_config_rule_set(

            '/network_instance[default]',

        #    '/network_instance[default]',

            {'name': 'default', 'type': 'DEFAULT_INSTANCE', 'router_id': router_id}),

        #    {'name': 'default', 'type': 'DEFAULT_INSTANCE', 'router_id': router_id}),





        json_config_rule_set(

        #json_config_rule_set(

            '/network_instance[default]/protocols[OSPF]',

        #    '/network_instance[default]/protocols[OSPF]',

            {'name': 'default', 'identifier': 'OSPF', 'protocol_name': 'OSPF'}),

        #    {'name': 'default', 'identifier': 'OSPF', 'protocol_name': 'OSPF'}),





        json_config_rule_set(

        #json_config_rule_set(

            '/network_instance[default]/protocols[STATIC]',

        #    '/network_instance[default]/protocols[STATIC]',

            {'name': 'default', 'identifier': 'STATIC', 'protocol_name': 'STATIC'}),

        #    {'name': 'default', 'identifier': 'STATIC', 'protocol_name': 'STATIC'}),





        json_config_rule_set(

        json_config_rule_set(

            '/network_instance[{:s}]'.format(network_instance_name),

            '/network_instance[{:s}]'.format(network_instance_name),
@@ -94,7 +94,7 @@ def teardown_config_rules( 
    #bgp_as              = json_settings.get('bgp_as',              0    )    # 65000

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

    #bgp_route_target    = json_settings.get('bgp_route_target',    '0:0')    # 65000:333

    #bgp_route_target    = json_settings.get('bgp_route_target',    '0:0')    # 65000:333





    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'

    #route_distinguisher = json_endpoint_settings.get('route_distinguisher', '0:0'    )  # '60001:801'

    sub_interface_index = json_endpoint_settings.get('sub_interface_index', 0        )  # 1

    sub_interface_index = json_endpoint_settings.get('sub_interface_index', 0        )  # 1

    #vlan_id             = json_endpoint_settings.get('vlan_id',             1        )  # 400

    #vlan_id             = json_endpoint_settings.get('vlan_id',             1        )  # 400
@@ -105,36 +105,36 @@ def teardown_config_rules( 




    if_cirid_name         = '{:s}.{:s}'.format(endpoint_name, str(circuit_id))

    if_cirid_name         = '{:s}.{:s}'.format(endpoint_name, str(circuit_id))

    network_instance_name = 'ELAN-AC:{:s}'.format(str(circuit_id))

    network_instance_name = 'ELAN-AC:{:s}'.format(str(circuit_id))

    connection_point_id   = 'VC-1'

    #connection_point_id   = 'VC-1'





    json_config_rules = [

    json_config_rules = [

        json_config_rule_delete(

        #json_config_rule_delete(

            '/network_instance[{:s}]/connection_point[{:s}]'.format(network_instance_name, connection_point_id),

        #    '/network_instance[{:s}]/connection_point[{:s}]'.format(network_instance_name, connection_point_id),

            {'name': network_instance_name, 'connection_point': connection_point_id}),

        #    {'name': network_instance_name, 'connection_point': connection_point_id}),





        json_config_rule_delete(

        #json_config_rule_delete(

            '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, if_cirid_name),

        #    '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, if_cirid_name),

            {'name': network_instance_name, 'id': if_cirid_name, 'interface': if_cirid_name,

        #    {'name': network_instance_name, 'id': if_cirid_name, 'interface': if_cirid_name,

            'subinterface': sub_interface_index}),

        #    'subinterface': sub_interface_index}),



        json_config_rule_delete(

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

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





        json_config_rule_delete(

        json_config_rule_delete(

            '/network_instance[{:s}]'.format(network_instance_name),

            '/network_instance[{:s}]'.format(network_instance_name),

            {'name': network_instance_name}),

            {'name': network_instance_name}),





        json_config_rule_delete(

        json_config_rule_delete(

            '/network_instance[default]/protocols[STATIC]',

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

            {'name': 'default', 'identifier': 'STATIC', 'protocol_name': 'STATIC'}),

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





        json_config_rule_delete(

        #json_config_rule_delete(

            '/network_instance[default]/protocols[OSPF]',

        #    '/network_instance[default]/protocols[STATIC]',

            {'name': 'default', 'identifier': 'OSPF', 'protocol_name': 'OSPF'}),

        #    {'name': 'default', 'identifier': 'STATIC', 'protocol_name': 'STATIC'}),





        json_config_rule_delete(

        #json_config_rule_delete(

            '/network_instance[default]',

        #    '/network_instance[default]/protocols[OSPF]',

            {'name': 'default', 'type': 'DEFAULT_INSTANCE', 'router_id': router_id}),

        #    {'name': 'default', 'identifier': 'OSPF', 'protocol_name': 'OSPF'}),



        #json_config_rule_delete(

        #    '/network_instance[default]',

        #    {'name': 'default', 'type': 'DEFAULT_INSTANCE', 'router_id': router_id}),

    ]

    ]

    return json_config_rules
 
    return json_config_rules

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

+25 −26
Original line number Original line Diff line number Diff line
@@ -49,31 +49,21 @@ def setup_config_rules( 




        json_config_rule_set(

        json_config_rule_set(

            '/network_instance[{:s}]'.format(network_instance_name),

            '/network_instance[{:s}]'.format(network_instance_name),

            {'name': network_instance_name, 

            {'name': network_instance_name, 'type': 'L2VSI'}),

             'type': 'L2VSI'}),





        json_config_rule_set(

        json_config_rule_set(

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

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

            {'name': if_cirid_name, 

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

             'type': 'l2vlan', 

             'index': sub_interface_index, 

             'vlan_id': vlan_id}),





        json_config_rule_set(

        json_config_rule_set(

            '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, if_cirid_name),

            '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, if_cirid_name),

            {'name': network_instance_name, 

            {'name': network_instance_name, 'id': if_cirid_name, 'interface': if_cirid_name,

             'id': if_cirid_name, 

             'subinterface': sub_interface_index}),

             'interface': if_cirid_name,

             'subinterface': 0

            }),





        json_config_rule_set(

        json_config_rule_set(

            '/network_instance[{:s}]/connection_point[{:s}]'.format(network_instance_name, connection_point_id),

            '/network_instance[{:s}]/connection_point[{:s}]'.format(network_instance_name, connection_point_id),

            {'name': network_instance_name, 

            {'name': network_instance_name, 'connection_point': connection_point_id, 'VC_ID': circuit_id,

             'connection_point': connection_point_id, 

             'remote_system': remote_router}),

             'VC_ID': circuit_id,

             'remote_system': remote_router

            }),

    ]

    ]

    return json_config_rules

    return json_config_rules
@@ -95,7 +85,7 @@ def teardown_config_rules( 




    #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'

    #route_distinguisher = json_endpoint_settings.get('route_distinguisher', '0:0'    )  # '60001:801'

    #sub_interface_index = json_endpoint_settings.get('sub_interface_index', 0        )  # 1

    sub_interface_index = json_endpoint_settings.get('sub_interface_index', 0        )  # 1

    #vlan_id             = json_endpoint_settings.get('vlan_id',             1        )  # 400

    #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_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

    #address_prefix      = json_endpoint_settings.get('address_prefix',      24       )  # 30
@@ -104,17 +94,26 @@ def teardown_config_rules( 




    if_cirid_name         = '{:s}.{:s}'.format(endpoint_name, str(circuit_id))

    if_cirid_name         = '{:s}.{:s}'.format(endpoint_name, str(circuit_id))

    network_instance_name = 'ELAN-AC:{:s}'.format(str(circuit_id))

    network_instance_name = 'ELAN-AC:{:s}'.format(str(circuit_id))

    #connection_point_id   = 'VC-1'

    connection_point_id   = 'VC-1'





    json_config_rules = [

    json_config_rules = [



        json_config_rule_delete(

        json_config_rule_delete(

            '/network_instance[{:s}]'.format(network_instance_name),

            '/network_instance[{:s}]/connection_point[{:s}]'.format(network_instance_name, connection_point_id),

            {'name': network_instance_name}),

            {'name': network_instance_name, 'connection_point': connection_point_id, 'VC_ID': circuit_id}),





        json_config_rule_delete(

        json_config_rule_delete(

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

            '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, if_cirid_name),

            'name': if_cirid_name,

            {'name': network_instance_name, 'id': if_cirid_name, 'interface': if_cirid_name,

        }),

             'subinterface': sub_interface_index}),



        json_config_rule_delete(

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

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



        json_config_rule_delete(

            '/network_instance[{:s}]'.format(network_instance_name),

            {'name': network_instance_name}),





    ]

    ]

    return json_config_rules
 
    return json_config_rules