Add python CLI byte stream support for table key (ipv6). (#125)

* Add python CLI byte stream support for table key (ipv6). * Changed the logic from byte_stream to check the is_ptr is set or not. 1. Initialized the KeyFieldInfo and check the width is > 64, set the is_ptr to True in file src/tdi_json_parser/tdi_info_parser.cpp. 2. Fixed invalid check for is_ptr==True and field size is less than and equal to 8 bytes and log error as Please don't use byte arrays in include/tdi/common/tdi_utils.hpp. 3. Reverted back the is_ptr check only.3. Reverted back the is_ptr check only.3. Reverted back the is_ptr check only. * Change back the error message to indicated use byte array. * Need to change the comment line according the latest error log.
p4lang · Mar 2, 2023 · fe1308c · fe1308c
1 parent 761c4e6
commit fe1308c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/include/tdi/common/tdi_utils.hpp b/include/tdi/common/tdi_utils.hpp
@@ -285,7 +285,9 @@ static inline tdi_status_t keyFieldSafeGet(
       );
       return TDI_INVALID_ARG;
     }
-    if ((*key_field)->isPtrGet() && field_value->size_ < 64) {
+    /* If field size less than or equal to 8 and is_ptr is true,
+     * should use byte arrays */
+    if ((*key_field)->isPtrGet() && field_value->size_ <= 8) {
       LOG_ERROR(
           "%s:%d Field size is greater than 64 bits. Please use byte arrays in "
           "the KeyFieldValue for field %d",

diff --git a/src/tdi_json_parser/tdi_info_parser.cpp b/src/tdi_json_parser/tdi_info_parser.cpp
@@ -219,7 +219,7 @@ std::unique_ptr<KeyFieldInfo> TdiInfoParser::parseKeyField(
                               default_fl_value,
                               default_str_value,
                               checkIsFieldSlice(table_key_cjson),
-                              false,
+                              width>64,
                               false);
   if (tmp == nullptr) {
     LOG_ERROR("%s:%d Error forming key_field %d",

diff --git a/tdi_python/tdiTable.py b/tdi_python/tdiTable.py
@@ -713,6 +713,7 @@ def _init_key(self):
             return sts
         for field_id in field_ids:
             field_name = c_char_p()
+            logging.debug("field_id={} field_name={}".format(field_id, field_name))
             sts = self._cintf.get_driver().tdi_key_field_name_get(self._info_handle, field_id, byref(field_name))
             if not sts == 0:
                 print("CLI Error: get key field name for {} failed. [{}]".format(self.name, self._cintf.err_str(sts)))
@@ -931,6 +932,9 @@ def _set_key_fields(self, content, key_handle):
             sts = -1
             if name not in content.keys():
                 continue
+            logging.debug("info:info.type {}, info.data_type {} \n"
+                          "info.is_ptr {}".format(self.key_match_type_cls.key_match_type_str(info.type),
+                              self.data_type_cls.data_type_str(info.data_type), info.is_ptr))
             if self.key_match_type_cls.key_match_type_str(info.type) == "EXACT":
                 if self.data_type_cls.data_type_str(info.data_type) == "STRING":
                     value = c_char_p(content[name].encode('ascii'))
@@ -940,6 +944,7 @@ def _set_key_fields(self, content, key_handle):
                     sts = self._cintf.get_driver().tdi_key_field_set_value(key_handle, info.id, value)
                 else:
                     value, bytes_ = self.fill_c_byte_arr(content[name], info.size)
+                    logging.debug("value={} bytes_ {}".format(bytes(value).hex(),bytes_))
                     sts = self._cintf.get_driver().tdi_key_field_set_value_ptr(key_handle, info.id, value, bytes_)
             elif self.key_match_type_cls.key_match_type_str(info.type) == "TERNARY":
                 if not info.is_ptr: