fix: -5 error, switch-id-NULL on neighbor/route create test

Signed-off-by: Nicholas Ching <nicholaslching@gmail.com>

Author: nicholasching

meta/templates/sai_rpc_server_helper_functions.tt

@@ -31,7 +31,8 @@
 }
             [%- END -%]
             [%- FOREACH struct IN apis.$api.structs %]
-
+                [%- NEXT IF struct.short_name == 'neighbor_entry' %]
+                [%- NEXT IF struct.short_name == 'route_entry' %]
 
                 [%- PROCESS struct_helper_function_header %] {
 
@@ -135,8 +136,57 @@ void sai_thrift_parse_[% struct.short_name %](const [% struct.thrift_name %] &th
 [%- ######################################################################## -%]
 
 [%- BLOCK special_helper_functions -%]
+extern sai_object_id_t gSwitchId;
+extern sai_object_id_t switch_id;
+
 void sai_thrift_parse_buffer(const std::string &thrift_buffer,
                              void *buffer) {
   /* not supported yet */
 }
+
+void sai_thrift_parse_neighbor_entry(const sai_thrift_neighbor_entry_t &thrift_neighbor_entry,
+                                     sai_neighbor_entry_t *neighbor_entry)
+{
+    if (neighbor_entry == NULL) {
+        return;
+    }
+
+    // OCP sai_test often omits switch_id on neighbor_entry; fall back to the
+    // RPC-global switch_id (set by sai_thrift_create_switch) then gSwitchId.
+    if (thrift_neighbor_entry.switch_id != 0) {
+        neighbor_entry->switch_id = (sai_object_id_t)thrift_neighbor_entry.switch_id;
+    } else if (switch_id != SAI_NULL_OBJECT_ID) {
+        neighbor_entry->switch_id = switch_id;
+    } else if (gSwitchId != SAI_NULL_OBJECT_ID) {
+        neighbor_entry->switch_id = gSwitchId;
+    } else {
+        neighbor_entry->switch_id = SAI_NULL_OBJECT_ID;
+    }
+
+    neighbor_entry->rif_id = (sai_object_id_t)thrift_neighbor_entry.rif_id;
+    sai_thrift_ip_address_t_parse(thrift_neighbor_entry.ip_address,
+                                  &neighbor_entry->ip_address);
+}
+
+void sai_thrift_parse_route_entry(const sai_thrift_route_entry_t &thrift_route_entry,
+                                  sai_route_entry_t *route_entry)
+{
+    if (route_entry == NULL) {
+        return;
+    }
+
+    if (thrift_route_entry.switch_id != 0) {
+        route_entry->switch_id = (sai_object_id_t)thrift_route_entry.switch_id;
+    } else if (switch_id != SAI_NULL_OBJECT_ID) {
+        route_entry->switch_id = switch_id;
+    } else if (gSwitchId != SAI_NULL_OBJECT_ID) {
+        route_entry->switch_id = gSwitchId;
+    } else {
+        route_entry->switch_id = SAI_NULL_OBJECT_ID;
+    }
+
+    route_entry->vr_id = (sai_object_id_t)thrift_route_entry.vr_id;
+    sai_thrift_ip_prefix_t_parse(thrift_route_entry.destination,
+                                 &route_entry->destination);
+}
 [% END -%]

test/saithrift/src/switch_sai.thrift

@@ -198,8 +198,9 @@ struct sai_thrift_route_entry_t {
 }
 
 struct sai_thrift_neighbor_entry_t {
-    1: sai_thrift_object_id_t rif_id;
-    2: sai_thrift_ip_address_t ip_address;
+    1: sai_thrift_object_id_t switch_id;
+    2: sai_thrift_object_id_t rif_id;
+    3: sai_thrift_ip_address_t ip_address;
 }
 
 struct sai_thrift_attribute_list_t {

test/saithrift/src/switch_sai_rpc_server.cpp

@@ -241,7 +241,13 @@ class switch_sai_rpcHandler : virtual public switch_sai_rpcIf {
   }
 
   void sai_thrift_parse_neighbor_entry(const sai_thrift_neighbor_entry_t &thrift_neighbor_entry, sai_neighbor_entry_t *neighbor_entry) {
-      neighbor_entry->switch_id = gSwitchId;
+      // Python saithrift sends switch_id as field 1 (optional). Always fall back to
+      // gSwitchId when the client omits it (OCP sai_test often only passes rif_id).
+      if (thrift_neighbor_entry.switch_id != 0) {
+          neighbor_entry->switch_id = (sai_object_id_t) thrift_neighbor_entry.switch_id;
+      } else {
+          neighbor_entry->switch_id = gSwitchId;
+      }
       neighbor_entry->rif_id = (sai_object_id_t) thrift_neighbor_entry.rif_id;
       sai_thrift_parse_ip_address(thrift_neighbor_entry.ip_address, &neighbor_entry->ip_address);
   }