Skip to content

Commit

Permalink
Update SAI pointer to latest master
Browse files Browse the repository at this point in the history 
Use SAI_EXTENSIONS_TYPE_MAX

Signed-off-by: Marian Pritsak <marianp@mellanox.com>
  • Loading branch information
@marian-pritsak
marian-pritsak committed Jan 16, 2019
1 parent eb60ec2 commit a1e622f
Show file tree
Hide file tree
Showing 9 changed files with 64 additions and 65 deletions.
2 changes: 1 addition & 1 deletion SAI
Submodule SAI updated 4 files
+3 −0 inc/saitypes.h
+24 −0 meta/saisanitycheck.c
+2 −2 meta/test.pm
+7 −7 test/saithrift/src/switch_sai_rpc_server.cpp
104 changes: 52 additions & 52 deletions lib/inc/sai_redis_internal.h
View file
Expand Up @@ -3,64 +3,64 @@

// object id

#define REDIS_CREATE(OBJECT_TYPE,object_type) \
sai_status_t redis_create_ ## object_type( \
_Out_ sai_object_id_t *object_type ##_id, \
_In_ sai_object_id_t switch_id, \
_In_ uint32_t attr_count, \
_In_ const sai_attribute_t *attr_list) \
{ \
MUTEX(); \
SWSS_LOG_ENTER(); \
return meta_sai_create_oid( \
SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
object_type ## _id, \
switch_id, \
attr_count, \
attr_list, \
&redis_generic_create); \
#define REDIS_CREATE(OBJECT_TYPE,object_type) \
sai_status_t redis_create_ ## object_type( \
_Out_ sai_object_id_t *object_type ##_id, \
_In_ sai_object_id_t switch_id, \
_In_ uint32_t attr_count, \
_In_ const sai_attribute_t *attr_list) \
{ \
MUTEX(); \
SWSS_LOG_ENTER(); \
return meta_sai_create_oid( \
(sai_object_type_t)SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
object_type ## _id, \
switch_id, \
attr_count, \
attr_list, \
&redis_generic_create); \
}

#define REDIS_REMOVE(OBJECT_TYPE,object_type) \
sai_status_t redis_remove_ ## object_type( \
_In_ sai_object_id_t object_type ## _id) \
{ \
MUTEX(); \
SWSS_LOG_ENTER(); \
return meta_sai_remove_oid( \
SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
object_type ## _id, \
&redis_generic_remove); \
#define REDIS_REMOVE(OBJECT_TYPE,object_type) \
sai_status_t redis_remove_ ## object_type( \
_In_ sai_object_id_t object_type ## _id) \
{ \
MUTEX(); \
SWSS_LOG_ENTER(); \
return meta_sai_remove_oid( \
(sai_object_type_t)SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
object_type ## _id, \
&redis_generic_remove); \
}

#define REDIS_SET(OBJECT_TYPE,object_type) \
sai_status_t redis_set_ ##object_type ## _attribute(\
_In_ sai_object_id_t object_type ## _id, \
_In_ const sai_attribute_t *attr) \
{ \
MUTEX(); \
SWSS_LOG_ENTER(); \
return meta_sai_set_oid( \
SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
object_type ## _id, \
attr, \
&redis_generic_set); \
#define REDIS_SET(OBJECT_TYPE,object_type) \
sai_status_t redis_set_ ##object_type ## _attribute( \
_In_ sai_object_id_t object_type ## _id, \
_In_ const sai_attribute_t *attr) \
{ \
MUTEX(); \
SWSS_LOG_ENTER(); \
return meta_sai_set_oid( \
(sai_object_type_t)SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
object_type ## _id, \
attr, \
&redis_generic_set); \
}

#define REDIS_GET(OBJECT_TYPE,object_type) \
sai_status_t redis_get_ ##object_type ## _attribute(\
_In_ sai_object_id_t object_type ## _id, \
_In_ uint32_t attr_count, \
_Inout_ sai_attribute_t *attr_list) \
{ \
MUTEX(); \
SWSS_LOG_ENTER(); \
return meta_sai_get_oid( \
SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
object_type ## _id, \
attr_count, \
attr_list, \
&redis_generic_get); \
#define REDIS_GET(OBJECT_TYPE,object_type) \
sai_status_t redis_get_ ##object_type ## _attribute( \
_In_ sai_object_id_t object_type ## _id, \
_In_ uint32_t attr_count, \
_Inout_ sai_attribute_t *attr_list) \
{ \
MUTEX(); \
SWSS_LOG_ENTER(); \
return meta_sai_get_oid( \
(sai_object_type_t)SAI_OBJECT_TYPE_ ## OBJECT_TYPE, \
object_type ## _id, \
attr_count, \
attr_list, \
&redis_generic_get); \
}

#define REDIS_GENERIC_QUAD(OT,ot) \
Expand Down
4 changes: 2 additions & 2 deletions lib/src/sai_redis_generic_create.cpp
View file
Expand Up @@ -88,7 +88,7 @@ sai_object_type_t sai_object_type_query(

sai_object_type_t ot = (sai_object_type_t)((object_id >> 48) & 0xFF);

if (ot == SAI_OBJECT_TYPE_NULL || ot >= SAI_OBJECT_TYPE_MAX)
if (ot == SAI_OBJECT_TYPE_NULL || ot >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
{
SWSS_LOG_ERROR("invalid object id 0x%lx", object_id);

Expand Down Expand Up @@ -156,7 +156,7 @@ sai_object_id_t redis_create_virtual_object_id(
SWSS_LOG_ENTER();

if ((object_type <= SAI_OBJECT_TYPE_NULL) ||
(object_type >= SAI_OBJECT_TYPE_MAX))
(object_type >= SAI_OBJECT_TYPE_EXTENSIONS_MAX))
{
SWSS_LOG_THROW("invalid objct type: %d", object_type);
}
Expand Down
2 changes: 1 addition & 1 deletion meta/sai_meta.cpp
View file
Expand Up @@ -5533,7 +5533,7 @@ sai_status_t meta_sai_validate_oid(
SWSS_LOG_ENTER();

if (object_type <= SAI_OBJECT_TYPE_NULL ||
object_type >= SAI_OBJECT_TYPE_MAX)
object_type >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
{
SWSS_LOG_ERROR("invalid object type specified: %d, FIXME", object_type);
return SAI_STATUS_INVALID_PARAMETER;
Expand Down
4 changes: 2 additions & 2 deletions meta/saiserialize.cpp
View file
Expand Up @@ -1603,7 +1603,7 @@ std::string sai_serialize_object_meta_key(

std::string key;

if (meta_key.objecttype == SAI_OBJECT_TYPE_NULL || meta_key.objecttype >= SAI_OBJECT_TYPE_MAX)
if (meta_key.objecttype == SAI_OBJECT_TYPE_NULL || meta_key.objecttype >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
{
SWSS_LOG_THROW("invalid object type value %s", sai_serialize_object_type(meta_key.objecttype).c_str());
}
Expand Down Expand Up @@ -2631,7 +2631,7 @@ void sai_deserialize_object_meta_key(

sai_deserialize_object_type(str_object_type, meta_key.objecttype);

if (meta_key.objecttype == SAI_OBJECT_TYPE_NULL || meta_key.objecttype >= SAI_OBJECT_TYPE_MAX)
if (meta_key.objecttype == SAI_OBJECT_TYPE_NULL || meta_key.objecttype >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
{
SWSS_LOG_THROW("invalid object type value %s", sai_serialize_object_type(meta_key.objecttype).c_str());
}
Expand Down
4 changes: 2 additions & 2 deletions meta/tests.cpp
View file
Expand Up @@ -40,7 +40,7 @@ sai_object_type_t sai_object_type_query(
sai_object_type_t objecttype = (sai_object_type_t)((oid >> 48) & 0xFF);

if ((objecttype <= SAI_OBJECT_TYPE_NULL) ||
(objecttype >= SAI_OBJECT_TYPE_MAX))
(objecttype >= SAI_OBJECT_TYPE_EXTENSIONS_MAX))
{
SWSS_LOG_THROW("invalid oid 0x%lx", oid);
}
Expand Down Expand Up @@ -98,7 +98,7 @@ sai_object_id_t create_dummy_object_id(
SWSS_LOG_ENTER();

if ((object_type <= SAI_OBJECT_TYPE_NULL) ||
(object_type >= SAI_OBJECT_TYPE_MAX))
(object_type >= SAI_OBJECT_TYPE_EXTENSIONS_MAX))
{
SWSS_LOG_THROW("invalid objct type: %d", object_type);
}
Expand Down
2 changes: 1 addition & 1 deletion syncd/syncd.cpp
View file
Expand Up @@ -2626,7 +2626,7 @@ sai_status_t processEvent(
* TODO: use metadata utils is object type valid.
*/

if (object_type == SAI_OBJECT_TYPE_NULL || object_type >= SAI_OBJECT_TYPE_MAX)
if (object_type == SAI_OBJECT_TYPE_NULL || object_type >= SAI_OBJECT_TYPE_EXTENSIONS_MAX)
{
SWSS_LOG_THROW("undefined object type %s", sai_serialize_object_type(object_type).c_str());
}
Expand Down
2 changes: 1 addition & 1 deletion syncd/syncd_applyview.cpp
View file
Expand Up @@ -6589,7 +6589,7 @@ void logViewObjectCount(

bool asic_changes = false;

for (int i = SAI_OBJECT_TYPE_NULL + 1; i < SAI_OBJECT_TYPE_MAX; i++)
for (int i = SAI_OBJECT_TYPE_NULL + 1; i < SAI_OBJECT_TYPE_EXTENSIONS_MAX; i++)
{
sai_object_type_t ot = (sai_object_type_t)i;

Expand Down
5 changes: 2 additions & 3 deletions syncd/syncd_hard_reinit.cpp
View file
Expand Up @@ -68,7 +68,7 @@ sai_object_type_t getObjectTypeFromVid(
sai_object_type_t objectType = redis_sai_object_type_query(object_vid);

// TODO metadata is valid object type
if (objectType >= SAI_OBJECT_TYPE_MAX ||
if (objectType >= SAI_OBJECT_TYPE_EXTENSIONS_MAX ||
objectType == SAI_OBJECT_TYPE_NULL)
{
SWSS_LOG_THROW("invalid object type: %s on object id: %s",
Expand Down Expand Up @@ -117,8 +117,7 @@ sai_object_type_t getObjectTypeFromAsicKey(
sai_deserialize_object_type(strObjectType, objectType);

// TODO metadata utils is valid object<F3>:t
if (objectType >= SAI_OBJECT_TYPE_MAX ||
objectType == SAI_OBJECT_TYPE_NULL)
if (objectType >= SAI_OBJECT_TYPE_EXTENSIONS_MAX || objectType == SAI_OBJECT_TYPE_NULL)
{
SWSS_LOG_THROW("invalid object type: %s on asic key: %s",
sai_serialize_object_type(objectType).c_str(),
Expand Down

0 comments on commit a1e622f

Please sign in to comment.