Skip to content

fix reprovisioning failure after failing to provision once #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2016
Merged

fix reprovisioning failure after failing to provision once #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 18 additions & 12 deletions src/fdm_register.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,15 +283,16 @@ bool DefineObjectsAtClient(AwaClientSession *session, const OBJECT_T *objects,
}

/**
* @brief Create specified resource with specified value and add it to set operation handler.
* @brief Create specified resource if required, fill it with specified value and add it to set operation handler.
* @param[in] handler A pointer to set operation.
* @param[in] resourcePath The resource path requested for optional resource creation.
* @param[in] value Resource value to set.
* @param[in] type Resource type.
* @param[in] create_resource true if resource needs to be created
* @return true for success otherwise false.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add description for new param

*/
static bool AddResourceToHandler(AwaClientSetOperation *handler, const char *resourcePath,
void *value, AwaResourceType type)
void *value, AwaResourceType type, bool create_resource)
{
AwaInteger *intValue;
AwaOpaque *opaqueValue;
Expand All @@ -306,13 +307,15 @@ static bool AddResourceToHandler(AwaClientSetOperation *handler, const char *res

LOG(LOG_DBG, "Add resource %s to set operation handler", resourcePath);

if (AwaClientSetOperation_CreateOptionalResource(handler, resourcePath)
!= AwaError_Success)
if (create_resource)
{
LOG(LOG_ERR, "Failed to create %s", resourcePath);
return false;
if (AwaClientSetOperation_CreateOptionalResource(handler, resourcePath)
!= AwaError_Success)
{
LOG(LOG_ERR, "Failed to create %s", resourcePath);
return false;
}
}

switch (type)
{
case AwaResourceType_String:
Expand Down Expand Up @@ -370,7 +373,7 @@ bool SetResource(AwaClientSession *session, const char *resourcePath, void *valu
return false;
}

if (AddResourceToHandler(handler, resourcePath, value, type))
if (AddResourceToHandler(handler, resourcePath, value, type, true))
{
if ((error = AwaClientSetOperation_Perform(handler, IPC_TIMEOUT))
== AwaError_Success)
Expand Down Expand Up @@ -474,6 +477,7 @@ bool PopulateFlowObject(AwaClientSession *session, const char *deviceName,
char licenseeIdResourcePath[URL_PATH_SIZE] = {0};
char fcapResourcePath[URL_PATH_SIZE] = {0};
bool status = false;
bool create_resource = false;
AwaError error;

if (session == NULL || deviceName == NULL || deviceType == NULL || fcap == NULL)
Expand Down Expand Up @@ -516,19 +520,21 @@ bool PopulateFlowObject(AwaClientSession *session, const char *deviceName,
LOG(LOG_ERR, "Failed to create flow object instance\nerror: %s",
AwaError_ToString(error));
}
create_resource = true;
}
else
{
LOG(LOG_DBG, "Flow object instance exist");
}

if (AddResourceToHandler(handler, deviceNameResourcePath, (void *)deviceName,
AwaResourceType_String) &&
AwaResourceType_String, create_resource) &&
AddResourceToHandler(handler, deviceTypeResourcePath, (void *)deviceType,
AwaResourceType_String) &&
AddResourceToHandler(handler, fcapResourcePath, (void *)fcap, AwaResourceType_String) &&
AwaResourceType_String, create_resource) &&
AddResourceToHandler(handler, fcapResourcePath, (void *)fcap, AwaResourceType_String,
create_resource) &&
AddResourceToHandler(handler, licenseeIdResourcePath, &licenseeID,
AwaResourceType_Integer))
AwaResourceType_Integer, create_resource))
{
if ((error = AwaClientSetOperation_Perform(handler, IPC_TIMEOUT))
== AwaError_Success)
Expand Down