DM: irb ip address allocation is required for external VN if fwd mode…

… is l2_l3

- redundant filter terms should be removed for l2_l3 VN.
- irb interface has to be present for l3 vrf

Change-Id: I950ffb035be0a4a15a02133c24a618d3d972eb86
Closes-Bug: #1497486
Closes-Bug: #1497465

src/config/device-manager/device_manager/db.py

@@ -228,7 +228,7 @@ def evaluate_vn_irb_ip_map(self, vn_set):
         new_vn_ip_set = set()
         for vn_uuid in vn_set:
             vn = VirtualNetworkDM.get(vn_uuid)
-            if vn.router_external == True:   #dont need irb ip, gateway ip
+            if vn.forwarding_mode != 'l2_l3': #dont need irb ip, gateway ip
                 continue
             for subnet_prefix in vn.gateways.keys():
                 new_vn_ip_set.add(vn_uuid + ':' + subnet_prefix)
@@ -369,7 +369,8 @@ def push_config(self):
                                                              export_set,
                                                              vn_obj.get_prefixes(),
                                                              None,
-                                                             vn_obj.router_external)
+                                                             vn_obj.router_external,
+                                                             ["irb" + "." + str(vn_obj.vn_network_id)])
 
                     break
 

src/config/device-manager/device_manager/physical_router_config.py

@@ -258,7 +258,7 @@ def add_routing_instance(self, ri_name, is_l2, is_l2_l3, import_targets, export_
         # add firewall config for public VRF
         forwarding_options_config = self.forwarding_options_config
         firewall_config = self.firewall_config
-        if router_external:
+        if router_external and is_l2 == False:
             if self.forwarding_options_config is None:
                 forwarding_options_config = etree.Element("forwarding-options")
                 fo = etree.SubElement(forwarding_options_config, "family")