Merge "Use subnet and subnet_list from original address" into R3.0

Juniper · Nov 18, 2016 · 6ea15fc · 6ea15fc
2 parents 4632bc9 + 4d1a211
commit 6ea15fc
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/config/schema-transformer/config_db.py b/src/config/schema-transformer/config_db.py
@@ -1021,10 +1021,16 @@ def policy_to_acl_rule(self, prule, dynamic):
                     if not service_ris:
                         continue
                     if self.me(svn):
-                        da_list = [AddressType(virtual_network=x)
+                        da_list = [AddressType(
+                                       virtual_network=x,
+                                       subnet=daddr_match.subnet,
+                                       subnet_list=daddr_match.subnet_list)
                                    for x in service_ris]
                     elif self.me(dvn):
-                        sa_list = [AddressType(virtual_network=x)
+                        sa_list = [AddressType(
+                                       virtual_network=x,
+                                       subnet=saddr_match.subnet,
+                                       subnet_list=saddr_match.subnet_list)
                                    for x in service_ris]
 
                 for sp, dp, sa, da in itertools.product(sp_list, dp_list,