Merge "Schema transformer should restore route target list at restart…

…" into R2.20
Juniper · Nov 23, 2015 · d7ca808 · d7ca808
2 parents fa8aae5 + f50ca65
commit d7ca808
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/src/config/schema-transformer/to_bgp.py b/src/config/schema-transformer/to_bgp.py
@@ -514,6 +514,9 @@ def locate_routing_instance(self, rinst_name, service_chain=None,
                         for rt in self.rt_list:
                             rtgt_obj = RouteTarget(rt)
                             rinst_obj.add_route_target(rtgt_obj, inst_tgt_data)
+                        if not is_default and self.allow_transit:
+                            rtgt_obj = RouteTarget(self._route_target)
+                            rinst_obj.add_route_target(rtgt_obj, inst_tgt_data)
                     if (not compare_refs(rinst_obj.get_route_target_refs(),
                                          old_rt_refs)):
                         need_update = True
@@ -529,6 +532,9 @@ def locate_routing_instance(self, rinst_name, service_chain=None,
                     for rt in self.rt_list:
                         rtgt_obj = RouteTarget(rt)
                         rinst_obj.add_route_target(rtgt_obj, inst_tgt_data)
+                    if not is_default and self.allow_transit:
+                        rtgt_obj = RouteTarget(self._route_target)
+                        rinst_obj.add_route_target(rtgt_obj, inst_tgt_data)
                 _vnc_lib.routing_instance_create(rinst_obj)
         except (BadRequest, HttpError) as e:
             _sandesh._logger.error(