From 9815d55e8e73b241c855623baaaf014ab0245270 Mon Sep 17 00:00:00 2001
From: Ignatious Johnson Christopher <ijohnson@juniper.net>
Date: Thu, 23 Jun 2016 16:10:13 +0000
Subject: [PATCH] Route targets of the connected logical routers are not added
 to routing instances during reinit, when schema transformer restarts. They
 are added later during the Logical Router objects are evaluated.

Fix is to add them during reinit of routing instances.
Closed-Bug: 1588204

Change-Id: Id321a12e6c4a3aacb05f63b6ea0f6a2d5e9793fa
---
 src/config/schema-transformer/to_bgp.py | 57 ++++++++++++++++++++-----
 1 file changed, 46 insertions(+), 11 deletions(-)

diff --git a/src/config/schema-transformer/to_bgp.py b/src/config/schema-transformer/to_bgp.py
index c013cc8113d..b23a0bfd634 100644
--- a/src/config/schema-transformer/to_bgp.py
+++ b/src/config/schema-transformer/to_bgp.py
@@ -627,6 +627,7 @@ def locate_routing_instance(self, rinst_name, service_chain=None,
 
         try:
             try:
+                stale_rt_list = []
                 if ri_dict:
                     rinst_obj = ri_dict[rinst_fq_name_str]
                 else:
@@ -637,16 +638,34 @@ def locate_routing_instance(self, rinst_name, service_chain=None,
                     _vnc_lib.routing_instance_delete(id=rinst_obj.uuid)
                     rinst_obj = None
                 else:
-                    rinst_obj.set_route_target(rtgt_obj, InstanceTargetType())
-                    rinst_obj.set_routing_instance_is_default(is_default)
+                    update_ri = False
+                    stale_rt_list = [':'.join(rt_ref['to']) for rt_ref in
+                                     rinst_obj.get_route_target_refs()]
+                    if rt_key in stale_rt_list:
+                        stale_rt_list.remove(rt_key)
+                    if (rinst_obj.get_routing_instance_is_default() !=
+                            is_default):
+                        rinst_obj.set_routing_instance_is_default(is_default)
+                        update_ri = True
                     if inst_tgt_data:
                         for rt in self.rt_list:
-                            rtgt_obj = RouteTarget(rt)
-                            rinst_obj.add_route_target(rtgt_obj, inst_tgt_data)
+                            if rt not in stale_rt_list:
+                                rtgt_obj = RouteTarget(rt)
+                                rinst_obj.add_route_target(rtgt_obj,
+                                                           inst_tgt_data)
+                                update_ri = True
+                            else:
+                                stale_rt_list.remove(rt)
                         if not is_default and self.allow_transit:
-                            rtgt_obj = RouteTarget(self.get_route_target())
-                            rinst_obj.add_route_target(rtgt_obj, inst_tgt_data)
-                    _vnc_lib.routing_instance_update(rinst_obj)
+                            rt = self.get_route_target()
+                            if rt not in stale_rt_list:
+                                rtgt_obj = RouteTarget(rt)
+                                rinst_obj.add_route_target(rtgt_obj, inst_tgt_data)
+                                update_ri = True
+                            else:
+                                stale_rt_list.remove(rt)
+                    if update_ri:
+                        _vnc_lib.routing_instance_update(rinst_obj)
             except (NoIdError, KeyError):
                 rinst_obj = None
             if rinst_obj is None:
@@ -671,6 +690,7 @@ def locate_routing_instance(self, rinst_name, service_chain=None,
 
         rinst = RoutingInstanceST(rinst_obj, service_chain, rt_key)
         self.rinst[rinst_name] = rinst
+        rinst.stale_route_targets = stale_rt_list
 
         if old_rtgt:
             rt_key = "target:%s:%d" % (self.get_autonomous_system(), old_rtgt)
@@ -1474,6 +1494,7 @@ def __init__(self, ri_obj, service_chain=None, route_target=None):
         self.connections = set()
         for ri_ref in self.obj.get_routing_instance_refs() or []:
             self.connections.add(':'.join(ri_ref['to']))
+        self.stale_route_targets = []
     # end __init__
 
     def get_fq_name(self):
@@ -1538,14 +1559,23 @@ def add_service_info(self, remote_vn, service_instance=None,
 
     def update_route_target_list(self, rt_add, rt_del=None,
                                  import_export=None):
+        update = False
         for rt in rt_add:
-            rtgt_obj = RouteTarget(rt)
-            inst_tgt_data = InstanceTargetType(import_export=import_export)
-            self.obj.add_route_target(rtgt_obj, inst_tgt_data)
+            if rt not in self.stale_route_targets:
+                rtgt_obj = RouteTarget(rt)
+                inst_tgt_data = InstanceTargetType(import_export=import_export)
+                self.obj.add_route_target(rtgt_obj, inst_tgt_data)
+                update = True
+            else:
+                self.stale_route_targets.remove(rt)
         for rt in rt_del or set():
+            if rt in self.stale_route_targets:
+                self.stale_route_targets.remove(rt)
             rtgt_obj = RouteTarget(rt)
             self.obj.del_route_target(rtgt_obj)
-        if len(rt_add) or len(rt_del or set()):
+            update = True
+
+        if update:
             _vnc_lib.routing_instance_update(self.obj)
     # end update_route_target_list
 
@@ -3376,6 +3406,11 @@ def process_stale_objects(self):
                 sc.destroy()
             if sc.present_stale:
                 sc.delete()
+        for vn in VirtualNetworkST.values():
+            for rinst in vn.rinst.values():
+                if rinst.stale_route_targets:
+                    rinst.update_route_target_list(rt_add=set(),
+                            rt_del=rinst.stale_route_targets)
     # end process_stale_objects
 
     def process_poll_result(self, poll_result_str):