Commit 26169a15 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Service component: 

- Corrected delete config rules in L2NMEmulated/L3NMEmulated/TAPI Service Handlers.
- Commented unneeded settings in L2NMEmulatedServiceHandler Config Rules
parent d1c72678

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

+4 −4
Original line number Diff line number Diff line
@@ -79,10 +79,10 @@ def teardown_config_rules( 
    service_settings : TreeNode, endpoint_settings : TreeNode

) -> List[Dict]:



    json_settings          : Dict = {} if service_settings  is None else service_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

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

    #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
@@ -90,10 +90,10 @@ def teardown_config_rules( 
    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

    #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

    remote_router       = json_endpoint_settings.get('remote_router',       '0.0.0.0')  # '5.5.5.5'

    #remote_router       = json_endpoint_settings.get('remote_router',       '0.0.0.0')  # '5.5.5.5'

    circuit_id          = json_endpoint_settings.get('circuit_id',          '000'    )  # '111'



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

src/service/service/service_handlers/l2nm_emulated/L2NMEmulatedServiceHandler.py

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ class L2NMEmulatedServiceHandler(_ServiceHandler): 
                    service_uuid, connection_uuid, device_uuid, endpoint_uuid, settings, endpoint_settings)



                device = self.__task_executor.get_device(DeviceId(**json_device_id(device_uuid)))

                del device.device_config.config_rules[:]

                for json_config_rule in json_config_rules:

                    device.device_config.config_rules.append(ConfigRule(**json_config_rule))

                self.__task_executor.configure_device(device)
@@ -102,6 +103,7 @@ class L2NMEmulatedServiceHandler(_ServiceHandler): 
                    service_uuid, connection_uuid, device_uuid, endpoint_uuid, settings, endpoint_settings)



                device = self.__task_executor.get_device(DeviceId(**json_device_id(device_uuid)))

                del device.device_config.config_rules[:]

                for json_config_rule in json_config_rules:

                    device.device_config.config_rules.append(ConfigRule(**json_config_rule))

                self.__task_executor.configure_device(device)

src/service/service/service_handlers/l3nm_emulated/L3NMEmulatedServiceHandler.py

+2 −0
Original line number Diff line number Diff line
@@ -69,6 +69,7 @@ class L3NMEmulatedServiceHandler(_ServiceHandler): 
                    service_uuid, connection_uuid, device_uuid, endpoint_uuid, settings, endpoint_settings)



                device = self.__task_executor.get_device(DeviceId(**json_device_id(device_uuid)))

                del device.device_config.config_rules[:]

                for json_config_rule in json_config_rules:

                    device.device_config.config_rules.append(ConfigRule(**json_config_rule))

                self.__task_executor.configure_device(device)
@@ -102,6 +103,7 @@ class L3NMEmulatedServiceHandler(_ServiceHandler): 
                    service_uuid, connection_uuid, device_uuid, endpoint_uuid, settings, endpoint_settings)



                device = self.__task_executor.get_device(DeviceId(**json_device_id(device_uuid)))

                del device.device_config.config_rules[:]

                for json_config_rule in json_config_rules:

                    device.device_config.config_rules.append(ConfigRule(**json_config_rule))

                self.__task_executor.configure_device(device)

src/service/service/service_handlers/tapi_tapi/TapiServiceHandler.py

+1 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ class TapiServiceHandler(_ServiceHandler): 
            device_uuid = endpoints[0][0]

            device = self.__task_executor.get_device(DeviceId(**json_device_id(device_uuid)))

            json_config_rule = json_config_rule_delete('/service[{:s}]'.format(service_uuid), {'uuid': service_uuid})

            del device.device_config.config_rules[:]

            device.device_config.config_rules.append(ConfigRule(**json_config_rule))

            self.__task_executor.configure_device(device)

            results.append(True)