Skip to content

Commit

Permalink
Use new serialize method names (sonic-net#101)
Browse files Browse the repository at this point in the history
  • Loading branch information
@kcudnik
kcudnik authored Oct 25, 2016
1 parent f081975 commit 0da8c02
Show file tree
Hide file tree
Showing 20 changed files with 589 additions and 597 deletions.
6 changes: 2 additions & 4 deletions lib/inc/sai_redis.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,12 @@
#include <set>
#include <unordered_map>

#include "stdint.h"
#include "stdio.h"
//#include "stdint.h"
#include <stdio.h>

extern "C" {
#include "sai.h"
}
#include "meta/saiserialize.h"
#include "meta/saiattributelist.h"
#include "common/redisclient.h"

#include "swss/dbconnector.h"
Expand Down
85 changes: 14 additions & 71 deletions lib/src/sai_redis_generic_create.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "sai_redis.h"
#include "meta/saiserialize.h"
#include "meta/saiattributelist.h"

sai_object_id_t redis_create_virtual_object_id(
_In_ sai_object_type_t object_type)
Expand Down Expand Up @@ -26,35 +28,11 @@ sai_object_id_t redis_create_virtual_object_id(
return objectId;
}

/**
* Routine Description:
* @brief Query sai object type.
*
* Arguments:
* @param[in] sai_object_id
*
* Return Values:
* @return Return SAI_OBJECT_TYPE_NULL when sai_object_id is not valid.
* Otherwise, return a valid sai object type SAI_OBJECT_TYPE_XXX
*/
sai_object_type_t sai_object_type_query(_In_ sai_object_id_t sai_object_id)
{
return (sai_object_type_t)(sai_object_id >> 48);
}

/**
* Routine Description:
* @brief Generic create method
*
* Arguments:
* @param[out] acl_table_id - the the acl table id
* @param[in] attr_count - number of attributes
* @param[in] attr_list - array of attributes
*
* Return Values:
* @return SAI_STATUS_SUCCESS on success
* Failure status code on error
*/
sai_status_t internal_redis_generic_create(
_In_ sai_object_type_t object_type,
_In_ const std::string &serialized_object_id,
Expand Down Expand Up @@ -109,9 +87,7 @@ sai_status_t internal_redis_generic_create(
entry.push_back(null);
}

std::string str_object_type;

sai_serialize_primitive(object_type, str_object_type);
std::string str_object_type = sai_serialize_object_type(object_type);

std::string key = str_object_type + ":" + serialized_object_id;

Expand All @@ -129,19 +105,6 @@ sai_status_t internal_redis_generic_create(
return SAI_STATUS_SUCCESS;
}

/**
* Routine Description:
* @brief Generic create method
*
* Arguments:
* @param[out] acl_table_id - the the acl table id
* @param[in] attr_count - number of attributes
* @param[in] attr_list - array of attributes
*
* Return Values:
* @return SAI_STATUS_SUCCESS on success
* Failure status code on error
*/
sai_status_t redis_generic_create(
_In_ sai_object_type_t object_type,
_Out_ sai_object_id_t* object_id,
Expand All @@ -168,16 +131,13 @@ sai_status_t redis_generic_create(
// on create vid is put in db by syncd
*object_id = redis_create_virtual_object_id(object_type);

std::string str_object_id;
sai_serialize_primitive(*object_id, str_object_id);
std::string str_object_id = sai_serialize_object_id(*object_id);

sai_status_t status = internal_redis_generic_create(
return internal_redis_generic_create(
object_type,
str_object_id,
attr_count,
attr_list);

return status;
}

sai_status_t redis_generic_create_fdb_entry(
Expand All @@ -187,16 +147,13 @@ sai_status_t redis_generic_create_fdb_entry(
{
SWSS_LOG_ENTER();

std::string str_fdb_entry;
sai_serialize_primitive(*fdb_entry, str_fdb_entry);
std::string str_fdb_entry = sai_serialize_fdb_entry(*fdb_entry);

sai_status_t status = internal_redis_generic_create(
return internal_redis_generic_create(
SAI_OBJECT_TYPE_FDB,
str_fdb_entry,
attr_count,
attr_list);

return status;
}

sai_status_t redis_generic_create_neighbor_entry(
Expand All @@ -206,16 +163,13 @@ sai_status_t redis_generic_create_neighbor_entry(
{
SWSS_LOG_ENTER();

std::string str_neighbor_entry;
sai_serialize_neighbor_entry(*neighbor_entry, str_neighbor_entry);
std::string str_neighbor_entry = sai_serialize_neighbor_entry(*neighbor_entry);

sai_status_t status = internal_redis_generic_create(
return internal_redis_generic_create(
SAI_OBJECT_TYPE_NEIGHBOR,
str_neighbor_entry,
attr_count,
attr_list);

return status;
}

sai_status_t redis_generic_create_route_entry(
Expand All @@ -225,36 +179,25 @@ sai_status_t redis_generic_create_route_entry(
{
SWSS_LOG_ENTER();

// vr_id must be valid virtual router id
std::string str_route_entry;
sai_serialize_route_entry(*unicast_route_entry, str_route_entry);
std::string str_route_entry = sai_serialize_route_entry(*unicast_route_entry);

sai_status_t status = internal_redis_generic_create(
return internal_redis_generic_create(
SAI_OBJECT_TYPE_ROUTE,
str_route_entry,
attr_count,
attr_list);

return status;
}

sai_status_t redis_generic_create_vlan(
_In_ sai_vlan_id_t vlan_id)
{
SWSS_LOG_ENTER();

std::string str_vlan_id;
sai_serialize_primitive(vlan_id, str_vlan_id);

// create_vlan have no attributes, but generic method needs one
// so provide count as zero and dummy attribute
sai_attribute_t dummy_attribute;
std::string str_vlan_id = sai_serialize_vlan_id(vlan_id);

sai_status_t status = internal_redis_generic_create(
return internal_redis_generic_create(
SAI_OBJECT_TYPE_VLAN,
str_vlan_id,
0,
&dummy_attribute);

return status;
NULL);
}
87 changes: 21 additions & 66 deletions lib/src/sai_redis_generic_get.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
#include "sai_redis.h"
#include "meta/saiserialize.h"
#include "meta/saiattributelist.h"

// if we don't receive response from syncd in 60 seconds
// there is something wrong and we should fail
Expand All @@ -21,8 +23,7 @@ sai_status_t internal_redis_get_process(

sai_status_t status;

int index = 0;
sai_deserialize_primitive(str_sai_status, index, status);
sai_deserialize_status(str_sai_status, status);

// we could deserialize directly to user data, but list is alocated by deserializer
if (status == SAI_STATUS_SUCCESS)
Expand All @@ -42,19 +43,6 @@ sai_status_t internal_redis_get_process(
return status;
}

/**
* Routine Description:
* @brief Internal set attribute
*
* Arguments:
* @param[in] object_type - type of object
* @param[in] serialized_object_id - serialized object id
* @param[in] attr - attribute to serialize
*
* Return Values:
* @return SAI_STATUS_SUCCESS on success
* Failure status code on error
*/
sai_status_t internal_redis_generic_get(
_In_ sai_object_type_t object_type,
_In_ const std::string &serialized_object_id,
Expand All @@ -71,9 +59,7 @@ sai_status_t internal_redis_generic_get(
attr_list,
false);

std::string str_object_type;

sai_serialize_primitive(object_type, str_object_type);
std::string str_object_type = sai_serialize_object_type(object_type);

std::string key = str_object_type + ":" + serialized_object_id;

Expand Down Expand Up @@ -152,20 +138,6 @@ sai_status_t internal_redis_generic_get(
return SAI_STATUS_FAILURE;
}

/**
* Routine Description:
* @brief Generic get attribute
*
* Arguments:
* @param[in] object_type - the object type
* @param[in] object_id - the object id
* @param[in] attr_count - number of attributes
* @param[out] attr_list - array of attributes
*
* Return Values:
* @return SAI_STATUS_SUCCESS on success
* Failure status code on error
*/
sai_status_t redis_generic_get(
_In_ sai_object_type_t object_type,
_In_ sai_object_id_t object_id,
Expand All @@ -181,16 +153,13 @@ sai_status_t redis_generic_get(
return SAI_STATUS_INVALID_PARAMETER;
}

std::string str_object_id;
sai_serialize_primitive(object_id, str_object_id);
std::string str_object_id = sai_serialize_object_id(object_id);

sai_status_t status = internal_redis_generic_get(
return internal_redis_generic_get(
object_type,
str_object_id,
attr_count,
attr_list);

return status;
}

sai_status_t redis_generic_get_fdb_entry(
Expand All @@ -200,16 +169,13 @@ sai_status_t redis_generic_get_fdb_entry(
{
SWSS_LOG_ENTER();

std::string str_fdb_entry;
sai_serialize_primitive(*fdb_entry, str_fdb_entry);
std::string str_fdb_entry = sai_serialize_fdb_entry(*fdb_entry);

sai_status_t status = internal_redis_generic_get(
return internal_redis_generic_get(
SAI_OBJECT_TYPE_FDB,
str_fdb_entry,
attr_count,
attr_list);

return status;
}

sai_status_t redis_generic_get_neighbor_entry(
Expand All @@ -219,16 +185,13 @@ sai_status_t redis_generic_get_neighbor_entry(
{
SWSS_LOG_ENTER();

std::string str_neighbor_entry;
sai_serialize_neighbor_entry(*neighbor_entry, str_neighbor_entry);
std::string str_neighbor_entry = sai_serialize_neighbor_entry(*neighbor_entry);

sai_status_t status = internal_redis_generic_get(
return internal_redis_generic_get(
SAI_OBJECT_TYPE_NEIGHBOR,
str_neighbor_entry,
attr_count,
attr_list);

return status;
}

sai_status_t redis_generic_get_route_entry(
Expand All @@ -238,16 +201,13 @@ sai_status_t redis_generic_get_route_entry(
{
SWSS_LOG_ENTER();

std::string str_route_entry;
sai_serialize_route_entry(*unicast_route_entry, str_route_entry);
std::string str_route_entry = sai_serialize_route_entry(*unicast_route_entry);

sai_status_t status = internal_redis_generic_get(
return internal_redis_generic_get(
SAI_OBJECT_TYPE_ROUTE,
str_route_entry,
attr_count,
attr_list);

return status;
}

sai_status_t redis_generic_get_vlan(
Expand All @@ -257,28 +217,27 @@ sai_status_t redis_generic_get_vlan(
{
SWSS_LOG_ENTER();

std::string str_vlan_id;
sai_serialize_primitive(vlan_id, str_vlan_id);
std::string str_vlan_id = sai_serialize_vlan_id(vlan_id);

sai_status_t status = internal_redis_generic_get(
return internal_redis_generic_get(
SAI_OBJECT_TYPE_VLAN,
str_vlan_id,
attr_count,
attr_list);

return status;
}

sai_status_t redis_generic_get_trap(
_In_ sai_hostif_trap_id_t hostif_trapid,
_In_ sai_hostif_trap_id_t hostif_trap_id,
_In_ uint32_t attr_count,
_Out_ sai_attribute_t *attr_list)
{
SWSS_LOG_ENTER();

return redis_generic_get(
std::string str_hostif_trap_id = sai_serialize_hostif_trap_id(hostif_trap_id);

return internal_redis_generic_get(
SAI_OBJECT_TYPE_TRAP,
hostif_trapid,
str_hostif_trap_id,
attr_count,
attr_list);
}
Expand All @@ -291,15 +250,11 @@ sai_status_t redis_generic_get_switch(

sai_object_id_t object_id = 0;

std::string str_object_id;
sai_serialize_primitive(object_id, str_object_id);
std::string str_object_id = sai_serialize_object_id(object_id);

sai_status_t status = internal_redis_generic_get(
return internal_redis_generic_get(
SAI_OBJECT_TYPE_SWITCH,
str_object_id,
attr_count,
attr_list);

return status;
}

Loading

0 comments on commit 0da8c02

Please sign in to comment.