scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 09:17:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Standard attributes now have dedicated handler functions.

Browse Source 
- Add ONIE and Asset get, get_json, free, and show functions.
- Remove the _JSON attribute versions.
This commit is contained in:
Jeffrey Townsend
2018-07-26 01:34:32 +00:00
parent d4ffee8cf0
commit 1706289eeb
3 changed files with 156 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
packages/base/any/onlp/src/onlp/module/inc/onlp/attribute.h
View File

@@ -31,6 +31,8 @@
#include <onlp/oids.h>
#include <onlp/onlp.h>
#include <onlp/stdattrs.h>
#include <AIM/aim_pvs.h>
/**
* @brief Initialize the attribute subsystem.
@@ -75,5 +77,69 @@ int onlp_attribute_free(onlp_oid_t oid, const char* attribute, void* value);
*/
#define ONLP_ATTRIBUTE_EQUALS(_a, _b) (!strcmp(_a, _b))
/******************************************************************************
*
* These functions facilitate access to standard attributes.
*
*****************************************************************************/
/**
* @brief Request the ONIE attribute.
* @param oid The target OID.
* @param [out] rp Receives the ONIE information structure pointer.
*/
int onlp_attribute_onie_info_get(onlp_oid_t oid, onlp_onie_info_t** rp);
/**
* @brief Free an ONIE attribute pointer.
* @param oid The target OID.
* @param p The ONIE attribute pointer.
*/
int onlp_attribute_onie_info_free(onlp_oid_t oid, onlp_onie_info_t* p);
/**
* @brief Request the ONIE attribute in JSON
* @param oid The target OID.
* @param [out] rp Receives the cJSON object.
* @note The cJSON object should be freed after use using cJSON_Delete().
*/
int onlp_attribute_onie_info_get_json(onlp_oid_t oid, cJSON** rp);
/**
* @brief Show the ONIE attribute.
* @param oid The target OID.
* @param pvs The output pvs.
*/
int onlp_attribute_onie_info_show(onlp_oid_t oid, aim_pvs_t* pvs);
/**
* @brief Request the asset attribute.
* @param oid The target oid.
* @param [out] rp Receives the Asset information structure pointer.
*/
int onlp_attribute_asset_info_get(onlp_oid_t oid, onlp_asset_info_t** rp);
/**
* @brief Free an asset attribute pointer.
* @param oid The target oid.
* @param p The asset attribute pointer.
*/
int onlp_attribute_asset_info_free(onlp_oid_t oid, onlp_asset_info_t* p);
/**
* @brief Request the asset attribute in JSON
* @param oid The target oid.
* @param [out] rp Receives the cJSON object.
* @note The cJSON object should be freed after use using cJSON_Delete()
*/
int onlp_attribute_asset_info_get_json(onlp_oid_t oid, cJSON** rp);
/**
* @brief Show the asset attribute.
* @param oid The target oid.
* @param pvs The output pvs.
*/
int onlp_attribute_asset_info_show(onlp_oid_t oid, aim_pvs_t* pvs);
#endif /* __ONLP_ATTRIBUTE_H__ */
/* @} */

10
packages/base/any/onlp/src/onlp/module/inc/onlp/stdattrs.h
View File

@@ -95,11 +95,6 @@ int onlp_asset_info_free(onlp_asset_info_t* aip);
*/
int onlp_asset_info_to_json(onlp_asset_info_t* aip, cJSON** rv);
/**
* You can also request the JSON version representation.
*/
#define ONLP_ATTRIBUTE_ASSET_INFO_JSON "onlp.asset_info_json"
/**
* @brief The ONIE Information Structure can be queried
@@ -110,10 +105,5 @@ int onlp_asset_info_to_json(onlp_asset_info_t* aip, cJSON** rv);
*/
#define ONLP_ATTRIBUTE_ONIE_INFO "onlp.attr.onie_info"
/**
* You can also request the JSON representation.
*/
#define ONLP_ATTRIBUTE_ONIE_INFO_JSON "onlp.attr.onie_info_json"
#endif /* __ONLP_STDATTRS_H__ */
/* @} */

132
packages/base/any/onlp/src/onlp/module/src/attribute.c
View File

@@ -55,12 +55,6 @@ ONLP_LOCKED_API1(onlp_attribute_hw_init, uint32_t, flags)
static int
onlp_attribute_supported_locked__(onlp_oid_t oid, const char* attribute)
{
if(ONLP_ATTRIBUTE_EQUALS(attribute, ONLP_ATTRIBUTE_ONIE_INFO_JSON)) {
attribute = ONLP_ATTRIBUTE_ONIE_INFO;
}
if(ONLP_ATTRIBUTE_EQUALS(attribute, ONLP_ATTRIBUTE_ASSET_INFO_JSON)) {
attribute = ONLP_ATTRIBUTE_ASSET_INFO;
}
return onlp_attributei_supported(oid, attribute);
}
ONLP_LOCKED_API2(onlp_attribute_supported, onlp_oid_t, oid, const char*, attribute)
@@ -88,11 +82,6 @@ ONLP_LOCKED_API3(onlp_attribute_set, onlp_oid_t, oid, const char*, attribute, vo
static int
onlp_attribute_free_locked__(onlp_oid_t oid, const char* attribute, void* value)
{
if(ONLP_ATTRIBUTE_EQUALS(attribute, ONLP_ATTRIBUTE_ONIE_INFO_JSON) ||
ONLP_ATTRIBUTE_EQUALS(attribute, ONLP_ATTRIBUTE_ASSET_INFO_JSON)) {
cJSON_Delete(value);
return 0;
}
return onlp_attributei_free(oid, attribute, value);
}
ONLP_LOCKED_API3(onlp_attribute_free,onlp_oid_t, oid, const char*, attribute, void*, value)
@@ -108,36 +97,95 @@ static int
onlp_attribute_get_locked__(onlp_oid_t oid, const char* attribute,
void** value)
{
int rv;
const char* rattr = attribute;
if(ONLP_ATTRIBUTE_EQUALS(attribute, ONLP_ATTRIBUTE_ONIE_INFO_JSON)) {
rattr = ONLP_ATTRIBUTE_ONIE_INFO;
}
if(ONLP_ATTRIBUTE_EQUALS(attribute, ONLP_ATTRIBUTE_ASSET_INFO_JSON)) {
rattr = ONLP_ATTRIBUTE_ASSET_INFO;
}
rv = onlp_attributei_get(oid, rattr, value);
if(ONLP_FAILURE(rv)) {
return rv;
}
if(ONLP_ATTRIBUTE_EQUALS(attribute, ONLP_ATTRIBUTE_ONIE_INFO_JSON)) {
cJSON* cj;
onlp_onie_info_to_json(*(onlp_onie_info_t**)value, &cj);
onlp_attribute_free_locked__(oid, rattr, *value);
*value = cj;
}
if(ONLP_ATTRIBUTE_EQUALS(attribute, ONLP_ATTRIBUTE_ASSET_INFO_JSON)) {
cJSON* cj;
onlp_asset_info_to_json(*(onlp_asset_info_t**)value, &cj);
onlp_attribute_free_locked__(oid, rattr, *value);
*value = cj;
}
return rv;
return onlp_attributei_get(oid, attribute, value);
}
ONLP_LOCKED_API3(onlp_attribute_get, onlp_oid_t, oid, const char*, attribute, void**, value)
int
onlp_attribute_onie_info_get(onlp_oid_t oid, onlp_onie_info_t** rvp)
{
return onlp_attribute_get(oid,
ONLP_ATTRIBUTE_ONIE_INFO,
(void**)rvp);
}
int
onlp_attribute_onie_info_free(onlp_oid_t oid, onlp_onie_info_t* p)
{
return onlp_attribute_free(oid,
ONLP_ATTRIBUTE_ONIE_INFO,
p);
}
int
onlp_attribute_onie_info_get_json(onlp_oid_t oid, cJSON** rvp)
{
int rv;
onlp_onie_info_t* onie_info;
if(ONLP_SUCCESS(rv = onlp_attribute_onie_info_get(oid, &onie_info))) {
onlp_onie_info_to_json(onie_info, rvp);
onlp_attribute_onie_info_free(oid, onie_info);
}
return rv;
}
int
onlp_attribute_onie_info_show(onlp_oid_t oid, aim_pvs_t* pvs)
{
int rv;
cJSON* cjp = NULL;
if(ONLP_SUCCESS(rv = onlp_attribute_onie_info_get_json(oid, &cjp))) {
cjson_util_yaml_pvs(pvs, cjp);
cJSON_Delete(cjp);
}
else {
aim_printf(pvs, "There was an error requesting the ONIE information from %{onlp_oid}: %{onlp_status}", oid, rv);
}
return rv;
}
int
onlp_attribute_asset_info_get(onlp_oid_t oid, onlp_asset_info_t** rvp)
{
return onlp_attribute_get(oid,
ONLP_ATTRIBUTE_ASSET_INFO,
(void**)rvp);
}
int
onlp_attribute_asset_info_free(onlp_oid_t oid, onlp_asset_info_t* p)
{
return onlp_attribute_free(oid,
ONLP_ATTRIBUTE_ASSET_INFO,
p);
}
int
onlp_attribute_asset_info_get_json(onlp_oid_t oid, cJSON** rvp)
{
int rv;
onlp_asset_info_t* asset_info;
if(ONLP_SUCCESS(rv = onlp_attribute_asset_info_get(oid, &asset_info))) {
onlp_asset_info_to_json(asset_info, rvp);
onlp_attribute_asset_info_free(oid, asset_info);
}
return rv;
}
int
onlp_attribute_asset_info_show(onlp_oid_t oid, aim_pvs_t* pvs)
{
int rv;
cJSON* cjp = NULL;
if(ONLP_SUCCESS(rv = onlp_attribute_asset_info_get_json(oid, &cjp))) {
cjson_util_yaml_pvs(pvs, cjp);
cJSON_Delete(cjp);
}
else {
aim_printf(pvs, "There was an error requesting the asset information from %{onlp_oid}: %{onlp_status}", oid, rv);
}
return rv;
}