Service component - L3NM OpenConfig:

- Rolling back malformed config rules, left backup for future integration

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

@@ -99,18 +99,6 @@ def setup_config_rules(
                 'protocol_name': 'STATIC',
         }),
 
-        #Associate interface to network instance
-        json_config_rule_set(
-            '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, if_subif_name), {
-                'name'          : network_instance_name, 
-                'type'          : 'L3VRF',
-                'id'            : if_subif_name, 
-                'interface'     : if_subif_name,
-                'subinterface'  : sub_interface_index,
-                'address_ip'    : address_ip, 
-                'address_prefix': address_prefix,
-        }), 
-
         #Create interface with subinterface
         json_config_rule_set(
             '/interface[{:s}]/subinterface[{:d}]'.format(if_subif_name, sub_interface_index), {
@@ -124,15 +112,16 @@ def setup_config_rules(
                 'address_prefix': address_prefix,
         }),
 
+        #Associate interface to network instance
         json_config_rule_set(
-            '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, self_bgp_if_name), {
-                'name'        : network_instance_name, 
-                'type'        : 'L3VRF',
-                'id'          : self_bgp_if_name, 
-                'interface'   : self_bgp_if_name,
-                'subinterface': bgp_sub_interface_index,
-                'address_ip'    : self_bgp_address_ip, 
-                'address_prefix': bgp_address_prefix,
+            '/network_instance[{:s}]/interface[{:s}]'.format(network_instance_name, if_subif_name), {
+                'name'          : network_instance_name, 
+                'type'          : 'L3VRF',
+                'id'            : if_subif_name, 
+                'interface'     : if_subif_name,
+                'subinterface'  : sub_interface_index,
+                'address_ip'    : address_ip, 
+                'address_prefix': address_prefix,
         }), 
 
         #Create routing policy