Merge "Use virtual network name instead of object reference"

Juniper · Feb 3, 2016 · 8c5c922 · 8c5c922
2 parents 2f2fcc6 + 76ddefd
commit 8c5c922
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/config/schema-transformer/config_db.py b/src/config/schema-transformer/config_db.py
@@ -1064,14 +1064,14 @@ def policy_to_acl_rule(self, prule, dynamic):
                     acl = self.add_acl_rule(
                         sa, sp, da, dp, arule_proto, rule_uuid,
                         prule.action_list, prule.direction,
-                        service_ris.get(da, [None])[0])
+                        service_ris.get(da.virtual_network, [None])[0])
                     result_acl_rule_list.append(acl)
                     if ((prule.direction == "<>") and
                         (sa != da or sp != dp)):
                         acl = self.add_acl_rule(
                             da, dp, sa, sp, arule_proto, rule_uuid,
                             prule.action_list, prule.direction,
-                            service_ris.get(sa, [None, None])[1])
+                            service_ris.get(sa.virtual_network, [None, None])[1])
 
                         result_acl_rule_list.append(acl)
                 # end for sp, dp
@@ -2338,7 +2338,7 @@ def check_create(self):
         for service in self.service_list:
             si = ServiceInstanceST.get(service)
             if si is None:
-                self.log_error("Service instance %s not found " + service)
+                self.log_error("Service instance %s not found " % service)
                 return None
             vm_list = si.virtual_machines
             pt_list = si.port_tuples