Fix issues to support custom SAI header

Author: Junchao-Mellanox

configure.ac

@@ -228,12 +228,12 @@ AC_ARG_WITH(extra-libsai-ldflags,
                           extra libsai.so flags for vendor library],
 [AC_SUBST(EXTRA_LIBSAI_LDFLAGS, "${withval}")])
 
-AC_SUBST(SAIINC, "-I\$(top_srcdir)/SAI/inc -I\$(top_srcdir)/SAI/experimental -I\$(top_srcdir)/SAI/meta")
+AC_SUBST(SAIINC, "-I\$(top_srcdir)/SAI/inc -I\$(top_srcdir)/SAI/experimental -I\$(top_srcdir)/SAI/meta -I\$(top_srcdir)/SAI/custom")
 
 AM_COND_IF([SYNCD], [
 AM_COND_IF([SAIVS], [], [
 SAVED_FLAGS="$CXXFLAGS"
-CXXFLAGS="-Xlinker --no-as-needed -lsai -I$srcdir/SAI/inc -I$srcdir/SAI/experimental -I$srcdir/SAI/meta $EXTRA_LIBSAI_LDFLAGS"
+CXXFLAGS="-Xlinker --no-as-needed -lsai -I$srcdir/SAI/inc -I$srcdir/SAI/experimental -I$srcdir/SAI/meta -I$srcdir/SAI/custom $EXTRA_LIBSAI_LDFLAGS"
 AC_CHECK_FUNCS(sai_query_api_version, [
 AC_MSG_CHECKING([SAI headers API version and library version check])
 AC_TRY_RUN([
@@ -283,7 +283,7 @@ AM_COND_IF([SAIVS],
 [
     AM_COND_IF([SYNCD], [
     SAVED_FLAGS="$CXXFLAGS"
-    CXXFLAGS="-Xlinker --no-as-needed -lsai -I$srcdir/SAI/inc -I$srcdir/SAI/experimental -I$srcdir/SAI/meta"
+    CXXFLAGS="-Xlinker --no-as-needed -lsai -I$srcdir/SAI/inc -I$srcdir/SAI/experimental -I$srcdir/SAI/meta -I$srcdir/SAI/custom"
     AC_CHECK_FUNCS(sai_bulk_object_clear_stats sai_bulk_object_get_stats sai_tam_telemetry_get_data)
     AH_TEMPLATE([HAVE_SAI_QUERY_STATS_ST_CAPABILITY], [Force it disabled for SAIs without implementation - REMOVE WHEN NOT NEEDED])
     CXXFLAGS="$SAVED_FLAGS"

debian/libsaivs-dev.install

@@ -1,3 +1,4 @@
 SAI/inc/sai*.h usr/include/sai/
 SAI/experimental/sai*.h usr/include/sai/
+SAI/custom/sai*.h usr/include/sai/
 vslib/saivs.h

lib/VirtualObjectIdManager.cpp

@@ -29,14 +29,19 @@ static_assert(sizeof(sai_object_id_t) == sizeof(uint64_t), "SAI object ID size s
 #define SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_MAX ( (1ULL << SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE) - 1 )
 #define SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_MASK (SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_MAX)
 
-#define SAI_REDIS_OBJECT_INDEX_BITS_SIZE ( 39 )
+#define SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE ( 1 )
+#define SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_MAX ( (1ULL << SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE) - 1 )
+#define SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_MASK (SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_MAX)
+
+#define SAI_REDIS_OBJECT_INDEX_BITS_SIZE ( 38 )
 #define SAI_REDIS_OBJECT_INDEX_MAX ( (1ULL << SAI_REDIS_OBJECT_INDEX_BITS_SIZE) - 1 )
 #define SAI_REDIS_OBJECT_INDEX_MASK (SAI_REDIS_OBJECT_INDEX_MAX)
 
 #define SAI_REDIS_OBJECT_ID_BITS_SIZE (      \
         SAI_REDIS_SWITCH_INDEX_BITS_SIZE +   \
         SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + \
         SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + \
+        SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + \
         SAI_REDIS_OBJECT_TYPE_BITS_SIZE +    \
         SAI_REDIS_OBJECT_INDEX_BITS_SIZE )
 
@@ -49,6 +54,8 @@ static_assert(SAI_REDIS_OBJECT_ID_BITS_SIZE == SAI_OBJECT_ID_BITS_SIZE, "redis o
 static_assert(SAI_OBJECT_TYPE_MAX < 256, "object type must be possible to encode on 1 byte");
 static_assert((SAI_OBJECT_TYPE_EXTENSIONS_RANGE_END - SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START) < 256,
         "extensions object type must be possible to encode on 1 byte");
+static_assert((SAI_OBJECT_TYPE_CUSTOM_RANGE_END - SAI_OBJECT_TYPE_CUSTOM_RANGE_START) < 256,
+        "custom object type must be possible to encode on 1 byte");
 
 /*
  * Current OBJECT ID format:
@@ -57,7 +64,8 @@ static_assert((SAI_OBJECT_TYPE_EXTENSIONS_RANGE_END - SAI_OBJECT_TYPE_EXTENSIONS
  * bits 55..48 - SAI object type
  * bits 47..40 - global context
  * bits 39..39 - object type extensions flag
- * bits 38..0  - object index
+ * bits 38..38 - object type custom flag
+ * bits 37..0  - object index
  *
  * So large number of bits is required, otherwise we would need to have map of
  * OID to some struct that will have all those values.  But having all this
@@ -66,33 +74,41 @@ static_assert((SAI_OBJECT_TYPE_EXTENSIONS_RANGE_END - SAI_OBJECT_TYPE_EXTENSIONS
  * To be backward compatible with previous sairedis, we will still encode base
  * object type on bit's 55..48, and extensions which will now start from range
  * 0x20000000, will be encoded from 0x0, but extensions flag will be set to 1.
+ * Custom types starting from SAI_OBJECT_TYPE_CUSTOM_RANGE_BASE will be encoded
+ * from 0x0, but custom flag will be set to 1.
  *
  * For example SAI_OBJECT_TYPE_VIRTUAL_ROUTER oid will be encoded as 0x0003000000000001,
- * SAI_OBJECT_TYPE_DASH_ACL_GROUP oid will be encoded as 0x0003008000000001.
+ * SAI_OBJECT_TYPE_DASH_ACL_GROUP oid will be encoded as 0x0003008000000001，
+ * SAI_OBJECT_TYPE_CUSTOM_RANGE_BASE + n oid will be encoded as 0x0003004000000001.
  */
 
 #define SAI_REDIS_GET_OBJECT_INDEX(oid) \
     ( ((uint64_t)oid) & ( SAI_REDIS_OBJECT_INDEX_MASK ) )
 
+#define SAI_REDIS_GET_OBJECT_TYPE_CUSTOM_FLAG(oid) \
+    ( (((uint64_t)oid) >> (SAI_REDIS_OBJECT_INDEX_BITS_SIZE) ) & ( SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_MAX ) )
+
 #define SAI_REDIS_GET_OBJECT_TYPE_EXTENSIONS_FLAG(oid) \
-    ( (((uint64_t)oid) >> (SAI_REDIS_OBJECT_INDEX_BITS_SIZE) ) & ( SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_MAX ) )
+    ( (((uint64_t)oid) >> (SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE) ) & ( SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_MAX ) )
 
 #define SAI_REDIS_GET_GLOBAL_CONTEXT(oid) \
-    ( (((uint64_t)oid) >> (SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE) ) & ( SAI_REDIS_GLOBAL_CONTEXT_MASK ) )
+    ( (((uint64_t)oid) >> (SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE) ) & ( SAI_REDIS_GLOBAL_CONTEXT_MASK ) )
 
 #define SAI_REDIS_GET_OBJECT_TYPE(oid) \
-    ( (((uint64_t)oid) >> ( SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE) ) & ( SAI_REDIS_OBJECT_TYPE_MASK ) )
+    ( (((uint64_t)oid) >> ( SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE) ) & ( SAI_REDIS_OBJECT_TYPE_MASK ) )
 
 #define SAI_REDIS_GET_SWITCH_INDEX(oid) \
-    ( (((uint64_t)oid) >> ( SAI_REDIS_OBJECT_TYPE_BITS_SIZE + SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE) ) & ( SAI_REDIS_SWITCH_INDEX_MASK ) )
+    ( (((uint64_t)oid) >> ( SAI_REDIS_OBJECT_TYPE_BITS_SIZE + SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE) ) & ( SAI_REDIS_SWITCH_INDEX_MASK ) )
 
 #define SAI_REDIS_TEST_OID (0x012345e789abcdef)
 
 static_assert(SAI_REDIS_GET_SWITCH_INDEX(SAI_REDIS_TEST_OID) == 0x01, "test switch index");
 static_assert(SAI_REDIS_GET_OBJECT_TYPE(SAI_REDIS_TEST_OID) == 0x23, "test object type");
 static_assert(SAI_REDIS_GET_GLOBAL_CONTEXT(SAI_REDIS_TEST_OID) == 0x45, "test global context");
-static_assert(SAI_REDIS_GET_OBJECT_TYPE_EXTENSIONS_FLAG(SAI_REDIS_TEST_OID) == 0x1, "test object type extensions flag");
-static_assert(SAI_REDIS_GET_OBJECT_INDEX(SAI_REDIS_TEST_OID) == 0x6789abcdef, "test object index");
+static_assert(SAI_REDIS_GET_OBJECT_TYPE_CUSTOM_FLAG(SAI_REDIS_TEST_OID) == 0x01, "test custom flag");
+static_assert(SAI_REDIS_GET_OBJECT_TYPE_EXTENSIONS_FLAG(SAI_REDIS_TEST_OID) == 0x01, "test extensions flag");
+static_assert(SAI_REDIS_GET_OBJECT_INDEX(SAI_REDIS_TEST_OID) == 0x2789abcdef, "test object index");
+static_assert((SAI_REDIS_SWITCH_INDEX_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_BITS_SIZE + SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE) == 64, "Total bits must sum to 64");
 
 using namespace sairedis;
 
@@ -162,9 +178,22 @@ sai_object_type_t VirtualObjectIdManager::saiObjectTypeQuery(
         return SAI_OBJECT_TYPE_NULL;
     }
 
-    sai_object_type_t objectType = SAI_REDIS_GET_OBJECT_TYPE_EXTENSIONS_FLAG(objectId)
-        ? (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId) + SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START)
-        : (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId));
+    uint64_t extensionsFlag = SAI_REDIS_GET_OBJECT_TYPE_EXTENSIONS_FLAG(objectId);
+    uint64_t customFlag = SAI_REDIS_GET_OBJECT_TYPE_CUSTOM_FLAG(objectId);
+
+    sai_object_type_t objectType;
+    if (customFlag)
+    {
+        objectType = (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId) + SAI_OBJECT_TYPE_CUSTOM_RANGE_START);
+    }
+    else if (extensionsFlag)
+    {
+        objectType = (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId) + SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START);
+    }
+    else
+    {
+        objectType = (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId));
+    }
 
     if (sai_metadata_is_object_type_valid(objectType) == false)
     {
@@ -379,18 +408,25 @@ sai_object_id_t VirtualObjectIdManager::constructObjectId(
         SWSS_LOG_THROW("FATAL: invalid object type (0x%x), logic error, this is a bug!", objectType);
     }
 
+    uint64_t customFlag = (uint64_t)objectType >= SAI_OBJECT_TYPE_CUSTOM_RANGE_START && (uint64_t)objectType < SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START;
     uint64_t extensionsFlag = (uint64_t)objectType >= SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START;
 
-    objectType = extensionsFlag
-        ? (sai_object_type_t)(objectType - SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START)
-        : objectType;
+    if (customFlag)
+    {
+        objectType = (sai_object_type_t)(objectType - SAI_OBJECT_TYPE_CUSTOM_RANGE_START);
+    }
+    else if (extensionsFlag)
+    {
+        objectType = (sai_object_type_t)(objectType - SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START);
+    }
 
     return (sai_object_id_t)(
-            ((uint64_t)switchIndex << (SAI_REDIS_OBJECT_TYPE_BITS_SIZE + SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE)) |
-            ((uint64_t)objectType << (SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE)) |
-            ((uint64_t)globalContext << (SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE)) |
-            ((uint64_t)extensionsFlag << (SAI_REDIS_OBJECT_INDEX_BITS_SIZE)) |
-            objectIndex);
+        ((uint64_t)switchIndex << (SAI_REDIS_OBJECT_TYPE_BITS_SIZE + SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE)) |
+        ((uint64_t)objectType << (SAI_REDIS_GLOBAL_CONTEXT_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE)) |
+        ((uint64_t)globalContext << (SAI_REDIS_OBJECT_TYPE_EXTENSIONS_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE)) |
+        ((uint64_t)extensionsFlag << (SAI_REDIS_OBJECT_TYPE_CUSTOM_FLAG_BITS_SIZE + SAI_REDIS_OBJECT_INDEX_BITS_SIZE)) |
+        ((uint64_t)customFlag << (SAI_REDIS_OBJECT_INDEX_BITS_SIZE)) |
+        objectIndex);
 }
 
 sai_object_id_t VirtualObjectIdManager::switchIdQuery(
@@ -434,9 +470,22 @@ sai_object_type_t VirtualObjectIdManager::objectTypeQuery(
         return SAI_OBJECT_TYPE_NULL;
     }
 
-    sai_object_type_t objectType = SAI_REDIS_GET_OBJECT_TYPE_EXTENSIONS_FLAG(objectId)
-        ? (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId) + SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START)
-        : (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId));
+    uint64_t extensionsFlag = SAI_REDIS_GET_OBJECT_TYPE_EXTENSIONS_FLAG(objectId);
+    uint64_t customFlag = SAI_REDIS_GET_OBJECT_TYPE_CUSTOM_FLAG(objectId);
+
+    sai_object_type_t objectType;
+    if (customFlag)
+    {
+        objectType = (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId) + SAI_OBJECT_TYPE_CUSTOM_RANGE_START);
+    }
+    else if (extensionsFlag)
+    {
+        objectType = (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId) + SAI_OBJECT_TYPE_EXTENSIONS_RANGE_START);
+    }
+    else
+    {
+        objectType = (sai_object_type_t)(SAI_REDIS_GET_OBJECT_TYPE(objectId));
+    }
 
     if (!sai_metadata_is_object_type_valid(objectType))
     {

meta/SaiSerialize.cpp

@@ -223,9 +223,9 @@ sai_status_t transfer_attribute(
             RETURN_ON_ERROR(transfer_list(src_attr.value.s8list, dst_attr.value.s8list, countOnly));
             break;
 
-//        case SAI_ATTR_VALUE_TYPE_UINT16_LIST:
-//            RETURN_ON_ERROR(transfer_list(src_attr.value.u16list, dst_attr.value.u16list, countOnly));
-//            break;
+        case SAI_ATTR_VALUE_TYPE_UINT16_LIST:
+            RETURN_ON_ERROR(transfer_list(src_attr.value.u16list, dst_attr.value.u16list, countOnly));
+            break;
 //
 //        case SAI_ATTR_VALUE_TYPE_INT16_LIST:
 //            RETURN_ON_ERROR(transfer_list(src_attr.value.s16list, dst_attr.value.s16list, countOnly));
@@ -2148,8 +2148,8 @@ std::string sai_serialize_attr_value(
         case SAI_ATTR_VALUE_TYPE_PORT_LANE_LATCH_STATUS_LIST:
             return sai_serialize_port_lane_latch_status_list(attr.value.portlanelatchstatuslist, countOnly);
 
-//        case SAI_ATTR_VALUE_TYPE_UINT16_LIST:
-//            return sai_serialize_number_list(attr.value.u16list, countOnly);
+        case SAI_ATTR_VALUE_TYPE_UINT16_LIST:
+            return sai_serialize_number_list(attr.value.u16list, countOnly);
 //
 //        case SAI_ATTR_VALUE_TYPE_INT16_LIST:
 //            return sai_serialize_number_list(attr.value.s16list, countOnly);
@@ -4433,8 +4433,8 @@ void sai_deserialize_attr_value(
         case SAI_ATTR_VALUE_TYPE_PORT_LANE_LATCH_STATUS_LIST:
             return sai_deserialize_port_lane_latch_status_list(s, attr.value.portlanelatchstatuslist, countOnly);
 
-//        case SAI_ATTR_VALUE_TYPE_UINT16_LIST:
-//            return sai_deserialize_number_list(s, attr.value.u16list, countOnly);
+        case SAI_ATTR_VALUE_TYPE_UINT16_LIST:
+            return sai_deserialize_number_list(s, attr.value.u16list, countOnly);
 //
 //        case SAI_ATTR_VALUE_TYPE_INT16_LIST:
 //            return sai_deserialize_number_list(s, attr.value.s16list, countOnly);
@@ -5762,9 +5762,9 @@ void sai_deserialize_free_attribute_value(
             sai_free_list(attr.value.s8list);
             break;
 
-//        case SAI_ATTR_VALUE_TYPE_UINT16_LIST:
-//            sai_free_list(attr.value.u16list);
-//            break;
+        case SAI_ATTR_VALUE_TYPE_UINT16_LIST:
+            sai_free_list(attr.value.u16list);
+            break;
 //
 //        case SAI_ATTR_VALUE_TYPE_INT16_LIST:
 //            sai_free_list(attr.value.s16list);

stub.pl

@@ -99,7 +99,7 @@ sub GetFunctionCamelCaseName
 
 sub GetData
 {
-    $DATA = `cat $optionSaiDir/inc/sai*.h $optionSaiDir/experimental/sai*.h`;
+    $DATA = `cat $optionSaiDir/inc/sai*.h $optionSaiDir/experimental/sai*.h $optionSaiDir/custom/sai*.h`;
 }
 
 sub SanitizeData

unittest/lib/TestVirtualObjectIdManager.cpp

@@ -112,3 +112,16 @@ TEST(VirtualObjectIdManager, extensions)
 
     EXPECT_EQ(m->objectTypeQuery(0x0003008000000001), SAI_OBJECT_TYPE_DASH_ACL_GROUP);
 }
+
+TEST(VirtualObjectIdManager, customTypes)
+{
+    auto m = createVirtualObjectIdManager();
+
+    auto sid = m->allocateNewSwitchObjectId("");
+
+    auto customType = (sai_object_type_t)(SAI_OBJECT_TYPE_CUSTOM_RANGE_BASE + 1);
+    auto oid = m->allocateNewObjectId(customType, sid);
+
+    EXPECT_NE(oid, SAI_NULL_OBJECT_ID);
+    EXPECT_EQ(m->objectTypeQuery(oid), customType);
+}

unittest/vslib/TestRealObjectIdManager.cpp

@@ -108,3 +108,25 @@ TEST(RealObjectIdManager, extensions)
 
     EXPECT_EQ(mgr.objectTypeQuery(0x0380000000), SAI_OBJECT_TYPE_DASH_ACL_GROUP);
 }
+
+TEST(RealObjectIdManager, customTypes)
+{
+    auto sc = std::make_shared<SwitchConfig>(0,"");
+
+    auto scc = std::make_shared<SwitchConfigContainer>();
+
+    scc->insert(sc);
+
+    RealObjectIdManager mgr(0, scc);
+
+    auto sid = mgr.allocateNewSwitchObjectId("");
+
+    EXPECT_NE(sid, SAI_NULL_OBJECT_ID);
+
+    auto customType = (sai_object_type_t)(SAI_OBJECT_TYPE_CUSTOM_RANGE_BASE + 1);
+    auto oid = mgr.allocateNewObjectId(customType, sid);
+
+    EXPECT_NE(oid, SAI_NULL_OBJECT_ID);
+
+    EXPECT_EQ(mgr.objectTypeQuery(oid), customType);
+}