Service component - L2NM Emulated Service Handler:

- Improved parameter gathering

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

@@ -24,7 +24,7 @@ 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
 
     #mtu                 = json_settings.get('mtu',                 1450 )    # 1512
@@ -35,11 +35,14 @@ def setup_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',             None     )  # 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'
-    circuit_id          = json_endpoint_settings.get('circuit_id',          '000'    )  # '111'
+    circuit_id          = json_endpoint_settings.get('circuit_id',          None    )  # '111'
+
+    if vlan_id is None: vlan_id = json_settings.get('vlan_id', 1)
+    if circuit_id is None: circuit_id = json_settings.get('circuit_id', '000')
 
     if_cirid_name         = '{:s}.{:s}'.format(endpoint_name, str(circuit_id))
     network_instance_name = 'ELAN-AC:{:s}'.format(str(circuit_id))