[ITC][iotcon][ACR-630,631,646][Modified API's name and signature]
authorperforce <perforce@perforce.(none)>
Wed, 8 Jun 2016 08:45:36 +0000 (17:45 +0900)
committerperforce <perforce@perforce.(none)>
Wed, 8 Jun 2016 08:45:36 +0000 (17:45 +0900)
Change-Id: Icc8c302d918d8e04ad81d353f472fcac0c1412d2
Signed-off-by: perforce <perforce@perforce.(none)>
12 files changed:
src/itc/iotcon/ITs-iotcon-common.c
src/itc/iotcon/ITs-iotcon-list.c
src/itc/iotcon/ITs-iotcon-lite-resource.c
src/itc/iotcon/ITs-iotcon-remote-resource.c
src/itc/iotcon/ITs-iotcon-representation.c
src/itc/iotcon/ITs-iotcon-resource.c
src/itc/iotcon/ITs-iotcon-response.c
src/itc/iotcon/ITs-iotcon-state.c
src/itc/iotcon/tct-iotcon-native_common_iot.h
src/itc/iotcon/tct-iotcon-native_mobile.h
src/itc/iotcon/tct-iotcon-native_tv.h
src/itc/iotcon/tct-iotcon-native_wearable.h

index eb5a7d8..3bed913 100755 (executable)
@@ -104,7 +104,7 @@ int icitc_send_ok_response(iotcon_request_h request)
                return 1;
        }
 */
-       ret = iotcon_response_set_representation(response, IOTCON_INTERFACE_DEFAULT, repr);
+       ret = iotcon_response_set_representation(response, repr);
        if (IOTCON_ERROR_NONE != ret) {
                FPRINTF("iotcon_response_set_representation() Fail(%d)", ret);
                iotcon_representation_destroy(repr);
@@ -219,7 +219,7 @@ void IotconDestroyLiteResource(void)
  */
 int IotconCreateLiteResource(void)
 {
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h state = NULL;
        iotcon_resource_types_h light_types = NULL;
 
        IotconDestroyLiteResource();
@@ -235,42 +235,42 @@ int IotconCreateLiteResource(void)
        nRet = iotcon_resource_types_add(light_types, "core.light");
        PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_resource_types_add", IotConGetError(nRet),iotcon_resource_types_destroy(light_types));
 
-       nRet = iotcon_state_create(&state);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet),iotcon_resource_types_destroy(light_types));
+       nRet = iotcon_attributes_create(&state);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet),iotcon_resource_types_destroy(light_types));
        if(state==NULL)
        {
-               FPRINTF("[Line : %d][%s] iotcon_state_create fail states is NULL error returned : \\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] iotcon_attributes_create fail states is NULL error returned : \\n", __LINE__, API_NAMESPACE);
                iotcon_resource_types_destroy(light_types);
                return 1;
        }
                //SHILPA
-       //nRet = iotcon_state_add_int(state, "brightness", ++g_nBrightness);
-        nRet = iotcon_state_add_bool(state, "opened", true);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_int", IotConGetError(nRet),iotcon_state_destroy(state);iotcon_resource_types_destroy(light_types));
+       //nRet = iotcon_attributes_add_int(state, "brightness", ++g_nBrightness);
+        nRet = iotcon_attributes_add_bool(state, "opened", true);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_int", IotConGetError(nRet),iotcon_attributes_destroy(state);iotcon_resource_types_destroy(light_types));
        
        /* register door resource */
        //nRet = iotcon_lite_resource_create("/a/light", light_types,
-                       //(IOTCON_INTERFACE_DEFAULT | IOTCON_INTERFACE_BATCH), state, Iotcon_door_state_changed_cb_p, NULL, &g_hLiteLightResource);
+                       //(IOTCON_INTERFACE_DEFAULT | IOTCON_INTERFACE_BATCH), state, Iotcon_door_attributes_changed_cb_p, NULL, &g_hLiteLightResource);
        
        //iotcon_resource_interfaces_h ifaces;
        
        //nRet = iotcon_resource_interfaces_add(ifaces, IOTCON_INTERFACE_BATCH);
-       //PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_resource_interfaces_add", IotConGetError(nRet),iotcon_state_destroy(state);iotcon_resource_types_destroy(light_types));
+       //PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_resource_interfaces_add", IotConGetError(nRet),iotcon_attributes_destroy(state);iotcon_resource_types_destroy(light_types));
        
-       //nRet = iotcon_lite_resource_create("/a/light", light_types,1, state, Iotcon_door_state_changed_cb_p, NULL, &g_hLiteLightResource);
+       //nRet = iotcon_lite_resource_create("/a/light", light_types,1, state, Iotcon_door_attributes_changed_cb_p, NULL, &g_hLiteLightResource);
        //SHILPA
        nRet = iotcon_lite_resource_create("/a/light", light_types,1, state, NULL, NULL, &g_hLiteLightResource);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_lite_resource_create", IotConGetError(nRet),iotcon_state_destroy(state);iotcon_resource_types_destroy(light_types));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_lite_resource_create", IotConGetError(nRet),iotcon_attributes_destroy(state);iotcon_resource_types_destroy(light_types));
        
        if(g_hLiteLightResource==NULL)
        {
                FPRINTF("[Line : %d][%s] iotcon_lite_resource_create fail g_hLiteLightResource is NULL error returned : \\n", __LINE__, API_NAMESPACE);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                iotcon_resource_types_destroy(light_types);
                return 1;
        }
        
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(state);
        iotcon_resource_types_destroy(light_types);
 
        return 0;
index 47c63b7..d5de8cd 100755 (executable)
@@ -16,7 +16,7 @@
 #include "ITs-iotcon-common.h"
 
 iotcon_representation_h g_hRepr = NULL;
-iotcon_state_h g_hState = NULL;
+iotcon_attributes_h g_hAttributes = NULL;
 
 //& set: Iotcon
 
@@ -125,10 +125,10 @@ bool IotconListListCB(int pos, iotcon_list_h value, void *user_data)
 /**
 * @function            IotconListStateCB
 * @description         Callback Function
-* @parameter           int pos, iotcon_state_h value, void *user_data
+* @parameter           int pos, iotcon_attributes_h value, void *user_data
 * @return                      NA
 */
-bool IotconListStateCB(int pos, iotcon_state_h value, void *user_data)
+bool IotconListStateCB(int pos, iotcon_attributes_h value, void *user_data)
 {
        FPRINTF("[Line : %d][%s] Inside IotconListStateCB callback\\n", __LINE__, API_NAMESPACE);
        if (user_data)
@@ -148,7 +148,7 @@ bool IotconListStateCB(int pos, iotcon_state_h value, void *user_data)
 /**
 * @function            IotconListByteStrCB
 * @description         Callback Function
-* @parameter           int pos, iotcon_state_h value, void *user_data
+* @parameter           int pos, iotcon_attributes_h value, void *user_data
 * @return                      NA
 */
 bool IotconListByteStrCB(int pos, const unsigned char *value, int len, void *user_data)
@@ -207,19 +207,19 @@ void ITs_iotcon_list_startup(void)
                return;
        }
        
-       nRet = iotcon_state_create(&g_hState);
+       nRet = iotcon_attributes_create(&g_hAttributes);
        if ( nRet != IOTCON_ERROR_NONE) 
        {
-               FPRINTF("[Line : %d][%s] iotcon_state_create fail in startup \\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] iotcon_attributes_create fail in startup \\n", __LINE__, API_NAMESPACE);
                iotcon_deinitialize();
                g_bIotconConnect = false;
                return;
        }
-       if(g_hState == NULL)
+       if(g_hAttributes == NULL)
        {
                iotcon_deinitialize();
                g_bIotconConnect = false;
-               FPRINTF("[Line : %d][%s] g_hState is NULL\\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] g_hAttributes is NULL\\n", __LINE__, API_NAMESPACE);
                return;
        }
     
@@ -227,18 +227,18 @@ void ITs_iotcon_list_startup(void)
        if ( nRet != IOTCON_ERROR_NONE)  
        {
                FPRINTF("[Line : %d][%s] iotcon_representation_create fail in startup \\n", __LINE__, API_NAMESPACE);
-               iotcon_state_destroy(g_hState);
-               g_hState = NULL;
+               iotcon_attributes_destroy(g_hAttributes);
+               g_hAttributes = NULL;
                iotcon_deinitialize();
                g_bIotconConnect = false;
                return;
        }
        if(g_hRepr == NULL)
        {
-               iotcon_state_destroy(g_hState);
+               iotcon_attributes_destroy(g_hAttributes);
                iotcon_deinitialize();
                g_bIotconConnect = false;
-               g_hState = NULL;
+               g_hAttributes = NULL;
                FPRINTF("[Line : %d][%s] g_hRepr is NULL\\n", __LINE__, API_NAMESPACE);
                return;
        }
@@ -261,8 +261,8 @@ void ITs_iotcon_list_cleanup(void)
        if(g_hRepr)
                iotcon_representation_destroy(g_hRepr);
        
-       if (g_hState
-               iotcon_state_destroy(g_hState);
+       if (g_hAttributes
+               iotcon_attributes_destroy(g_hAttributes);
        
        if (g_bIotconConnect)
                iotcon_deinitialize();
@@ -298,7 +298,7 @@ int ITc_iotcon_list_create_destroy_p(void)
        int nRet = 0;
        iotcon_list_h hList = NULL;
        iotcon_type_e eSetIconType [] = { IOTCON_TYPE_INT, IOTCON_TYPE_BOOL, 
-       IOTCON_TYPE_DOUBLE, IOTCON_TYPE_STR, IOTCON_TYPE_NULL,  IOTCON_TYPE_LIST, IOTCON_TYPE_STATE};
+       IOTCON_TYPE_DOUBLE, IOTCON_TYPE_STR, IOTCON_TYPE_NULL,  IOTCON_TYPE_LIST, IOTCON_TYPE_ATTRIBUTES};
 
        int nEnumSize = sizeof(eSetIconType) / sizeof(eSetIconType[0]);
        int nEnumCounter = 0;
@@ -697,51 +697,51 @@ int ITc_iotcon_list_add_get_nth_list_p(void)
 //& type: auto
 //& purpose:  scenario to add state value and get nth state value from the iotcon list
 /**
-* @testcase                    ITc_iotcon_list_add_get_nth_state_p
+* @testcase                    ITc_iotcon_list_add_get_nth_attributes_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
 * @description                 scenario to add state value and get nth state value from the iotcon list
 * @scenario                            create list \n
-*                                              iotcon_list_add_state \n
-*                                              iotcon_list_get_nth_state\n
+*                                              iotcon_list_add_attributes \n
+*                                              iotcon_list_get_nth_attributes\n
 *                                              destroy list
-* @apicovered                  iotcon_list_create,iotcon_list_get_nth_state,iotcon_list_add_state, iotcon_list_destroy
-* @passcase                            if iotcon_list_add_state and iotcon_list_get_nth_state passes
-* @failcase                            if iotcon_list_add_state or iotcon_list_get_nth_state fails
+* @apicovered                  iotcon_list_create,iotcon_list_get_nth_attributes,iotcon_list_add_attributes, iotcon_list_destroy
+* @passcase                            if iotcon_list_add_attributes and iotcon_list_get_nth_attributes passes
+* @failcase                            if iotcon_list_add_attributes or iotcon_list_get_nth_attributes fails
 * @precondition                        iotcon should be connected & create list
 * @postcondition               iotcon should be disconnected & destroy list
 */
-int ITc_iotcon_list_add_get_nth_state_p(void)
+int ITc_iotcon_list_add_get_nth_attributes_p(void)
 {
        START_TEST;
        
-       iotcon_state_h hState = NULL;
+       iotcon_attributes_h hState = NULL;
        iotcon_list_h hList = NULL;
 
-       int nRet = iotcon_list_create(IOTCON_TYPE_STATE,&hList);
+       int nRet = iotcon_list_create(IOTCON_TYPE_ATTRIBUTES,&hList);
        PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet));
        CHECK_HANDLE(hList,"iotcon_list_create");
 
-       nRet = iotcon_state_create(&hState);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet),iotcon_list_destroy(hList));
-       CHECK_HANDLE(hState,"iotcon_state_create");
+       nRet = iotcon_attributes_create(&hState);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet),iotcon_list_destroy(hList));
+       CHECK_HANDLE(hState,"iotcon_attributes_create");
 
-       nRet = iotcon_list_add_state(hList, hState, VAL1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_state", IotConGetError(nRet),iotcon_list_destroy(hList); iotcon_state_destroy(hState));
+       nRet = iotcon_list_add_attributes(hList, hState, VAL1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_attributes", IotConGetError(nRet),iotcon_list_destroy(hList); iotcon_attributes_destroy(hState));
        
-       nRet = iotcon_list_get_nth_state(hList, VAL1, &hState);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_get_nth_state", IotConGetError(nRet),iotcon_list_destroy(hList); iotcon_state_destroy(hState));
+       nRet = iotcon_list_get_nth_attributes(hList, VAL1, &hState);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_get_nth_attributes", IotConGetError(nRet),iotcon_list_destroy(hList); iotcon_attributes_destroy(hState));
                
        if( hState == NULL )
        {
-               FPRINTF("[Line : %d][%s] iotcon_list_get_nth_state failed, error returned = Invalid output parameter\\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] iotcon_list_get_nth_attributes failed, error returned = Invalid output parameter\\n", __LINE__, API_NAMESPACE);
                iotcon_list_destroy(hList);
                return 1;
        }
                
-       iotcon_state_destroy(hState);
+       iotcon_attributes_destroy(hState);
        hState = NULL;
        
        if(hList)
@@ -763,10 +763,10 @@ int ITc_iotcon_list_add_get_nth_state_p(void)
 * @since_tizen                         3.0
 * @description                 scenario to removes the value at the given position
 * @scenario                            create list and state \n
-*                                              iotcon_list_add_state \n
+*                                              iotcon_list_add_attributes \n
 *                                              iotcon_list_remove_nth\n
 *                                              destroy list
-* @apicovered                  iotcon_list_create,iotcon_state_create,iotcon_list_add_state,iotcon_list_remove_nth,iotcon_state_destroy,iotcon_list_destroy
+* @apicovered                  iotcon_list_create,iotcon_attributes_create,iotcon_list_add_attributes,iotcon_list_remove_nth,iotcon_attributes_destroy,iotcon_list_destroy
 * @passcase                            if iotcon_list_remove_nth passes
 * @failcase                            if iotcon_list_remove_nth fails
 * @precondition                        iotcon should be connected & create list
@@ -786,7 +786,7 @@ int ITc_iotcon_list_remove_nth_p(void)
     for (i = 0; i < nTotal; i++) 
     {
         nRet = iotcon_list_add_int(hList, i, -1);
-        PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_state", IotConGetError(nRet),iotcon_list_destroy(hList));
+        PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_attributes", IotConGetError(nRet),iotcon_list_destroy(hList));
     }
 
     for (i = nTotal-1; 0 <= i; i--) {
@@ -1259,61 +1259,61 @@ int ITc_iotcon_list_foreach_list_p(void)
 //& type: auto
 //& purpose:  scenario to gets all state values of the given list by invoking the callback function.
 /**
-* @testcase                    ITc_iotcon_list_foreach_state_p
+* @testcase                    ITc_iotcon_list_foreach_attributes_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
 * @description                 scenario to gets all state values of the given list by invoking the callback function.
 * @scenario                            create list and state\n
-*                                              iotcon_list_add_state \n
-*                                              iotcon_list_foreach_state\n
+*                                              iotcon_list_add_attributes \n
+*                                              iotcon_list_foreach_attributes\n
 *                                              destroy list
-* @apicovered                  iotcon_list_create,iotcon_list_foreach_state,iotcon_list_add_state, iotcon_list_destroy
-* @passcase                            if iotcon_list_foreach_state passes
-* @failcase                            if iotcon_list_foreach_state fails
+* @apicovered                  iotcon_list_create,iotcon_list_foreach_attributes,iotcon_list_add_attributes, iotcon_list_destroy
+* @passcase                            if iotcon_list_foreach_attributes passes
+* @failcase                            if iotcon_list_foreach_attributes fails
 * @precondition                        iotcon should be connected & create list
 * @postcondition               iotcon should be disconnected & destroy list
 */
-int ITc_iotcon_list_foreach_state_p(void)
+int ITc_iotcon_list_foreach_attributes_p(void)
 {
        START_TEST;
        
        int nCount = 0;
-       iotcon_state_h hState1, hState2;
+       iotcon_attributes_h hState1, hState2;
        g_bCheckCb = false;
        
        iotcon_list_h hList = NULL;
        
-       int nRet = iotcon_list_create(IOTCON_TYPE_STATE,&hList);
+       int nRet = iotcon_list_create(IOTCON_TYPE_ATTRIBUTES,&hList);
        PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet));
        CHECK_HANDLE(hList,"iotcon_list_create");
 
-       nRet = iotcon_state_create(&hState1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet),iotcon_list_destroy(hList));
-       CHECK_HANDLE(hState1,"iotcon_state_create");
+       nRet = iotcon_attributes_create(&hState1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet),iotcon_list_destroy(hList));
+       CHECK_HANDLE(hState1,"iotcon_attributes_create");
 
-       nRet = iotcon_state_create(&hState2);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet),iotcon_state_destroy(hState1);iotcon_list_destroy(hList));
-       CHECK_HANDLE(hState2,"iotcon_state_create");
+       nRet = iotcon_attributes_create(&hState2);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet),iotcon_attributes_destroy(hState1);iotcon_list_destroy(hList));
+       CHECK_HANDLE(hState2,"iotcon_attributes_create");
 
-       nRet = iotcon_list_add_state(hList, hState1, VAL1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_state", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1);iotcon_list_destroy(hList));
+       nRet = iotcon_list_add_attributes(hList, hState1, VAL1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_attributes", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1);iotcon_list_destroy(hList));
 
-       nRet = iotcon_list_add_state(hList, hState2, VAL2);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_state", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1);iotcon_list_destroy(hList));
+       nRet = iotcon_list_add_attributes(hList, hState2, VAL2);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_attributes", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1);iotcon_list_destroy(hList));
 
-       nRet = iotcon_list_foreach_state(hList, IotconListStateCB, &nCount);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_foreach_state", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1);iotcon_list_destroy(hList));
+       nRet = iotcon_list_foreach_attributes(hList, IotconListStateCB, &nCount);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_foreach_attributes", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1);iotcon_list_destroy(hList));
        
        
        
        if(g_bCheckCb == false)
        {
                FPRINTF("[Line : %d][%s] callback not invoked : \\n", __LINE__, API_NAMESPACE );
-               iotcon_state_destroy(hState2);
+               iotcon_attributes_destroy(hState2);
                hState2 = NULL;
-               iotcon_state_destroy(hState1);
+               iotcon_attributes_destroy(hState1);
                hState1 = NULL;
                iotcon_list_destroy(hList);
                hList = NULL;           
@@ -1323,16 +1323,16 @@ int ITc_iotcon_list_foreach_state_p(void)
        if (2 != nCount) 
        {
                FPRINTF("[Line : %d][%s] value mismatch  : \\n", __LINE__, API_NAMESPACE );
-               iotcon_state_destroy(hState2);hState2 = NULL;
-               iotcon_state_destroy(hState1);hState1 = NULL;
+               iotcon_attributes_destroy(hState2);hState2 = NULL;
+               iotcon_attributes_destroy(hState1);hState1 = NULL;
                iotcon_list_destroy(hList);
                hList = NULL;           
                return 1;
        }
        
-       iotcon_state_destroy(hState2);
+       iotcon_attributes_destroy(hState2);
        hState2 = NULL;
-       iotcon_state_destroy(hState1);
+       iotcon_attributes_destroy(hState1);
        hState1 = NULL;
        
        if(hList)
@@ -1354,10 +1354,10 @@ int ITc_iotcon_list_foreach_state_p(void)
 * @since_tizen                         3.0
 * @description                 scenario to gets all state values of the given list by invoking the callback function.
 * @scenario                            create list and state\n
-*                                              iotcon_list_add_state \n
-*                                              iotcon_list_foreach_state\n
+*                                              iotcon_list_add_attributes \n
+*                                              iotcon_list_foreach_attributes\n
 *                                              destroy list
-* @apicovered                  iotcon_list_create,iotcon_list_add_byte_str,iotcon_list_add_state, iotcon_list_destroy
+* @apicovered                  iotcon_list_create,iotcon_list_add_byte_str,iotcon_list_add_attributes, iotcon_list_destroy
 * @passcase                            if iotcon_list_add_byte_str passes
 * @failcase                            if iotcon_list_add_byte_str fails
 * @precondition                        iotcon should be connected & create list
@@ -1394,10 +1394,10 @@ int ITc_iotcon_list_add_byte_str_p(void)
 * @since_tizen                         3.0
 * @description                 scenario to gets all state values of the given list by invoking the callback function.
 * @scenario                            create list and state\n
-*                                              iotcon_list_add_state \n
+*                                              iotcon_list_add_attributes \n
 *                                              iotcon_list_get_nth_byte_str\n
 *                                              destroy list
-* @apicovered                  iotcon_list_create,iotcon_list_get_nth_byte_str,iotcon_list_add_state, iotcon_list_destroy
+* @apicovered                  iotcon_list_create,iotcon_list_get_nth_byte_str,iotcon_list_add_attributes, iotcon_list_destroy
 * @passcase                            if iotcon_list_get_nth_byte_str passes
 * @failcase                            if iotcon_list_get_nth_byte_str fails
 * @precondition                        iotcon should be connected & create list
@@ -1446,10 +1446,10 @@ int ITc_iotcon_list_get_nth_byte_str_p(void)
 * @since_tizen                         3.0
 * @description                 scenario to gets all state values of the given list by invoking the callback function.
 * @scenario                            create list and state\n
-*                                              iotcon_list_add_state \n
+*                                              iotcon_list_add_attributes \n
 *                                              ITc_iotcon_list_foreach_byte_str_p\n
 *                                              destroy list
-* @apicovered                  iotcon_list_create,ITc_iotcon_list_foreach_byte_str_p,iotcon_list_add_state, iotcon_list_destroy
+* @apicovered                  iotcon_list_create,ITc_iotcon_list_foreach_byte_str_p,iotcon_list_add_attributes, iotcon_list_destroy
 * @passcase                            if ITc_iotcon_list_foreach_byte_str_p passes
 * @failcase                            if ITc_iotcon_list_foreach_byte_str_p fails
 * @precondition                        iotcon should be connected & create list
index 81049c9..4c3efae 100755 (executable)
@@ -101,7 +101,7 @@ void ITs_iotcon_lite_resource_cleanup(void)
 * @description                 create and destroy iotcon lite resource.
 * @scenario                            create iotcon resource\n
 *                                              destroy iotcon resource\n
-* @apicovered                  iotcon_lite_resource_create, iotcon_lite_resource_destroy,iotcon_resource_types_create,iotcon_state_create,iotcon_state_add_int,iotcon_state_destroy,iotcon_resource_types_destroy
+* @apicovered                  iotcon_lite_resource_create, iotcon_lite_resource_destroy,iotcon_resource_types_create,iotcon_attributes_create,iotcon_attributes_add_int,iotcon_attributes_destroy,iotcon_resource_types_destroy
 * @passcase                            if iotcon_lite_resource_create and iotcon_lite_resource_destroy passes
 * @failcase                            if iotcon_lite_resource_create or iotcon_lite_resource_destroy fails
 * @precondition                        NA
@@ -126,7 +126,7 @@ int ITc_iotcon_lite_resource_create_destroy_p(void)
 //& type: auto
 //& purpose: scenario to update lite resource state of iotcon.
 /**
-* @testcase                    ITc_iotcon_lite_resource_update_state_p
+* @testcase                    ITc_iotcon_lite_resource_update_attributes_p
 * @author              SRID(mohit.kr)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
@@ -136,35 +136,35 @@ int ITc_iotcon_lite_resource_create_destroy_p(void)
 *                                              create state iotcon resource \n
 *                                              add state iotcon resource \n
 *                                              update state iotcon resource \n 
-* @apicovered                  iotcon_state_add_int, iotcon_lite_resource_update_state, iotcon_state_destroy
-* @passcase                            if  iotcon_lite_resource_update_state passes
-* @failcase                            if iotcon_lite_resource_update_state fails
+* @apicovered                  iotcon_attributes_add_int, iotcon_lite_resource_update_attributes, iotcon_attributes_destroy
+* @passcase                            if  iotcon_lite_resource_update_attributes passes
+* @failcase                            if iotcon_lite_resource_update_attributes fails
 * @precondition                        NA
 * @postcondition               NA
 */
-int ITc_iotcon_lite_resource_update_state_p(void)
+int ITc_iotcon_lite_resource_update_attributes_p(void)
 {
        START_TEST;
        int nRet;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h state = NULL;
 
        IotconCreateLiteResource();
-       nRet = iotcon_state_create(&state);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet));
+       nRet = iotcon_attributes_create(&state);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet));
        if(state==NULL)
        {
-               FPRINTF("[Line : %d][%s] iotcon_state_create fail states is NULL error returned : \\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] iotcon_attributes_create fail states is NULL error returned : \\n", __LINE__, API_NAMESPACE);
                IotconDestroyLiteResource();
                return 1;
        }
        
-       nRet = iotcon_state_add_int(state, LITE_RESOURCE_BR, ++g_nBrightness);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_int", IotConGetError(nRet));
+       nRet = iotcon_attributes_add_int(state, LITE_RESOURCE_BR, ++g_nBrightness);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_int", IotConGetError(nRet));
 
-       nRet = iotcon_lite_resource_update_state(g_hLiteLightResource, state);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_lite_resource_update_state", IotConGetError(nRet));
+       nRet = iotcon_lite_resource_update_attributes(g_hLiteLightResource, state);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_lite_resource_update_attributes", IotConGetError(nRet));
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(state);
        IotconDestroyLiteResource();
 
        return 0;
@@ -174,7 +174,7 @@ int ITc_iotcon_lite_resource_update_state_p(void)
 //& type: auto
 //& purpose: scenario to update lite resource state of iotcon.
 /**
-* @testcase                    ITc_iotcon_lite_resource_get_state_p
+* @testcase                    ITc_iotcon_lite_resource_get_attributes_p
 * @author              SRID(mohit.kr)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
@@ -183,24 +183,24 @@ int ITc_iotcon_lite_resource_update_state_p(void)
 * @scenario                            create iotcon resource \n
 *                                              create state iotcon resource \n
 *                                              get state iotcon resource \n
-* @apicovered                  iotcon_lite_resource_get_state
-* @passcase                            if  iotcon_lite_resource_get_state passes
-* @failcase                            if iotcon_lite_resource_get_state fails
+* @apicovered                  iotcon_lite_resource_get_attributes
+* @passcase                            if  iotcon_lite_resource_get_attributes passes
+* @failcase                            if iotcon_lite_resource_get_attributes fails
 * @precondition                        NA
 * @postcondition               NA
 */
-int ITc_iotcon_lite_resource_get_state_p(void)
+int ITc_iotcon_lite_resource_get_attributes_p(void)
 {
        START_TEST;
        int nRet;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h state = NULL;
 
        IotconCreateLiteResource();
-       nRet = iotcon_lite_resource_get_state(g_hLiteLightResource, &state);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_lite_resource_update_state", IotConGetError(nRet));
+       nRet = iotcon_lite_resource_get_attributes(g_hLiteLightResource, &state);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_lite_resource_update_attributes", IotConGetError(nRet));
        if(state==NULL)
        {
-               FPRINTF("[Line : %d][%s] iotcon_state_create fail states is NULL error returned : \\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] iotcon_attributes_create fail states is NULL error returned : \\n", __LINE__, API_NAMESPACE);
                IotconDestroyLiteResource();
                return 1;
        }
index 9d69025..678a0ba 100755 (executable)
@@ -44,29 +44,29 @@ static bool g_found;
 */
 static void Iotcon_update_lite_resource(void)
 {
-       iotcon_state_h state = NULL;
-
-       int ret = iotcon_state_create(&state);
-       if (IOTCON_ERROR_NONE != ret)
+       iotcon_attributes_h state = NULL;
+   
+       int ret = iotcon_attributes_create(&state);
+       if (IOTCON_ERROR_NONE != ret) 
        {
-               FPRINTF("[Line : %d][%s] iotcon_state_create fail\\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] iotcon_attributes_create fail\\n", __LINE__, API_NAMESPACE);
                return;
        }
-       ret = iotcon_state_add_int(state, "int", ++g_brightness);
-       if (IOTCON_ERROR_NONE != ret)
+       ret = iotcon_attributes_add_int(state, "int", ++g_brightness);
+       if (IOTCON_ERROR_NONE != ret) 
        {
-               FPRINTF("[Line : %d][%s] iotcon_state_add_int fail\\n", __LINE__, API_NAMESPACE);
-               iotcon_state_destroy(state);
+               FPRINTF("[Line : %d][%s] iotcon_attributes_add_int fail\\n", __LINE__, API_NAMESPACE);
+               iotcon_attributes_destroy(state);
                return;
        }
-       ret = iotcon_lite_resource_update_state(g_hLiteLightResource, state);
-       if (IOTCON_ERROR_NONE != ret)
+       ret = iotcon_lite_resource_update_attributes(g_hLiteLightResource, state);
+       if (IOTCON_ERROR_NONE != ret) 
        {
-               FPRINTF("[Line : %d][%s] iotcon_lite_resource_update_state fail\\n", __LINE__, API_NAMESPACE);
-               iotcon_state_destroy(state);
-               return;
+               FPRINTF("[Line : %d][%s] iotcon_lite_resource_update_attributes fail\\n", __LINE__, API_NAMESPACE);
+               iotcon_attributes_destroy(state);
+               return; 
        }
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(state);
        return;
 }
 
@@ -1622,24 +1622,24 @@ int ITc_iotcon_remote_resource_get_interfaces_p(void)
 * @precondition                        NA
 * @postcondition               NA
 */
-int ITc_iotcon_remote_resource_get_properties_p(void)
+int ITc_iotcon_remote_resource_get_policies_p(void)
 {
        START_TEST;
 
-       int properties;
-
+       uint8_t properties;
+    
        int nRet = IotconCreateRemoteResource();
     if (IOTCON_ERROR_NONE != nRet)
        {
                FPRINTF("[Line : %d][%s] IotconCreateRemoteResource failed : %s\\n", __LINE__, API_NAMESPACE,IotConGetError(nRet));
                return 1;
        }
-       nRet = iotcon_remote_resource_get_properties(g_hClient, &properties);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_remote_resource_get_properties", IotConGetError(nRet), IotconDestroyRemoteResource());
+       nRet = iotcon_remote_resource_get_policies(g_hClient, &properties);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_remote_resource_get_policies", IotConGetError(nRet), IotconDestroyRemoteResource());
 
        if (false == (IOTCON_RESOURCE_OBSERVABLE & properties))
        {
-               FPRINTF("[Line : %d][%s] iotcon_remote_resource_get_properties failed\\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] iotcon_remote_resource_get_policies failed\\n", __LINE__, API_NAMESPACE);
                IotconDestroyRemoteResource();
                return 1;
        }
index 8d21ccf..4585abf 100755 (executable)
@@ -296,53 +296,53 @@ int ITc_iotcon_representation_set_get_resource_interfaces_p(void)
 }
 
 /**
-* @testcase                    ITc_iotcon_representation_set_get_state_p
+* @testcase                    ITc_iotcon_representation_set_get_attributes_p
 * @author              SRID(abhishek.y)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
 * @description                 scenario to set state and get state for representation
 * @scenario                            set state and get state for representation \n
-* @apicovered                  iotcon_representation_set_state,iotcon_representation_get_state
-* @passcase                            When iotcon_representation_set_state and iotcon_representation_get_state are successful.
-* @failcase                            If target API iotcon_representation_get_state and iotcon_representation_set_state or any precondition API fails.
+* @apicovered                  iotcon_representation_set_attributes,iotcon_representation_get_attributes
+* @passcase                            When iotcon_representation_set_attributes and iotcon_representation_get_attributes are successful.
+* @failcase                            If target API iotcon_representation_get_attributes and iotcon_representation_set_attributes or any precondition API fails.
 * @precondition                        NA
 * @postcondition               NA
 */
 
-int ITc_iotcon_representation_set_get_state_p(void)
+int ITc_iotcon_representation_set_get_attributes_p(void)
 {
        START_TEST;
        int ret;
-       iotcon_state_h hSetState=NULL;
-       iotcon_state_h hGetState=NULL;
+       iotcon_attributes_h hSetAttributes=NULL;
+       iotcon_attributes_h hGetState=NULL;
        int value = 10;
-       ret = iotcon_state_create(&hSetState);
-       PRINT_RESULT(IOTCON_ERROR_NONE, ret, "iotcon_state_create", IotConGetError(ret));
-       CHECK_HANDLE(hSetState,"iotcon_state_create");
+       ret = iotcon_attributes_create(&hSetAttributes);
+       PRINT_RESULT(IOTCON_ERROR_NONE, ret, "iotcon_attributes_create", IotConGetError(ret));
+       CHECK_HANDLE(hSetAttributes,"iotcon_attributes_create");
 
-       ret = iotcon_state_add_int(hSetState, REPRESENTATION_KEY, value);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, ret, "iotcon_state_add_int", IotConGetError(ret),iotcon_state_destroy(hSetState));
+       ret = iotcon_attributes_add_int(hSetAttributes, REPRESENTATION_KEY, value);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, ret, "iotcon_attributes_add_int", IotConGetError(ret),iotcon_attributes_destroy(hSetAttributes));
 
-       ret = iotcon_representation_set_state(g_hRepresentation, hSetState);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, ret, "iotcon_representation_set_state", IotConGetError(ret),iotcon_state_destroy(hSetState));
+       ret = iotcon_representation_set_attributes(g_hRepresentation, hSetAttributes);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, ret, "iotcon_representation_set_attributes", IotConGetError(ret),iotcon_attributes_destroy(hSetAttributes));
 
-       ret = iotcon_representation_get_state(g_hRepresentation, &hGetState);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, ret, "iotcon_representation_get_state", IotConGetError(ret),iotcon_state_destroy(hSetState));
+       ret = iotcon_representation_get_attributes(g_hRepresentation, &hGetState);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, ret, "iotcon_representation_get_attributes", IotConGetError(ret),iotcon_attributes_destroy(hSetAttributes));
        if (hGetState == NULL )
        {
                FPRINTF("[Line : %d][%s] Handle to hGetState object is returned NULL \n", __LINE__, API_NAMESPACE);
-               iotcon_state_destroy(hSetState);
+               iotcon_attributes_destroy(hSetAttributes);
                return 1;       
        }
-       if(hSetState != hGetState)
+       if(hSetAttributes != hGetState)
        {
                FPRINTF("[Line : %d][%s] Values of set get state not matched!!!\\n", __LINE__, API_NAMESPACE);
-               iotcon_state_destroy(hSetState);
+               iotcon_attributes_destroy(hSetAttributes);
         return 1;
        }
        
-       iotcon_state_destroy(hSetState);
+       iotcon_attributes_destroy(hSetAttributes);
     return 0;
 }
 
index 3c41bba..b3e44da 100755 (executable)
@@ -48,112 +48,112 @@ static iotcon_remote_resource_h g_hRemoteResource;
 /**
 * @function            CreateState
 * @description         Called to create iotcon state handle
-* @parameter           iotcon_state_h : The state handle
+* @parameter           iotcon_attributes_h : The state handle
 * @return                      int
 */
-static int CreateState(iotcon_state_h *state_h)
+static int CreateState(iotcon_attributes_h *state_h)
 {
        int nRet;
-       iotcon_state_h state, val_state;
+       iotcon_attributes_h state, val_attributes;
        unsigned char byte_str[3] = {70, 71, 72};
        iotcon_list_h list1, list2, list3, list4, list5, list6, list7;
 
-       nRet = iotcon_state_create(&state);
+       nRet = iotcon_attributes_create(&state);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_create() Fail(%d)", nRet);
+               FPRINTF("iotcon_attributes_create() Fail(%d)", nRet);
                return nRet;
        }
 
-       nRet = iotcon_state_add_int(state, "int", 1);
+       nRet = iotcon_attributes_add_int(state, "int", 1);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_int() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_attributes_add_int() Fail(%d)", nRet);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_bool(state, "bool", true);
+       nRet = iotcon_attributes_add_bool(state, "bool", true);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_bool() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_attributes_add_bool() Fail(%d)", nRet);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_double(state, "double", 1.1);
+       nRet = iotcon_attributes_add_double(state, "double", 1.1);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_double() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_attributes_add_double() Fail(%d)", nRet);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_null(state, "null");
+       nRet = iotcon_attributes_add_null(state, "null");
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_null() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_attributes_add_null() Fail(%d)", nRet);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_str(state, "str", "string");
+       nRet = iotcon_attributes_add_str(state, "str", "string");
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_str() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_attributes_add_str() Fail(%d)", nRet);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_byte_str(state, "bytestr", byte_str, 3);
+       nRet = iotcon_attributes_add_byte_str(state, "bytestr", byte_str, 3);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_byte_str() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_attributes_add_byte_str() Fail(%d)", nRet);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
        /* state */
-       nRet = iotcon_state_create(&val_state);
+       nRet = iotcon_attributes_create(&val_attributes);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_create() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_attributes_create() Fail(%d)", nRet);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_int(val_state, "val_state", 10);
+       nRet = iotcon_attributes_add_int(val_attributes, "val_attributes", 10);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_int() Fail(%d)", nRet);
-               iotcon_state_destroy(val_state);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_attributes_add_int() Fail(%d)", nRet);
+               iotcon_attributes_destroy(val_attributes);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_state(state, "state", val_state);
+       nRet = iotcon_attributes_add_attributes(state, "state", val_attributes);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_state() Fail(%d)", nRet);
-               iotcon_state_destroy(val_state);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_attributes_add_attributes() Fail(%d)", nRet);
+               iotcon_attributes_destroy(val_attributes);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
        /* state list */
-       nRet = iotcon_list_create(IOTCON_TYPE_STATE, &list6);
+       nRet = iotcon_list_create(IOTCON_TYPE_ATTRIBUTES, &list6);
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_create() Fail(%d)", nRet);
-               iotcon_state_destroy(val_state);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(val_attributes);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_list_add_state(list6, val_state, -1);
+       nRet = iotcon_list_add_attributes(list6, val_attributes, -1);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_list_add_state() Fail(%d)", nRet);
+               FPRINTF("iotcon_list_add_attributes() Fail(%d)", nRet);
                iotcon_list_destroy(list6);
-               iotcon_state_destroy(val_state);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(val_attributes);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
-       iotcon_state_destroy(val_state);
+       iotcon_attributes_destroy(val_attributes);
 
-       nRet = iotcon_state_add_list(state, "state_list", list6);
+       nRet = iotcon_attributes_add_list(state, "state_list", list6);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_list() Fail(%d)", nRet);
+               FPRINTF("iotcon_attributes_add_list() Fail(%d)", nRet);
                iotcon_list_destroy(list6);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
        iotcon_list_destroy(list6);
@@ -162,7 +162,7 @@ static int CreateState(iotcon_state_h *state_h)
        nRet = iotcon_list_create(IOTCON_TYPE_INT, &list1);
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_create() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
@@ -170,15 +170,15 @@ static int CreateState(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_add_int() Fail(%d)", nRet);
                iotcon_list_destroy(list1);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_list(state, "int_list", list1);
+       nRet = iotcon_attributes_add_list(state, "int_list", list1);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_list() Fail(%d)", nRet);
+               FPRINTF("iotcon_attributes_add_list() Fail(%d)", nRet);
                iotcon_list_destroy(list1);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
        iotcon_list_destroy(list1);
@@ -187,7 +187,7 @@ static int CreateState(iotcon_state_h *state_h)
        nRet = iotcon_list_create(IOTCON_TYPE_BOOL, &list2);
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_create() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
@@ -195,15 +195,15 @@ static int CreateState(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_add_bool() Fail(%d)", nRet);
                iotcon_list_destroy(list2);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_list(state, "bool_list", list2);
+       nRet = iotcon_attributes_add_list(state, "bool_list", list2);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_list() Fail(%d)", nRet);
+               FPRINTF("iotcon_attributes_add_list() Fail(%d)", nRet);
                iotcon_list_destroy(list2);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
        iotcon_list_destroy(list2);
@@ -212,7 +212,7 @@ static int CreateState(iotcon_state_h *state_h)
        nRet = iotcon_list_create(IOTCON_TYPE_STR, &list3);
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_create() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
@@ -220,15 +220,15 @@ static int CreateState(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_add_str() Fail(%d)", nRet);
                iotcon_list_destroy(list3);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_list(state, "str_list", list3);
+       nRet = iotcon_attributes_add_list(state, "str_list", list3);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_list() Fail(%d)", nRet);
+               FPRINTF("iotcon_attributes_add_list() Fail(%d)", nRet);
                iotcon_list_destroy(list3);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
        iotcon_list_destroy(list3);
@@ -237,7 +237,7 @@ static int CreateState(iotcon_state_h *state_h)
        nRet = iotcon_list_create(IOTCON_TYPE_BYTE_STR, &list4);
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_create() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
@@ -245,15 +245,15 @@ static int CreateState(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_add_byte_str() Fail(%d)", nRet);
                iotcon_list_destroy(list4);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet = iotcon_state_add_list(state, "byte_str_list", list4);
+       nRet = iotcon_attributes_add_list(state, "byte_str_list", list4);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_list() Fail(%d)", nRet);
+               FPRINTF("iotcon_attributes_add_list() Fail(%d)", nRet);
                iotcon_list_destroy(list4);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
@@ -262,7 +262,7 @@ static int CreateState(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_create() Fail(%d)", nRet);
                iotcon_list_destroy(list4);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
@@ -271,16 +271,16 @@ static int CreateState(iotcon_state_h *state_h)
                FPRINTF("iotcon_list_add_list() Fail(%d)", nRet);
                iotcon_list_destroy(list5);
                iotcon_list_destroy(list4);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
        iotcon_list_destroy(list4);
 
-       nRet = iotcon_state_add_list(state, "list_list", list5);
+       nRet = iotcon_attributes_add_list(state, "list_list", list5);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_list() Fail(%d)", nRet);
+               FPRINTF("iotcon_attributes_add_list() Fail(%d)", nRet);
                iotcon_list_destroy(list5);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
        iotcon_list_destroy(list5);
@@ -289,7 +289,7 @@ static int CreateState(iotcon_state_h *state_h)
        nRet = iotcon_list_create(IOTCON_TYPE_DOUBLE, &list7);
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_create() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
@@ -297,15 +297,15 @@ static int CreateState(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_list_add_double() Fail(%d)", nRet);
                iotcon_list_destroy(list7);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
-       nRet =iotcon_state_add_list(state, "double_list", list7);
+       nRet =iotcon_attributes_add_list(state, "double_list", list7);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_state_add_list() Fail(%d)", nRet);
+               FPRINTF("iotcon_attributes_add_list() Fail(%d)", nRet);
                iotcon_list_destroy(list7);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(state);
                return nRet;
        }
 
@@ -390,7 +390,7 @@ static int CreateRepresentation(iotcon_representation_h *representation)
 {
        int nRet;
        char *uri_path = "/uri_path";
-       iotcon_state_h state;
+       iotcon_attributes_h state;
        iotcon_representation_h repr;
        iotcon_resource_types_h types;
        iotcon_resource_interfaces_h ifaces;
@@ -453,15 +453,15 @@ static int CreateRepresentation(iotcon_representation_h *representation)
                return nRet;
        }
 
-       nRet = iotcon_representation_set_state(repr, state);
+       nRet = iotcon_representation_set_attributes(repr, state);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_representation_set_state() Fail(%d)", nRet);
-               iotcon_state_destroy(state);
+               FPRINTF("iotcon_representation_set_attributes() Fail(%d)", nRet);
+               iotcon_attributes_destroy(state);
                iotcon_representation_destroy(repr);
                return nRet;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(state);
        *representation = repr;
 
        return 0;
@@ -522,7 +522,7 @@ static void FindRequestHandlerCB(iotcon_resource_h resource,
                return;
        }
 
-       nRet = iotcon_response_set_representation(response, IOTCON_INTERFACE_DEFAULT, repr);
+       nRet = iotcon_response_set_representation(response, repr);
        if (IOTCON_ERROR_NONE != nRet) {
                FPRINTF("iotcon_response_set_representation() Fail(%d)", nRet);
                iotcon_response_destroy(response);
@@ -570,33 +570,33 @@ static void RequestHandlerCB(iotcon_resource_h resource, iotcon_request_h reques
        g_bRequestHandlerCB = true;
 
      nRet = CreateRepresentation(&hRep);
-     if (IOTCON_ERROR_NONE != nRet) {
-            FPRINTF("CreateRepresentation() Fail(%d)", nRet);
-            QuitGmainLoopIdle(false);
-           return;
-     }
-
-     nRet = iotcon_response_create(request, &hResponse);
-     if (IOTCON_ERROR_NONE != nRet) {
-            FPRINTF("iotcon_response_create() Fail(%d)", nRet);
-            QuitGmainLoopIdle(false);
-            return;
-     }
-
-     nRet = iotcon_response_set_representation(hResponse, IOTCON_INTERFACE_DEFAULT, hRep);
-     if (IOTCON_ERROR_NONE != nRet) {
-            FPRINTF("iotcon_response_set_representation() Fail(%d)", nRet);
-            iotcon_response_destroy(hResponse);
-            QuitGmainLoopIdle(false);
-            return;
-     }
-
-     nRet = iotcon_response_set_result(hResponse, IOTCON_RESPONSE_OK);
-     if (IOTCON_ERROR_NONE != nRet) {
-            FPRINTF("iotcon_response_set_result() Fail(%d)", nRet);
-            iotcon_response_destroy(hResponse);
-            QuitGmainLoopIdle(false);
-            return;
+     if (IOTCON_ERROR_NONE != nRet) { 
+            FPRINTF("CreateRepresentation() Fail(%d)", nRet); 
+            QuitGmainLoopIdle(false); 
+           return; 
+     } 
+  
+     nRet = iotcon_response_create(request, &hResponse); 
+     if (IOTCON_ERROR_NONE != nRet) { 
+            FPRINTF("iotcon_response_create() Fail(%d)", nRet); 
+            QuitGmainLoopIdle(false); 
+            return; 
+     } 
+  
+     nRet = iotcon_response_set_representation(hResponse, hRep); 
+     if (IOTCON_ERROR_NONE != nRet) { 
+            FPRINTF("iotcon_response_set_representation() Fail(%d)", nRet); 
+            iotcon_response_destroy(hResponse); 
+            QuitGmainLoopIdle(false);  
+            return; 
+     } 
+  
+     nRet = iotcon_response_set_result(hResponse, IOTCON_RESPONSE_OK); 
+     if (IOTCON_ERROR_NONE != nRet) { 
+            FPRINTF("iotcon_response_set_result() Fail(%d)", nRet); 
+            iotcon_response_destroy(hResponse); 
+            QuitGmainLoopIdle(false);  
+            return; 
      }
 
     iotcon_representation_destroy(hRep);
@@ -1614,34 +1614,34 @@ int ITc_iotcon_resource_get_interfaces_p(void)
 //& type: auto
 //& purpose:  scenario to get properties of resource
 /**
-* @testcase                    ITc_iotcon_resource_get_properties_p
+* @testcase                    ITc_iotcon_resource_get_policies_p
 * @author              SRID(arvin.mittal)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
 * @description                 scenario to get properties of resource
 * @scenario                            create resource \n
-*                                              iotcon_resource_get_properties \n
+*                                              iotcon_resource_get_policies \n
 *                                              destroy resource\n
-* @apicovered                  iotcon_resource_get_properties
-* @passcase                            if iotcon_resource_get_properties passes
-* @failcase                            if iotcon_resource_get_properties fails
+* @apicovered                  iotcon_resource_get_policies
+* @passcase                            if iotcon_resource_get_policies passes
+* @failcase                            if iotcon_resource_get_policies fails
 * @precondition                        NA
 * @postcondition               NA
 */
-int ITc_iotcon_resource_get_properties_p(void)
+int ITc_iotcon_resource_get_policies_p(void)
 {
        START_TEST;
-       int nProperties = 0;
+       uint8_t nProperties = 0;
     int nRet = IotconCreateLightResource();
        if ( nRet != IOTCON_ERROR_NONE)
        {
                FPRINTF("[Line : %d][%s] IotconCreateLightResource error\\n", __LINE__, API_NAMESPACE);
                return 1;
        }
-       nRet = iotcon_resource_get_properties(g_hLightResource, &nProperties);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_resource_get_properties", IotConGetError(nRet),IotconDestroyRes());
-       if ((IOTCON_RESOURCE_DISCOVERABLE | IOTCON_RESOURCE_OBSERVABLE) != nProperties)
+       nRet = iotcon_resource_get_policies(g_hLightResource, &nProperties);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_resource_get_policies", IotConGetError(nRet),IotconDestroyRes());
+       if ((IOTCON_RESOURCE_DISCOVERABLE | IOTCON_RESOURCE_OBSERVABLE) != nProperties) 
        {
                IotconDestroyRes();
                return 1;
index 8825b47..67af9a3 100755 (executable)
@@ -266,128 +266,128 @@ int CreateResourceTypes(const char *type, iotcon_resource_types_h *types_h)
 
 
 /**
-* @function            CreateState
-* @description         Function to create iotcon states
-* @parameter           iotcon_state_h : iotcon state handle
-* @return                      intiger : 0 if sussess
+* @function            CreateAttributes
+* @description         Function to create iotcon attributes 
+* @parameter           iotcon_attributes_h : iotcon attributes handle
+* @return                      intiger : 0 if sussess 
 */
-int CreateState(iotcon_state_h *state_h)
+int CreateAttributes(iotcon_attributes_h *attributes_h)
 {
        int nRet;
-       iotcon_state_h hState, hValState;
+       iotcon_attributes_h hAttributes, hValAttributes;
        unsigned char byte_str[3] = {70, 71, 72};
        iotcon_list_h list1, list2, list3, list4, list5, list6, list7;
 
-       nRet = iotcon_state_create(&hState);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet));
-
-       nRet = iotcon_state_add_int(hState, "int", 1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_int", IotConGetError(nRet),iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_create(&hAttributes);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet));
+       
+       nRet = iotcon_attributes_add_int(hAttributes, "int", 1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_int", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));        
 
-       nRet = iotcon_state_add_bool(hState, "bool", true);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_bool", IotConGetError(nRet),iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_bool(hAttributes, "bool", true);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_bool", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));       
 
-       nRet = iotcon_state_add_double(hState, "double", 1.1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_double", IotConGetError(nRet),iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_double(hAttributes, "double", 1.1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_double", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));     
 
-       nRet = iotcon_state_add_null(hState, "null");
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_null", IotConGetError(nRet),iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_null(hAttributes, "null");
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_null", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));       
 
-       nRet = iotcon_state_add_str(hState, "str", "string");
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_str", IotConGetError(nRet),iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_str(hAttributes, "str", "string");
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_str", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));        
 
-       nRet = iotcon_state_add_byte_str(hState, "bytestr", byte_str, 3);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_byte_str", IotConGetError(nRet),iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_byte_str(hAttributes, "bytestr", byte_str, 3);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_byte_str", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));   
 
-       /* state */
-       nRet = iotcon_state_create(&hValState);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet),iotcon_state_destroy(hState));
+       /* attributes */
+       nRet = iotcon_attributes_create(&hValAttributes);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes)); 
 
-       nRet = iotcon_state_add_int(hValState, "hValState", 10);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_int", IotConGetError(nRet),iotcon_state_destroy(hValState);iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_int(hValAttributes, "hValAttributes", 10);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_int", IotConGetError(nRet),iotcon_attributes_destroy(hValAttributes);iotcon_attributes_destroy(hAttributes));      
 
-       nRet = iotcon_state_add_state(hState, "state", hValState);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_state", IotConGetError(nRet),iotcon_state_destroy(hValState);iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_attributes(hAttributes, "attributes", hValAttributes);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_attributes", IotConGetError(nRet),iotcon_attributes_destroy(hValAttributes);iotcon_attributes_destroy(hAttributes));       
 
-       /* state list */
-       nRet = iotcon_list_create(IOTCON_TYPE_STATE, &list6);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_state_destroy(hValState);iotcon_state_destroy(hState));
+       /* attributes list */
+       nRet = iotcon_list_create(IOTCON_TYPE_ATTRIBUTES, &list6);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_attributes_destroy(hValAttributes);iotcon_attributes_destroy(hAttributes));     
 
-       nRet = iotcon_list_add_state(list6, hValState, -1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_state", IotConGetError(nRet),iotcon_list_destroy(list6);iotcon_state_destroy(hValState);iotcon_state_destroy(hState));
-       iotcon_state_destroy(hValState);
+       nRet = iotcon_list_add_attributes(list6, hValAttributes, -1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_attributes", IotConGetError(nRet),iotcon_list_destroy(list6);iotcon_attributes_destroy(hValAttributes);iotcon_attributes_destroy(hAttributes));  
+       iotcon_attributes_destroy(hValAttributes);
 
-       nRet = iotcon_state_add_list(hState, "state_list", list6);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_list", IotConGetError(nRet),iotcon_list_destroy(list6);iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_list(hAttributes, "state_list", list6);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_list", IotConGetError(nRet),iotcon_list_destroy(list6);iotcon_attributes_destroy(hAttributes));    
        iotcon_list_destroy(list6);
 
        /* int list */
        nRet = iotcon_list_create(IOTCON_TYPE_INT, &list1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));       
 
        nRet = iotcon_list_add_int(list1, 1, -1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_int", IotConGetError(nRet),iotcon_list_destroy(list1);iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_int", IotConGetError(nRet),iotcon_list_destroy(list1);iotcon_attributes_destroy(hAttributes));   
 
-       nRet = iotcon_state_add_list(hState, "int_list", list1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_list", IotConGetError(nRet),iotcon_list_destroy(list1);iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_list(hAttributes, "int_list", list1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_list", IotConGetError(nRet),iotcon_list_destroy(list1);iotcon_attributes_destroy(hAttributes));    
        iotcon_list_destroy(list1);
 
        /* boolean list */
        nRet = iotcon_list_create(IOTCON_TYPE_BOOL, &list2);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));       
 
        nRet = iotcon_list_add_bool(list2, true, -1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_bool", IotConGetError(nRet),iotcon_list_destroy(list2);iotcon_state_destroy(hState));
-
-       nRet = iotcon_state_add_list(hState, "bool_list", list2);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_list", IotConGetError(nRet),iotcon_list_destroy(list2);iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_bool", IotConGetError(nRet),iotcon_list_destroy(list2);iotcon_attributes_destroy(hAttributes));  
+       
+       nRet = iotcon_attributes_add_list(hAttributes, "bool_list", list2);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_list", IotConGetError(nRet),iotcon_list_destroy(list2);iotcon_attributes_destroy(hAttributes));    
        iotcon_list_destroy(list2);
 
        /* string list */
        nRet = iotcon_list_create(IOTCON_TYPE_STR, &list3);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));       
 
        nRet = iotcon_list_add_str(list3, "string", -1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_str", IotConGetError(nRet),iotcon_list_destroy(list3);iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_str", IotConGetError(nRet),iotcon_list_destroy(list3);iotcon_attributes_destroy(hAttributes));   
 
-       nRet = iotcon_state_add_list(hState, "str_list", list3);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_list", IotConGetError(nRet),iotcon_list_destroy(list3);iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_list(hAttributes, "str_list", list3);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_list", IotConGetError(nRet),iotcon_list_destroy(list3);iotcon_attributes_destroy(hAttributes));    
        iotcon_list_destroy(list3);
 
        /* byte string list */
        nRet = iotcon_list_create(IOTCON_TYPE_BYTE_STR, &list4);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));       
 
        nRet = iotcon_list_add_byte_str(list4, byte_str, 3, -1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_byte_str", IotConGetError(nRet),iotcon_list_destroy(list4);iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_byte_str", IotConGetError(nRet),iotcon_list_destroy(list4);iotcon_attributes_destroy(hAttributes));      
 
-       nRet = iotcon_state_add_list(hState, "byte_str_list", list4);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_list", IotConGetError(nRet),iotcon_list_destroy(list4);iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_list(hAttributes, "byte_str_list", list4);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_list", IotConGetError(nRet),iotcon_list_destroy(list4);iotcon_attributes_destroy(hAttributes));    
 
        /* list list */
        nRet = iotcon_list_create(IOTCON_TYPE_LIST, &list5);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_list_destroy(list4);iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_list_destroy(list4);iotcon_attributes_destroy(hAttributes));    
 
        nRet = iotcon_list_add_list(list5, list4, -1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_list", IotConGetError(nRet),iotcon_list_destroy(list5);iotcon_list_destroy(list4);iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_list", IotConGetError(nRet),iotcon_list_destroy(list5);iotcon_list_destroy(list4);iotcon_attributes_destroy(hAttributes));       
        iotcon_list_destroy(list4);
 
-       nRet = iotcon_state_add_list(hState, "list_list", list5);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_list", IotConGetError(nRet),iotcon_list_destroy(list5);iotcon_state_destroy(hState));
+       nRet = iotcon_attributes_add_list(hAttributes, "list_list", list5);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_list", IotConGetError(nRet),iotcon_list_destroy(list5);iotcon_attributes_destroy(hAttributes));    
        iotcon_list_destroy(list5);
 
        /* double list */
        nRet = iotcon_list_create(IOTCON_TYPE_DOUBLE, &list7);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet),iotcon_attributes_destroy(hAttributes));       
 
        nRet = iotcon_list_add_double(list7, 1.1, -1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_double", IotConGetError(nRet),iotcon_list_destroy(list7);iotcon_state_destroy(hState));
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_list_add_double", IotConGetError(nRet),iotcon_list_destroy(list7);iotcon_attributes_destroy(hAttributes));        
 
-       nRet =iotcon_state_add_list(hState, "double_list", list7);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_list", IotConGetError(nRet),iotcon_list_destroy(list7);iotcon_state_destroy(hState));
+       nRet =iotcon_attributes_add_list(hAttributes, "double_list", list7);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_list", IotConGetError(nRet),iotcon_list_destroy(list7);iotcon_attributes_destroy(hAttributes));    
        iotcon_list_destroy(list7);
 
-       *state_h = hState;
+       *attributes_h = hAttributes;
 
        return 0;
 }
@@ -402,7 +402,7 @@ int CreateRepresentation(iotcon_representation_h *representation)
 {
        int nRet;
        char *uri_path = "/uri_path";
-       iotcon_state_h hState;
+       iotcon_attributes_h hAttributes;
        iotcon_representation_h hRep;
        iotcon_resource_types_h hTypes;
        iotcon_resource_interfaces_h hIfaces;
@@ -457,23 +457,23 @@ int CreateRepresentation(iotcon_representation_h *representation)
 
        iotcon_resource_interfaces_destroy(hIfaces);
 
-       /* state */
-       nRet = CreateState(&hState);
+       /* attributes */
+       nRet = CreateAttributes(&hAttributes);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("CreateState() Fail(%d)", nRet);
+               FPRINTF("CreateAttributes() Fail(%d)", nRet);
                iotcon_representation_destroy(hRep);
                return nRet;
        }
 
-       nRet = iotcon_representation_set_state(hRep, hState);
+       nRet = iotcon_representation_set_attributes(hRep, hAttributes);
        if (IOTCON_ERROR_NONE != nRet) {
-               FPRINTF("iotcon_representation_set_state() Fail(%d)", nRet);
-               iotcon_state_destroy(hState);
+               FPRINTF("iotcon_representation_set_attributes() Fail(%d)", nRet);
+               iotcon_attributes_destroy(hAttributes);
                iotcon_representation_destroy(hRep);
                return nRet;
        }
 
-       iotcon_state_destroy(hState);
+       iotcon_attributes_destroy(hAttributes);
        *representation = hRep;
 
        return 0;
@@ -680,10 +680,10 @@ int ITc_iotcon_response_set_get_representation_p(void)
        nRet = iotcon_representation_create(&hRep);
        PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_representation_create", IotConGetError(nRet),iotcon_response_destroy(hResponse));
        CHECK_HANDLE_CLEANUP(hRep,"iotcon_representation_create",iotcon_response_destroy(hResponse));
-
-       nRet = iotcon_response_set_representation(hResponse, IOTCON_INTERFACE_DEFAULT, hRep);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_response_set_representation", IotConGetError(nRet),iotcon_representation_destroy(hRep);iotcon_response_destroy(hResponse););
-
+       
+       nRet = iotcon_response_set_representation(hResponse, hRep);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_response_set_representation", IotConGetError(nRet),iotcon_representation_destroy(hRep);iotcon_response_destroy(hResponse););      
+       
        nRet = iotcon_response_get_representation(hResponse, &hRepresentation);
        PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_response_get_representation", IotConGetError(nRet),iotcon_representation_destroy(hRep);iotcon_response_destroy(hResponse));
        CHECK_HANDLE(hRepresentation,"iotcon_response_get_representation");
@@ -790,9 +790,9 @@ int ITc_iotcon_response_send_p(void)
        nRet = iotcon_representation_create(&hRep);
        PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_representation_create", IotConGetError(nRet),iotcon_options_destroy(hOptions);iotcon_response_destroy(hResponse));
        CHECK_HANDLE_CLEANUP(hRep,"iotcon_representation_create",iotcon_options_destroy(hOptions);iotcon_representation_destroy(hRep);iotcon_response_destroy(hResponse));
-
-       nRet = iotcon_response_set_representation(hResponse, IOTCON_INTERFACE_DEFAULT, hRep);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_response_set_representation", IotConGetError(nRet),iotcon_representation_destroy(hRep);iotcon_options_destroy(hOptions);iotcon_response_destroy(hResponse));
+               
+       nRet = iotcon_response_set_representation(hResponse, hRep);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_response_set_representation", IotConGetError(nRet),iotcon_representation_destroy(hRep);iotcon_options_destroy(hOptions);iotcon_response_destroy(hResponse));              
 
        //target api
        nRet = iotcon_response_send(hResponse);
index 060a800..ac0f351 100755 (executable)
 *  @{
 */
 
-static iotcon_state_h g_hState;
+static iotcon_attributes_h g_hAttributes;
 static iotcon_representation_h g_hRepr;
 
 /**
 * @function            IotconStateCB
 * @description         Callback Function
-* @parameter           iotcon_state_h state, const char *key, void *user_data
+* @parameter           iotcon_attributes_h hAttributes, const char *key, void *user_data
 * @return                      NA
 */
-bool IotconStateCB(iotcon_state_h state, const char *key, void *user_data)
+bool IotconStateCB(iotcon_attributes_h hAttributes, const char *key, void *user_data)
 {
        FPRINTF("[Line : %d][%s] Inside IotconStateCB callback\\n", __LINE__, API_NAMESPACE);
-
-       if((state == NULL) || (key == NULL))
+       
+       if((hAttributes == NULL) || (key == NULL))
        {
                FPRINTF("[Line : %d][%s] Inside IotconStateCB fails as input values are NULL \\n", __LINE__, API_NAMESPACE);
        }
@@ -45,12 +45,12 @@ bool IotconStateCB(iotcon_state_h state, const char *key, void *user_data)
 }
 
 /**
- * @function           ITs_iotcon_state_startup
+ * @function           ITs_iotcon_attributes_startup
  * @description                Called before each test
  * @parameter          NA
  * @return                     NA
  */
-void ITs_iotcon_state_startup(void)
+void ITs_iotcon_attributes_startup(void)
 {
        struct stat stBuff;
        if ( stat(ERR_LOG, &stBuff) == 0 )
@@ -83,20 +83,20 @@ void ITs_iotcon_state_startup(void)
                g_bIotconConnect = false;
                return;
        }
-
-       nRet = iotcon_state_create(&g_hState);
+               
+       nRet = iotcon_attributes_create(&g_hAttributes);
        if (IOTCON_ERROR_NONE != nRet)
        {
-               FPRINTF("[Line : %d][%s] iotcon_state_create fail in startup \\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] iotcon_attributes_create fail in startup \\n", __LINE__, API_NAMESPACE);
                iotcon_deinitialize();
                g_bIotconConnect = false;
                return;
        }
-       if(g_hState == NULL)
+       if(g_hAttributes == NULL)
        {
                iotcon_deinitialize();
                g_bIotconConnect = false;
-               FPRINTF("[Line : %d][%s] g_hState is NULL\\n", __LINE__, API_NAMESPACE);
+               FPRINTF("[Line : %d][%s] g_hAttributes is NULL\\n", __LINE__, API_NAMESPACE);
                return;
        }
 
@@ -104,18 +104,18 @@ void ITs_iotcon_state_startup(void)
        if (IOTCON_ERROR_NONE != nRet)
        {
                FPRINTF("[Line : %d][%s] iotcon_representation_create fail in startup \\n", __LINE__, API_NAMESPACE);
-               iotcon_state_destroy(g_hState);
-               g_hState = NULL;
+               iotcon_attributes_destroy(g_hAttributes);
+               g_hAttributes = NULL;
                iotcon_deinitialize();
                g_bIotconConnect = false;
                return;
        }
        if(g_hRepr == NULL)
        {
-               iotcon_state_destroy(g_hState);
+               iotcon_attributes_destroy(g_hAttributes);
                iotcon_deinitialize();
                g_bIotconConnect = false;
-               g_hState = NULL;
+               g_hAttributes = NULL;
                FPRINTF("[Line : %d][%s] g_hRepr is NULL\\n", __LINE__, API_NAMESPACE);
                return;
        }
@@ -123,12 +123,12 @@ void ITs_iotcon_state_startup(void)
 
 
 /**
- * @function           ITs_iotcon_state_cleanup
+ * @function           ITs_iotcon_attributes_cleanup
  * @description                Called after each test
  * @parameter          NA
  * @return                     NA
  */
-void ITs_iotcon_state_cleanup(void)
+void ITs_iotcon_attributes_cleanup(void)
 {
 
 #if DEBUG
@@ -137,9 +137,9 @@ void ITs_iotcon_state_cleanup(void)
 
        if(g_hRepr)
                iotcon_representation_destroy(g_hRepr);
-
-       if (g_hState)
-               iotcon_state_destroy(g_hState);
+       
+       if (g_hAttributes) 
+               iotcon_attributes_destroy(g_hAttributes);
 
        if (g_bIotconConnect)
                iotcon_deinitialize();
@@ -154,251 +154,251 @@ void ITs_iotcon_state_cleanup(void)
 */
 
 //& type: auto
-//& purpose:  scenario to create and destroy state
+//& purpose:  scenario to create and destroy hAttributes
 /**
-* @testcase                    ITc_iotcon_state_create_destroy_p
+* @testcase                    ITc_iotcon_attributes_create_destroy_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to create and destroy state
-* @scenario                            iotcon_state_create \n
-*                                              iotcon_state_destroy
-* @apicovered                  iotcon_state_create,iotcon_state_destroy
-* @passcase                            if iotcon_state_create and iotcon_state_destroy  passes
-* @failcase                            if iotcon_state_create or iotcon_state_destroy fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to create and destroy hAttributes
+* @scenario                            iotcon_attributes_create \n
+*                                              iotcon_attributes_destroy
+* @apicovered                  iotcon_attributes_create,iotcon_attributes_destroy
+* @passcase                            if iotcon_attributes_create and iotcon_attributes_destroy  passes
+* @failcase                            if iotcon_attributes_create or iotcon_attributes_destroy fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_create_destroy_p(void)
+int ITc_iotcon_attributes_create_destroy_p(void)
 {
        START_TEST;
+               
+       iotcon_attributes_h hState = NULL;
 
-       iotcon_state_h hState = NULL;
+       int nRet = iotcon_attributes_create(&hState);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet));
+       CHECK_HANDLE(hState,"iotcon_attributes_create");
 
-       int nRet = iotcon_state_create(&hState);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet));
-       CHECK_HANDLE(hState,"iotcon_state_create");
-
-       iotcon_state_destroy(hState);
+       iotcon_attributes_destroy(hState);
        hState = NULL;
-
+               
     return 0;
 }
 
 //& type: auto
-//& purpose:  scenario to clone state
+//& purpose:  scenario to clone hAttributes
 /**
-* @testcase                    ITc_iotcon_state_clone_p
+* @testcase                    ITc_iotcon_attributes_clone_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to clone state
-* @scenario                            iotcon_state_clone \n
-* @apicovered                  iotcon_state_clone
-* @passcase                            if iotcon_state_clone passes
-* @failcase                            if iotcon_state_clone fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to clone hAttributes
+* @scenario                            iotcon_attributes_clone \n
+* @apicovered                  iotcon_attributes_clone
+* @passcase                            if iotcon_attributes_clone passes
+* @failcase                            if iotcon_attributes_clone fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_clone_p(void)
+int ITc_iotcon_attributes_clone_p(void)
 {
        START_TEST;
+               
+       iotcon_attributes_h hState = NULL;
 
-       iotcon_state_h hState = NULL;
+       int nRet = iotcon_attributes_clone(g_hAttributes, &hState);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_clone", IotConGetError(nRet));
+       CHECK_HANDLE(hState,"iotcon_attributes_create");
 
-       int nRet = iotcon_state_clone(g_hState, &hState);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_clone", IotConGetError(nRet));
-       CHECK_HANDLE(hState,"iotcon_state_create");
-
-       iotcon_state_destroy(hState);
+       iotcon_attributes_destroy(hState);
        hState = NULL;
 
        return 0;
 }
 
  //& type: auto
-//& purpose:  scenario to add and get int values of state
+//& purpose:  scenario to add and get int values of hAttributes
 /**
-* @testcase                    ITc_iotcon_state_add_get_int_p
+* @testcase                    ITc_iotcon_attributes_add_get_int_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to add and get int values of state
-* @scenario                            iotcon_state_add_int \n
-*                                              iotcon_state_get_int
-* @apicovered                  iotcon_state_add_int , iotcon_state_get_int
-* @passcase                            if iotcon_state_add_int and iotcon_state_get_int passes
-* @failcase                            if iotcon_state_add_int or iotcon_state_get_int fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to add and get int values of hAttributes
+* @scenario                            iotcon_attributes_add_int \n
+*                                              iotcon_attributes_get_int
+* @apicovered                  iotcon_attributes_add_int , iotcon_attributes_get_int
+* @passcase                            if iotcon_attributes_add_int and iotcon_attributes_get_int passes
+* @failcase                            if iotcon_attributes_add_int or iotcon_attributes_get_int fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_add_get_int_p(void)
+int ITc_iotcon_attributes_add_get_int_p(void)
 {
        START_TEST;
 
        int nSetIntVal = 10;
        int nGetIntVal;
+               
+       int nRet = iotcon_attributes_add_int(g_hAttributes, KEY, nSetIntVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_int", IotConGetError(nRet));
 
-       int nRet = iotcon_state_add_int(g_hState, KEY, nSetIntVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_int", IotConGetError(nRet));
-
-       nRet = iotcon_state_get_int(g_hState, KEY, &nGetIntVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_get_int", IotConGetError(nRet));
+       nRet = iotcon_attributes_get_int(g_hAttributes, KEY, &nGetIntVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_get_int", IotConGetError(nRet));
        if(nGetIntVal != nSetIntVal)
        {
                FPRINTF("[Line : %d][%s] value mismatch \\n", __LINE__, API_NAMESPACE );
                return 1;
        }
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
        return 0;
 }
 
 //& type: auto
-//& purpose:  scenario to add and get bool values of state
+//& purpose:  scenario to add and get bool values of hAttributes
 /**
-* @testcase                    ITc_iotcon_state_add_get_bool_p
+* @testcase                    ITc_iotcon_attributes_add_get_bool_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to add and get bool values of state
-* @scenario                            iotcon_state_add_bool \n
-*                                              iotcon_state_get_bool
-* @apicovered                  iotcon_state_add_bool, iotcon_state_get_bool
-* @passcase                            if iotcon_state_add_bool and iotcon_state_get_bool passes
-* @failcase                            if iotcon_state_add_bool or iotcon_state_get_bool fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to add and get bool values of hAttributes
+* @scenario                            iotcon_attributes_add_bool \n
+*                                              iotcon_attributes_get_bool
+* @apicovered                  iotcon_attributes_add_bool, iotcon_attributes_get_bool
+* @passcase                            if iotcon_attributes_add_bool and iotcon_attributes_get_bool passes
+* @failcase                            if iotcon_attributes_add_bool or iotcon_attributes_get_bool fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_add_get_bool_p(void)
+int ITc_iotcon_attributes_add_get_bool_p(void)
 {
        START_TEST;
 
        bool bSetBoolVal = true;
        bool bGetBoolVal;
 
-       int nRet = iotcon_state_add_bool(g_hState, KEY, bSetBoolVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_bool", IotConGetError(nRet));
+       int nRet = iotcon_attributes_add_bool(g_hAttributes, KEY, bSetBoolVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_bool", IotConGetError(nRet));
 
-       nRet = iotcon_state_get_bool(g_hState, KEY, &bGetBoolVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_get_bool", IotConGetError(nRet));
+       nRet = iotcon_attributes_get_bool(g_hAttributes, KEY, &bGetBoolVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_get_bool", IotConGetError(nRet));
        if(bGetBoolVal != bSetBoolVal)
        {
                FPRINTF("[Line : %d][%s] value mismatch \\n", __LINE__, API_NAMESPACE );
                return 1;
        }
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
-
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
+       
        return 0;
 }
 
 //& type: auto
-//& purpose:  scenario to add and get double values of state
+//& purpose:  scenario to add and get double values of hAttributes
 /**
-* @testcase                    ITc_iotcon_state_add_get_double_p
+* @testcase                    ITc_iotcon_attributes_add_get_double_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to add and get double values of state
-* @scenario                            iotcon_state_add_double \n
-*                                              iotcon_state_get_double
-* @apicovered                  iotcon_state_add_double ,iotcon_state_get_double
-* @passcase                            if iotcon_state_add_double and iotcon_state_get_double passes
-* @failcase                            if iotcon_state_add_double or iotcon_state_get_double fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to add and get double values of hAttributes
+* @scenario                            iotcon_attributes_add_double \n
+*                                              iotcon_attributes_get_double
+* @apicovered                  iotcon_attributes_add_double ,iotcon_attributes_get_double
+* @passcase                            if iotcon_attributes_add_double and iotcon_attributes_get_double passes
+* @failcase                            if iotcon_attributes_add_double or iotcon_attributes_get_double fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_add_get_double_p(void)
+int ITc_iotcon_attributes_add_get_double_p(void)
 {
        START_TEST;
 
        double nSetdoubleVal = 3.4;
        double nGetdoubleVal;
 
-       int nRet = iotcon_state_add_double(g_hState, KEY, nSetdoubleVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_double", IotConGetError(nRet));
+       int nRet = iotcon_attributes_add_double(g_hAttributes, KEY, nSetdoubleVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_double", IotConGetError(nRet));
 
-       nRet = iotcon_state_get_double(g_hState, KEY, &nGetdoubleVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_get_double", IotConGetError(nRet));
+       nRet = iotcon_attributes_get_double(g_hAttributes, KEY, &nGetdoubleVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_get_double", IotConGetError(nRet));
        if(nSetdoubleVal != nGetdoubleVal)
        {
                FPRINTF("[Line : %d][%s] value mismatch \\n", __LINE__, API_NAMESPACE );
                return 1;
        }
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
-
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
+       
        return 0;
 }
 
 //& type: auto
-//& purpose:  scenario to add and get str values of state
+//& purpose:  scenario to add and get str values of hAttributes
 /**
-* @testcase                    ITc_iotcon_state_add_get_str_p
+* @testcase                    ITc_iotcon_attributes_add_get_str_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to add and get str values of state
-* @scenario                            iotcon_state_add_str \n
-*                                              iotcon_state_get_str
-* @apicovered                  iotcon_state_add_str ,iotcon_state_get_str
-* @passcase                            if iotcon_state_add_str and iotcon_state_get_str passes
-* @failcase                            if iotcon_state_add_str or iotcon_state_get_str fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to add and get str values of hAttributes
+* @scenario                            iotcon_attributes_add_str \n
+*                                              iotcon_attributes_get_str
+* @apicovered                  iotcon_attributes_add_str ,iotcon_attributes_get_str
+* @passcase                            if iotcon_attributes_add_str and iotcon_attributes_get_str passes
+* @failcase                            if iotcon_attributes_add_str or iotcon_attributes_get_str fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_add_get_str_p(void)
+int ITc_iotcon_attributes_add_get_str_p(void)
 {
        START_TEST;
 
        char *GetValue;
 
-       int nRet = iotcon_state_add_str(g_hState, KEY, VALUE);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_str", IotConGetError(nRet));
+       int nRet = iotcon_attributes_add_str(g_hAttributes, KEY, VALUE);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_str", IotConGetError(nRet));
 
-       nRet = iotcon_state_get_str(g_hState, KEY, &GetValue);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_get_str", IotConGetError(nRet));
+       nRet = iotcon_attributes_get_str(g_hAttributes, KEY, &GetValue);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_get_str", IotConGetError(nRet));
        if(0 != strcmp(VALUE, GetValue))
        {
                FPRINTF("[Line : %d][%s] value mismatch \\n", __LINE__, API_NAMESPACE );
                return 1;
        }
 
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
-
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
+       
        return 0;
 
 }
 
 //& type: auto
-//& purpose:  scenario to add and get list values of state
+//& purpose:  scenario to add and get list values of hAttributes
 /**
-* @testcase                    ITc_iotcon_state_add_get_list_p
+* @testcase                    ITc_iotcon_attributes_add_get_list_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to add and get list values of state
+* @description                 scenario to add and get list values of hAttributes
 * @scenario                            iotcon_list_create \n
-*                                              iotcon_state_add_list \n
-*                                              iotcon_state_get_list
-* @apicovered                  iotcon_state_add_list, iotcon_state_add_list ,iotcon_state_get_list
-* @passcase                            if iotcon_state_add_list and iotcon_state_get_list passes
-* @failcase                            if iotcon_state_add_list or iotcon_state_get_list fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+*                                              iotcon_attributes_add_list \n
+*                                              iotcon_attributes_get_list
+* @apicovered                  iotcon_attributes_add_list, iotcon_attributes_add_list ,iotcon_attributes_get_list
+* @passcase                            if iotcon_attributes_add_list and iotcon_attributes_get_list passes
+* @failcase                            if iotcon_attributes_add_list or iotcon_attributes_get_list fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_add_get_list_p(void)
+int ITc_iotcon_attributes_add_get_list_p(void)
 {
        START_TEST;
 
@@ -407,17 +407,17 @@ int ITc_iotcon_state_add_get_list_p(void)
        int nRet = iotcon_list_create(IOTCON_TYPE_INT,&hList);
        PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_list_create", IotConGetError(nRet));
        CHECK_HANDLE(hList,"iotcon_list_create");
-
-       nRet = iotcon_state_add_list(g_hState, KEY, hList);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_list", IotConGetError(nRet));
-
-       nRet = iotcon_state_get_list(g_hState, KEY, &hList);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_get_list", IotConGetError(nRet));
-       CHECK_HANDLE(hList,"iotcon_state_get_list");
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
-
+       
+       nRet = iotcon_attributes_add_list(g_hAttributes, KEY, hList);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_list", IotConGetError(nRet));
+
+       nRet = iotcon_attributes_get_list(g_hAttributes, KEY, &hList);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_get_list", IotConGetError(nRet));
+       CHECK_HANDLE(hList,"iotcon_attributes_get_list");
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
+       
        if(hList)
        {
                iotcon_list_destroy(hList);
@@ -428,44 +428,44 @@ int ITc_iotcon_state_add_get_list_p(void)
 }
 
 //& type: auto
-//& purpose:  scenario to add and get state values of state
+//& purpose:  scenario to add and get hAttributes values of hAttributes
 /**
-* @testcase                    ITc_iotcon_state_add_get_state_p
+* @testcase                    ITc_iotcon_attributes_add_get_attributes_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to clone state
-* @scenario                            iotcon_state_create \n
-*                                              iotcon_state_add_state \n
-*                                              iotcon_state_get_state
-* @apicovered                  iotcon_state_create,iotcon_state_add_state , iotcon_state_get_state,iotcon_state_destroy
-* @passcase                            if iotcon_state_add_state and iotcon_state_get_state passes
-* @failcase                            if iotcon_state_add_state or iotcon_state_get_state fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to clone hAttributes
+* @scenario                            iotcon_attributes_create \n
+*                                              iotcon_attributes_add_attributes \n
+*                                              iotcon_attributes_get_attributes
+* @apicovered                  iotcon_attributes_create,iotcon_attributes_add_attributes , iotcon_attributes_get_attributes,iotcon_attributes_destroy
+* @passcase                            if iotcon_attributes_add_attributes and iotcon_attributes_get_attributes passes
+* @failcase                            if iotcon_attributes_add_attributes or iotcon_attributes_get_attributes fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_add_get_state_p(void)
+int ITc_iotcon_attributes_add_get_attributes_p(void)
 {
        START_TEST;
-
-       iotcon_state_h hState1, hState2;
-
-       int nRet = iotcon_state_create(&hState1);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet));
-       CHECK_HANDLE(hState1,"iotcon_state_create");
-
-       nRet = iotcon_state_add_state(g_hState, KEY, hState1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_state", IotConGetError(nRet),iotcon_state_destroy(hState1));
-
-       iotcon_state_destroy(hState1);
-
-       nRet = iotcon_state_get_state(g_hState, KEY, &hState2);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_get_state", IotConGetError(nRet));
-       CHECK_HANDLE(hState2,"iotcon_state_get_state");
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       
+       iotcon_attributes_h hState1, hState2;
+       
+       int nRet = iotcon_attributes_create(&hState1);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet));
+       CHECK_HANDLE(hState1,"iotcon_attributes_create");
+
+       nRet = iotcon_attributes_add_attributes(g_hAttributes, KEY, hState1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_attributes", IotConGetError(nRet),iotcon_attributes_destroy(hState1));
+       
+       iotcon_attributes_destroy(hState1);
+
+       nRet = iotcon_attributes_get_attributes(g_hAttributes, KEY, &hState2);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_get_attributes", IotConGetError(nRet));
+       CHECK_HANDLE(hState2,"iotcon_attributes_get_attributes");
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
 
        return 0;
 }
@@ -473,120 +473,120 @@ int ITc_iotcon_state_add_get_state_p(void)
 //& type: auto
 //& purpose:  scenario to add null and check is null
 /**
-* @testcase                    ITc_iotcon_state_add_is_null_p
+* @testcase                    ITc_iotcon_attributes_add_is_null_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
 * @description                 scenario to add null and check is null
-* @scenario                            iotcon_state_add_null & iotcon_state_is_null \n
-* @apicovered                  iotcon_state_add_null , iotcon_state_is_null
-* @passcase                            if iotcon_state_add_null and iotcon_state_is_null passes
-* @failcase                            if iotcon_state_add_null or iotcon_state_is_null fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @scenario                            iotcon_attributes_add_null & iotcon_attributes_is_null \n
+* @apicovered                  iotcon_attributes_add_null , iotcon_attributes_is_null
+* @passcase                            if iotcon_attributes_add_null and iotcon_attributes_is_null passes
+* @failcase                            if iotcon_attributes_add_null or iotcon_attributes_is_null fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_add_is_null_p(void)
+int ITc_iotcon_attributes_add_is_null_p(void)
 {
        START_TEST;
 
        bool bVal;
 
-       int nRet = iotcon_state_add_null(g_hState, KEY);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_null", IotConGetError(nRet));
+       int nRet = iotcon_attributes_add_null(g_hAttributes, KEY);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_null", IotConGetError(nRet));
 
-       nRet = iotcon_state_is_null(g_hState, KEY, &bVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_is_null", IotConGetError(nRet));
+       nRet = iotcon_attributes_is_null(g_hAttributes, KEY, &bVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_is_null", IotConGetError(nRet));
        if(bVal != true)
        {
                FPRINTF("[Line : %d][%s] value is not null  : \\n", __LINE__, API_NAMESPACE );
                return 1;
        }
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
 
        return 0;
 }
 
 
 //& type: auto
-//& purpose:  scenario to remove state
+//& purpose:  scenario to remove hAttributes
 /**
-* @testcase                    ITc_iotcon_state_remove_p
+* @testcase                    ITc_iotcon_attributes_remove_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to remove state
+* @description                 scenario to remove hAttributes
 * @scenario                            add different states like int,double,bool,null \n
-*                                              iotcon_state_remove
-* @apicovered                  iotcon_state_remove
-* @passcase                            if iotcon_state_remove passes
-* @failcase                            if iotcon_state_remove fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+*                                              iotcon_attributes_remove 
+* @apicovered                  iotcon_attributes_remove
+* @passcase                            if iotcon_attributes_remove passes
+* @failcase                            if iotcon_attributes_remove fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_remove_p(void)
+int ITc_iotcon_attributes_remove_p(void)
 {
        START_TEST;
 
        int nSetIntVal = 10;
        bool bSetVal = true;
        double nSetDbVal = 3.4;
+               
+       int nRet = iotcon_attributes_add_int(g_hAttributes, KEY, nSetIntVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_int", IotConGetError(nRet));
 
-       int nRet = iotcon_state_add_int(g_hState, KEY, nSetIntVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_int", IotConGetError(nRet));
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
 
-       nRet = iotcon_state_add_bool(g_hState, KEY, bSetVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_bool", IotConGetError(nRet));
+       nRet = iotcon_attributes_add_bool(g_hAttributes, KEY, bSetVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_bool", IotConGetError(nRet));
 
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
 
-       nRet = iotcon_state_add_double(g_hState, KEY, nSetDbVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_double", IotConGetError(nRet));
+       nRet = iotcon_attributes_add_double(g_hAttributes, KEY, nSetDbVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_double", IotConGetError(nRet));
 
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
 
-       nRet = iotcon_state_add_str(g_hState, KEY, VALUE);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_str", IotConGetError(nRet));
+       nRet = iotcon_attributes_add_str(g_hAttributes, KEY, VALUE);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_str", IotConGetError(nRet));
 
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
 
-       nRet = iotcon_state_add_null(g_hState, KEY);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_null", IotConGetError(nRet));
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       nRet = iotcon_attributes_add_null(g_hAttributes, KEY);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_null", IotConGetError(nRet));
 
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
+       
        return 0;
 }
 
 
 //& type: auto
-//& purpose:  scenario to get type of state
+//& purpose:  scenario to get type of hAttributes
 /**
-* @testcase                    ITc_iotcon_state_get_type_p
+* @testcase                    ITc_iotcon_attributes_get_type_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to get type of state
-* @scenario                            iotcon_state_add_int \n
-*                                              iotcon_state_get_type
-* @apicovered                  iotcon_state_add_int,iotcon_state_get_type
-* @passcase                            if iotcon_state_get_type passes
-* @failcase                            if iotcon_state_get_type fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to get type of hAttributes
+* @scenario                            iotcon_attributes_add_int \n
+*                                              iotcon_attributes_get_type
+* @apicovered                  iotcon_attributes_add_int,iotcon_attributes_get_type
+* @passcase                            if iotcon_attributes_get_type passes
+* @failcase                            if iotcon_attributes_get_type fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_get_type_p(void)
+int ITc_iotcon_attributes_get_type_p(void)
 {
        START_TEST;
 
@@ -594,165 +594,165 @@ int ITc_iotcon_state_get_type_p(void)
 
        int nSetIntVal = 10;
 
-       int nRet = iotcon_state_add_int(g_hState, KEY, nSetIntVal);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_int", IotConGetError(nRet));
-
-       nRet = iotcon_state_get_type(g_hState, KEY, &eType);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_get_type", IotConGetError(nRet));
+       int nRet = iotcon_attributes_add_int(g_hAttributes, KEY, nSetIntVal);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_int", IotConGetError(nRet));
 
+       nRet = iotcon_attributes_get_type(g_hAttributes, KEY, &eType);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_get_type", IotConGetError(nRet));
+       
        if(eType != IOTCON_TYPE_INT)
        {
                FPRINTF("[Line : %d][%s] value mismatch  : \\n", __LINE__, API_NAMESPACE );
                return 1;
        }
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
 
        return 0;
 }
 
 
 //& type: auto
-//& purpose:  scenario to call a function for each element of state.
+//& purpose:  scenario to call a function for each element of hAttributes.
 /**
-* @testcase                    ITc_iotcon_state_foreach_p
+* @testcase                    ITc_iotcon_attributes_foreach_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to call a function for each element of state.
-* @scenario                            create and add state \n
-*                                              iotcon_state_foreach
-* @apicovered                  iotcon_state_foreach
-* @passcase                            if iotcon_state_foreach passes
-* @failcase                            if iotcon_state_foreach fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to call a function for each element of hAttributes.
+* @scenario                            create and add hAttributes \n
+*                                              iotcon_attributes_foreach
+* @apicovered                  iotcon_attributes_foreach
+* @passcase                            if iotcon_attributes_foreach passes
+* @failcase                            if iotcon_attributes_foreach fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_foreach_p(void)
+int ITc_iotcon_attributes_foreach_p(void)
 {
        START_TEST;
-
-       iotcon_state_h hState1, hState2;
+       
+       iotcon_attributes_h hState1, hState2;
        g_bCheckCb = false;
+                       
+       int nRet = iotcon_attributes_create(&hState1);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet));
+       CHECK_HANDLE(hState1,"iotcon_attributes_create");
 
-       int nRet = iotcon_state_create(&hState1);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet));
-       CHECK_HANDLE(hState1,"iotcon_state_create");
-
-       nRet = iotcon_state_create(&hState2);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1));
-       CHECK_HANDLE(hState2,"iotcon_state_create");
+       nRet = iotcon_attributes_create(&hState2);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1));
+       CHECK_HANDLE(hState2,"iotcon_attributes_create");
+       
+       nRet = iotcon_attributes_add_attributes(g_hAttributes, VALUE, hState1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_attributes", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1));
 
-       nRet = iotcon_state_add_state(g_hState, VALUE, hState1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_state", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1));
+       nRet = iotcon_attributes_add_attributes(g_hAttributes, KEY, hState2);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_attributes", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1));
 
-       nRet = iotcon_state_add_state(g_hState, KEY, hState2);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_state", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1));
-
-       nRet = iotcon_state_foreach(g_hState, IotconStateCB, "user_data");
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_foreach", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1));
+       nRet = iotcon_attributes_foreach(g_hAttributes, IotconStateCB, "user_data");
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_foreach", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1));
 
        if(g_bCheckCb == false)
        {
                FPRINTF("[Line : %d][%s] callback not invoked : \\n", __LINE__, API_NAMESPACE );
-               iotcon_state_destroy(hState2);hState2 = NULL;
-               iotcon_state_destroy(hState1);hState1 = NULL;
+               iotcon_attributes_destroy(hState2);hState2 = NULL;
+               iotcon_attributes_destroy(hState1);hState1 = NULL;
                return 1;
        }
-
-       nRet = iotcon_state_remove(g_hState, VALUE);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
-
-       iotcon_state_destroy(hState2);hState2 = NULL;
-       iotcon_state_destroy(hState1);hState1 = NULL;
-
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, VALUE);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
+               
+       iotcon_attributes_destroy(hState2);hState2 = NULL;
+       iotcon_attributes_destroy(hState1);hState1 = NULL;
+       
        return 0;
 }
 
 //& type: auto
-//& purpose:  scenario to get keys count of state
+//& purpose:  scenario to get keys count of hAttributes
 /**
-* @testcase                    ITc_iotcon_state_get_keys_count_p
+* @testcase                    ITc_iotcon_attributes_get_keys_count_p
 * @author              SRID(nibha.sharma)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to get keys count of state
-* @scenario                            create and add state \n
-*                                              iotcon_state_get_keys_count
-* @apicovered                  iotcon_state_get_keys_count
-* @passcase                            if iotcon_state_get_keys_count passes
-* @failcase                            if iotcon_state_get_keys_count fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to get keys count of hAttributes
+* @scenario                            create and add hAttributes \n
+*                                              iotcon_attributes_get_keys_count
+* @apicovered                  iotcon_attributes_get_keys_count
+* @passcase                            if iotcon_attributes_get_keys_count passes
+* @failcase                            if iotcon_attributes_get_keys_count fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_get_keys_count_p(void)
+int ITc_iotcon_attributes_get_keys_count_p(void)
 {
        START_TEST;
 
        unsigned int nCount =0;
-       iotcon_state_h hState1, hState2;
+       iotcon_attributes_h hState1, hState2;
 
-       int nRet = iotcon_state_create(&hState1);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet));
-       CHECK_HANDLE(hState1,"iotcon_state_create");
+       int nRet = iotcon_attributes_create(&hState1);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet));
+       CHECK_HANDLE(hState1,"iotcon_attributes_create");
 
-       nRet = iotcon_state_create(&hState2);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_create", IotConGetError(nRet),iotcon_state_destroy(hState1));
-       CHECK_HANDLE(hState2,"iotcon_state_create");
+       nRet = iotcon_attributes_create(&hState2);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_create", IotConGetError(nRet),iotcon_attributes_destroy(hState1));
+       CHECK_HANDLE(hState2,"iotcon_attributes_create");
 
-       nRet = iotcon_state_add_state(g_hState, VALUE, hState1);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_state", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1));
+       nRet = iotcon_attributes_add_attributes(g_hAttributes, VALUE, hState1);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_attributes", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1));
 
-       nRet = iotcon_state_add_state(g_hState, KEY, hState2);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_state", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1));
+       nRet = iotcon_attributes_add_attributes(g_hAttributes, KEY, hState2);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_attributes", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1));
 
-       nRet = iotcon_state_get_keys_count(g_hState, &nCount);
-       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_state_get_keys_count", IotConGetError(nRet),iotcon_state_destroy(hState2);iotcon_state_destroy(hState1));
+       nRet = iotcon_attributes_get_keys_count(g_hAttributes, &nCount);
+       PRINT_RESULT_CLEANUP(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_get_keys_count", IotConGetError(nRet),iotcon_attributes_destroy(hState2);iotcon_attributes_destroy(hState1));
 
        if (2 != nCount)
        {
                FPRINTF("[Line : %d][%s] value mismatch  : \\n", __LINE__, API_NAMESPACE );
-               iotcon_state_destroy(hState2);hState2 = NULL;
-               iotcon_state_destroy(hState1);hState1 = NULL;
+               iotcon_attributes_destroy(hState2);hState2 = NULL;
+               iotcon_attributes_destroy(hState1);hState1 = NULL;
                return 1;
        }
-
-       nRet = iotcon_state_remove(g_hState, VALUE);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
-
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
-
-       iotcon_state_destroy(hState2);hState2 = NULL;
-       iotcon_state_destroy(hState1);hState1 = NULL;
-
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, VALUE);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
+       
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
+
+       iotcon_attributes_destroy(hState2);hState2 = NULL;
+       iotcon_attributes_destroy(hState1);hState1 = NULL;
+       
        return 0;
 }
 
 //& type: auto
-//& purpose:  scenario to get keys count of state
+//& purpose:  scenario to get keys count of hAttributes
 /**
-* @testcase                    ITc_iotcon_state_add_get_byte_str_p
+* @testcase                    ITc_iotcon_attributes_add_get_byte_str_p
 * @author              SRID(asit.s)
 * @reviewer            SRID(parshant.v)
 * @type                                auto
 * @since_tizen                         3.0
-* @description                 scenario to get keys count of state
-* @scenario                            create and add state \n
-*                                              iotcon_state_add_byte_str
-* @apicovered                  iotcon_state_add_byte_str
-* @passcase                            if iotcon_state_add_byte_str passes
-* @failcase                            if iotcon_state_add_byte_str fails
-* @precondition                        iotcon should be connected & create state
-* @postcondition               iotcon should be disconnected & destroy state
+* @description                 scenario to get keys count of hAttributes
+* @scenario                            create and add hAttributes \n
+*                                              iotcon_attributes_add_byte_str
+* @apicovered                  iotcon_attributes_add_byte_str
+* @passcase                            if iotcon_attributes_add_byte_str passes
+* @failcase                            if iotcon_attributes_add_byte_str fails
+* @precondition                        iotcon should be connected & create hAttributes
+* @postcondition               iotcon should be disconnected & destroy hAttributes
 */
-int ITc_iotcon_state_add_get_byte_str_p(void)
+int ITc_iotcon_attributes_add_get_byte_str_p(void)
 {
        START_TEST;
 
@@ -761,29 +761,29 @@ int ITc_iotcon_state_add_get_byte_str_p(void)
        int len =  0;
        int i;
 
-       int nRet = iotcon_state_add_byte_str(g_hState, KEY, SetValue, sizeof(SetValue)/sizeof(unsigned char));
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_add_str", IotConGetError(nRet));
+       int nRet = iotcon_attributes_add_byte_str(g_hAttributes, KEY, SetValue, sizeof(SetValue)/sizeof(unsigned char));
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_add_str", IotConGetError(nRet));
 
-       nRet = iotcon_state_get_byte_str(g_hState, KEY, &GetValue, &len);
-       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_state_get_str", IotConGetError(nRet));
+       nRet = iotcon_attributes_get_byte_str(g_hAttributes, KEY, &GetValue, &len);
+       PRINT_RESULT(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_get_str", IotConGetError(nRet));
 
        if( sizeof(SetValue)/sizeof(unsigned char) != len )
        {
                FPRINTF("[Line : %d][%s] len mismatch \\n", __LINE__, API_NAMESPACE );
-               iotcon_state_remove(g_hState, KEY);
+               iotcon_attributes_remove(g_hAttributes, KEY);
                return 1;
        }
 
        for (i = 0; i < sizeof(SetValue)/sizeof(unsigned char); i++) {
                if (GetValue[i] != SetValue[i]) {
                        FPRINTF("[Line : %d][%s] value mismatch \\n", __LINE__, API_NAMESPACE );
-                       iotcon_state_remove(g_hState, KEY);
+                       iotcon_attributes_remove(g_hAttributes, KEY);
                        return 1;
                }
        }
 
-       nRet = iotcon_state_remove(g_hState, KEY);
-       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_state_remove", IotConGetError(nRet));
+       nRet = iotcon_attributes_remove(g_hAttributes, KEY);
+       PRINT_RESULT_NORETURN(IOTCON_ERROR_NONE, nRet, "iotcon_attributes_remove", IotConGetError(nRet));
        return 0;
 }
 
index bd2d5ab..37226fa 100755 (executable)
@@ -45,8 +45,8 @@ extern void ITs_iotcon_response_startup(void);
 extern void ITs_iotcon_response_cleanup(void);
 extern void ITs_iotcon_startup(void);
 extern void ITs_iotcon_cleanup(void);
-extern void ITs_iotcon_state_startup(void);
-extern void ITs_iotcon_state_cleanup(void);
+extern void ITs_iotcon_attributes_startup(void);
+extern void ITs_iotcon_attributes_cleanup(void);
 extern void ITs_iotcon_security_startup(void);
 extern void ITs_iotcon_security_cleanup(void);
 extern void ITs_iotcon_presence_response_startup(void);
@@ -61,7 +61,7 @@ extern int ITc_iotcon_list_add_get_nth_bool_p(void);
 extern int ITc_iotcon_list_add_get_nth_double_p(void);
 extern int ITc_iotcon_list_add_get_nth_str_p(void);
 extern int ITc_iotcon_list_add_get_nth_list_p(void);
-extern int ITc_iotcon_list_add_get_nth_state_p(void);
+extern int ITc_iotcon_list_add_get_nth_attributes_p(void);
 extern int ITc_iotcon_list_remove_nth_p(void);
 extern int ITc_iotcon_list_get_type_p(void);
 extern int ITc_iotcon_list_get_length_p(void);
@@ -70,13 +70,13 @@ extern int ITc_iotcon_list_foreach_bool_p(void);
 extern int ITc_iotcon_list_foreach_double_p(void);
 extern int ITc_iotcon_list_foreach_str_p(void);
 extern int ITc_iotcon_list_foreach_list_p(void);
-extern int ITc_iotcon_list_foreach_state_p(void);
+extern int ITc_iotcon_list_foreach_attributes_p(void);
 extern int ITc_iotcon_list_add_byte_str_p(void);
 extern int ITc_iotcon_list_get_nth_byte_str_p(void);
 extern int ITc_iotcon_list_foreach_byte_str_p(void);
 extern int ITc_iotcon_lite_resource_create_destroy_p(void);
-extern int ITc_iotcon_lite_resource_update_state_p(void);
-extern int ITc_iotcon_lite_resource_get_state_p(void);
+extern int ITc_iotcon_lite_resource_update_attributes_p(void);
+extern int ITc_iotcon_lite_resource_get_attributes_p(void);
 extern int ITc_iotcon_observers_create_destroy_p(void);
 extern int ITc_iotcon_observers_add_remove_p(void);
 extern int ITc_iotcon_options_create_destroy_p(void);
@@ -110,7 +110,7 @@ extern int ITc_iotcon_remote_resource_get_host_address_p(void);
 extern int ITc_iotcon_remote_resource_get_device_id_p(void);
 extern int ITc_iotcon_remote_resource_get_types_p(void);
 extern int ITc_iotcon_remote_resource_get_interfaces_p(void);
-extern int ITc_iotcon_remote_resource_get_properties_p(void);
+extern int ITc_iotcon_remote_resource_get_policies_p(void);
 extern int ITc_iotcon_remote_resource_set_get_options_p(void);
 extern int ITc_iotcon_remote_resource_get_cached_representation_p(void);
 extern int ITc_iotcon_remote_resource_set_get_time_interval_p(void);
@@ -119,7 +119,7 @@ extern int ITc_iotcon_representation_clone_p(void);
 extern int ITc_iotcon_representation_set_get_uri_path_p(void);
 extern int ITc_iotcon_representation_set_get_resource_types_p(void);
 extern int ITc_iotcon_representation_set_get_resource_interfaces_p(void);
-extern int ITc_iotcon_representation_set_get_state_p(void);
+extern int ITc_iotcon_representation_set_get_attributes_p(void);
 extern int ITc_iotcon_representation_add_remove_child_p(void);
 extern int ITc_iotcon_representation_foreach_children_p(void);
 extern int ITc_iotcon_representation_get_child_count_p(void);
@@ -142,7 +142,7 @@ extern int ITc_iotcon_resource_get_nth_child_p(void);
 extern int ITc_iotcon_resource_get_uri_path_p(void);
 extern int ITc_iotcon_resource_get_types_p(void);
 extern int ITc_iotcon_resource_get_interfaces_p(void);
-extern int ITc_iotcon_resource_get_properties_p(void);
+extern int ITc_iotcon_resource_get_policies_p(void);
 extern int ITc_iotcon_resource_types_create_destroy_p(void);
 extern int ITc_iotcon_resource_types_add_remove_p(void);
 extern int ITc_iotcon_resource_types_foreach_p(void);
@@ -157,20 +157,20 @@ extern int ITc_iotcon_initialize_deinitialize_p(void);
 extern int ITc_iotcon_set_get_timeout_p(void);
 //extern int ITc_iotcon_set_get_polling_interval_p(void);
 //extern int ITc_iotcon_polling_invoke_p(void);
-extern int ITc_iotcon_state_create_destroy_p(void);
-extern int ITc_iotcon_state_clone_p(void);
-extern int ITc_iotcon_state_add_get_int_p(void);
-extern int ITc_iotcon_state_add_get_bool_p(void);
-extern int ITc_iotcon_state_add_get_double_p(void);
-extern int ITc_iotcon_state_add_get_str_p(void);
-extern int ITc_iotcon_state_add_get_list_p(void);
-extern int ITc_iotcon_state_add_get_state_p(void);
-extern int ITc_iotcon_state_add_is_null_p(void);
-extern int ITc_iotcon_state_remove_p(void);
-extern int ITc_iotcon_state_get_type_p(void);
-extern int ITc_iotcon_state_foreach_p(void);
-extern int ITc_iotcon_state_get_keys_count_p(void);
-extern int ITc_iotcon_state_add_get_byte_str_p(void);
+extern int ITc_iotcon_attributes_create_destroy_p(void);
+extern int ITc_iotcon_attributes_clone_p(void);
+extern int ITc_iotcon_attributes_add_get_int_p(void);
+extern int ITc_iotcon_attributes_add_get_bool_p(void);
+extern int ITc_iotcon_attributes_add_get_double_p(void);
+extern int ITc_iotcon_attributes_add_get_str_p(void);
+extern int ITc_iotcon_attributes_add_get_list_p(void);
+extern int ITc_iotcon_attributes_add_get_attributes_p(void);
+extern int ITc_iotcon_attributes_add_is_null_p(void);
+extern int ITc_iotcon_attributes_remove_p(void);
+extern int ITc_iotcon_attributes_get_type_p(void);
+extern int ITc_iotcon_attributes_foreach_p(void);
+extern int ITc_iotcon_attributes_get_keys_count_p(void);
+extern int ITc_iotcon_attributes_add_get_byte_str_p(void);
 //extern int ITc_iotcon_set_persistent_storage_p(void);
 
 
@@ -186,7 +186,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_list_add_get_nth_double_p", ITc_iotcon_list_add_get_nth_double_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_get_nth_str_p", ITc_iotcon_list_add_get_nth_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_get_nth_list_p", ITc_iotcon_list_add_get_nth_list_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
-    {"ITc_iotcon_list_add_get_nth_state_p", ITc_iotcon_list_add_get_nth_state_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
+    {"ITc_iotcon_list_add_get_nth_attributes_p", ITc_iotcon_list_add_get_nth_attributes_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_remove_nth_p", ITc_iotcon_list_remove_nth_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_type_p", ITc_iotcon_list_get_type_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_length_p", ITc_iotcon_list_get_length_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
@@ -195,13 +195,13 @@ testcase tc_array[] = {
     {"ITc_iotcon_list_foreach_double_p", ITc_iotcon_list_foreach_double_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_str_p", ITc_iotcon_list_foreach_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_list_p", ITc_iotcon_list_foreach_list_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
-    {"ITc_iotcon_list_foreach_state_p", ITc_iotcon_list_foreach_state_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
+    {"ITc_iotcon_list_foreach_attributes_p", ITc_iotcon_list_foreach_attributes_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_byte_str_p", ITc_iotcon_list_add_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_nth_byte_str_p", ITc_iotcon_list_get_nth_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_byte_str_p", ITc_iotcon_list_foreach_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_lite_resource_create_destroy_p", ITc_iotcon_lite_resource_create_destroy_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
-    {"ITc_iotcon_lite_resource_update_state_p", ITc_iotcon_lite_resource_update_state_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
-    {"ITc_iotcon_lite_resource_get_state_p", ITc_iotcon_lite_resource_get_state_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
+    {"ITc_iotcon_lite_resource_update_attributes_p", ITc_iotcon_lite_resource_update_attributes_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
+    {"ITc_iotcon_lite_resource_get_attributes_p", ITc_iotcon_lite_resource_get_attributes_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
     {"ITc_iotcon_observers_create_destroy_p", ITc_iotcon_observers_create_destroy_p, ITs_iotcon_observers_startup, ITs_iotcon_observers_cleanup},
     {"ITc_iotcon_observers_add_remove_p", ITc_iotcon_observers_add_remove_p, ITs_iotcon_observers_startup, ITs_iotcon_observers_cleanup},
     {"ITc_iotcon_options_create_destroy_p", ITc_iotcon_options_create_destroy_p, ITs_iotcon_options_startup, ITs_iotcon_options_cleanup},
@@ -235,7 +235,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_remote_resource_get_device_id_p", ITc_iotcon_remote_resource_get_device_id_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_types_p", ITc_iotcon_remote_resource_get_types_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_interfaces_p", ITc_iotcon_remote_resource_get_interfaces_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
-    {"ITc_iotcon_remote_resource_get_properties_p", ITc_iotcon_remote_resource_get_properties_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
+    {"ITc_iotcon_remote_resource_get_policies_p", ITc_iotcon_remote_resource_get_policies_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_set_get_options_p", ITc_iotcon_remote_resource_set_get_options_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_cached_representation_p", ITc_iotcon_remote_resource_get_cached_representation_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
        {"ITc_iotcon_remote_resource_set_get_time_interval_p", ITc_iotcon_remote_resource_set_get_time_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},     
@@ -244,7 +244,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_representation_set_get_uri_path_p", ITc_iotcon_representation_set_get_uri_path_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_resource_types_p", ITc_iotcon_representation_set_get_resource_types_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_resource_interfaces_p", ITc_iotcon_representation_set_get_resource_interfaces_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
-    {"ITc_iotcon_representation_set_get_state_p", ITc_iotcon_representation_set_get_state_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
+    {"ITc_iotcon_representation_set_get_attributes_p", ITc_iotcon_representation_set_get_attributes_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_add_remove_child_p", ITc_iotcon_representation_add_remove_child_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_foreach_children_p", ITc_iotcon_representation_foreach_children_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_get_child_count_p", ITc_iotcon_representation_get_child_count_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
@@ -267,7 +267,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_resource_get_uri_path_p", ITc_iotcon_resource_get_uri_path_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_get_types_p", ITc_iotcon_resource_get_types_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_get_interfaces_p", ITc_iotcon_resource_get_interfaces_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
-    {"ITc_iotcon_resource_get_properties_p", ITc_iotcon_resource_get_properties_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
+    {"ITc_iotcon_resource_get_policies_p", ITc_iotcon_resource_get_policies_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_create_destroy_p", ITc_iotcon_resource_types_create_destroy_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_add_remove_p", ITc_iotcon_resource_types_add_remove_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_foreach_p", ITc_iotcon_resource_types_foreach_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
@@ -282,20 +282,20 @@ testcase tc_array[] = {
     {"ITc_iotcon_set_get_timeout_p", ITc_iotcon_set_get_timeout_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
 //    {"ITc_iotcon_set_get_polling_interval_p", ITc_iotcon_set_get_polling_interval_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
 //    {"ITc_iotcon_polling_invoke_p", ITc_iotcon_polling_invoke_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
-    {"ITc_iotcon_state_create_destroy_p", ITc_iotcon_state_create_destroy_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_clone_p", ITc_iotcon_state_clone_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_int_p", ITc_iotcon_state_add_get_int_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_bool_p", ITc_iotcon_state_add_get_bool_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_double_p", ITc_iotcon_state_add_get_double_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_str_p", ITc_iotcon_state_add_get_str_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_list_p", ITc_iotcon_state_add_get_list_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_state_p", ITc_iotcon_state_add_get_state_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_is_null_p", ITc_iotcon_state_add_is_null_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_remove_p", ITc_iotcon_state_remove_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_get_type_p", ITc_iotcon_state_get_type_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_foreach_p", ITc_iotcon_state_foreach_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_get_keys_count_p", ITc_iotcon_state_get_keys_count_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_byte_str_p", ITc_iotcon_state_add_get_byte_str_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
+    {"ITc_iotcon_attributes_create_destroy_p", ITc_iotcon_attributes_create_destroy_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_clone_p", ITc_iotcon_attributes_clone_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_int_p", ITc_iotcon_attributes_add_get_int_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_bool_p", ITc_iotcon_attributes_add_get_bool_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_double_p", ITc_iotcon_attributes_add_get_double_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_str_p", ITc_iotcon_attributes_add_get_str_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_list_p", ITc_iotcon_attributes_add_get_list_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_attributes_p", ITc_iotcon_attributes_add_get_attributes_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_is_null_p", ITc_iotcon_attributes_add_is_null_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_remove_p", ITc_iotcon_attributes_remove_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_get_type_p", ITc_iotcon_attributes_get_type_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_foreach_p", ITc_iotcon_attributes_foreach_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_get_keys_count_p", ITc_iotcon_attributes_get_keys_count_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_byte_str_p", ITc_iotcon_attributes_add_get_byte_str_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
 //    {"ITc_iotcon_set_persistent_storage_p", ITc_iotcon_set_persistent_storage_p, ITs_iotcon_security_startup, ITs_iotcon_security_cleanup},
     {NULL, NULL}
 };
index bd2d5ab..37226fa 100755 (executable)
@@ -45,8 +45,8 @@ extern void ITs_iotcon_response_startup(void);
 extern void ITs_iotcon_response_cleanup(void);
 extern void ITs_iotcon_startup(void);
 extern void ITs_iotcon_cleanup(void);
-extern void ITs_iotcon_state_startup(void);
-extern void ITs_iotcon_state_cleanup(void);
+extern void ITs_iotcon_attributes_startup(void);
+extern void ITs_iotcon_attributes_cleanup(void);
 extern void ITs_iotcon_security_startup(void);
 extern void ITs_iotcon_security_cleanup(void);
 extern void ITs_iotcon_presence_response_startup(void);
@@ -61,7 +61,7 @@ extern int ITc_iotcon_list_add_get_nth_bool_p(void);
 extern int ITc_iotcon_list_add_get_nth_double_p(void);
 extern int ITc_iotcon_list_add_get_nth_str_p(void);
 extern int ITc_iotcon_list_add_get_nth_list_p(void);
-extern int ITc_iotcon_list_add_get_nth_state_p(void);
+extern int ITc_iotcon_list_add_get_nth_attributes_p(void);
 extern int ITc_iotcon_list_remove_nth_p(void);
 extern int ITc_iotcon_list_get_type_p(void);
 extern int ITc_iotcon_list_get_length_p(void);
@@ -70,13 +70,13 @@ extern int ITc_iotcon_list_foreach_bool_p(void);
 extern int ITc_iotcon_list_foreach_double_p(void);
 extern int ITc_iotcon_list_foreach_str_p(void);
 extern int ITc_iotcon_list_foreach_list_p(void);
-extern int ITc_iotcon_list_foreach_state_p(void);
+extern int ITc_iotcon_list_foreach_attributes_p(void);
 extern int ITc_iotcon_list_add_byte_str_p(void);
 extern int ITc_iotcon_list_get_nth_byte_str_p(void);
 extern int ITc_iotcon_list_foreach_byte_str_p(void);
 extern int ITc_iotcon_lite_resource_create_destroy_p(void);
-extern int ITc_iotcon_lite_resource_update_state_p(void);
-extern int ITc_iotcon_lite_resource_get_state_p(void);
+extern int ITc_iotcon_lite_resource_update_attributes_p(void);
+extern int ITc_iotcon_lite_resource_get_attributes_p(void);
 extern int ITc_iotcon_observers_create_destroy_p(void);
 extern int ITc_iotcon_observers_add_remove_p(void);
 extern int ITc_iotcon_options_create_destroy_p(void);
@@ -110,7 +110,7 @@ extern int ITc_iotcon_remote_resource_get_host_address_p(void);
 extern int ITc_iotcon_remote_resource_get_device_id_p(void);
 extern int ITc_iotcon_remote_resource_get_types_p(void);
 extern int ITc_iotcon_remote_resource_get_interfaces_p(void);
-extern int ITc_iotcon_remote_resource_get_properties_p(void);
+extern int ITc_iotcon_remote_resource_get_policies_p(void);
 extern int ITc_iotcon_remote_resource_set_get_options_p(void);
 extern int ITc_iotcon_remote_resource_get_cached_representation_p(void);
 extern int ITc_iotcon_remote_resource_set_get_time_interval_p(void);
@@ -119,7 +119,7 @@ extern int ITc_iotcon_representation_clone_p(void);
 extern int ITc_iotcon_representation_set_get_uri_path_p(void);
 extern int ITc_iotcon_representation_set_get_resource_types_p(void);
 extern int ITc_iotcon_representation_set_get_resource_interfaces_p(void);
-extern int ITc_iotcon_representation_set_get_state_p(void);
+extern int ITc_iotcon_representation_set_get_attributes_p(void);
 extern int ITc_iotcon_representation_add_remove_child_p(void);
 extern int ITc_iotcon_representation_foreach_children_p(void);
 extern int ITc_iotcon_representation_get_child_count_p(void);
@@ -142,7 +142,7 @@ extern int ITc_iotcon_resource_get_nth_child_p(void);
 extern int ITc_iotcon_resource_get_uri_path_p(void);
 extern int ITc_iotcon_resource_get_types_p(void);
 extern int ITc_iotcon_resource_get_interfaces_p(void);
-extern int ITc_iotcon_resource_get_properties_p(void);
+extern int ITc_iotcon_resource_get_policies_p(void);
 extern int ITc_iotcon_resource_types_create_destroy_p(void);
 extern int ITc_iotcon_resource_types_add_remove_p(void);
 extern int ITc_iotcon_resource_types_foreach_p(void);
@@ -157,20 +157,20 @@ extern int ITc_iotcon_initialize_deinitialize_p(void);
 extern int ITc_iotcon_set_get_timeout_p(void);
 //extern int ITc_iotcon_set_get_polling_interval_p(void);
 //extern int ITc_iotcon_polling_invoke_p(void);
-extern int ITc_iotcon_state_create_destroy_p(void);
-extern int ITc_iotcon_state_clone_p(void);
-extern int ITc_iotcon_state_add_get_int_p(void);
-extern int ITc_iotcon_state_add_get_bool_p(void);
-extern int ITc_iotcon_state_add_get_double_p(void);
-extern int ITc_iotcon_state_add_get_str_p(void);
-extern int ITc_iotcon_state_add_get_list_p(void);
-extern int ITc_iotcon_state_add_get_state_p(void);
-extern int ITc_iotcon_state_add_is_null_p(void);
-extern int ITc_iotcon_state_remove_p(void);
-extern int ITc_iotcon_state_get_type_p(void);
-extern int ITc_iotcon_state_foreach_p(void);
-extern int ITc_iotcon_state_get_keys_count_p(void);
-extern int ITc_iotcon_state_add_get_byte_str_p(void);
+extern int ITc_iotcon_attributes_create_destroy_p(void);
+extern int ITc_iotcon_attributes_clone_p(void);
+extern int ITc_iotcon_attributes_add_get_int_p(void);
+extern int ITc_iotcon_attributes_add_get_bool_p(void);
+extern int ITc_iotcon_attributes_add_get_double_p(void);
+extern int ITc_iotcon_attributes_add_get_str_p(void);
+extern int ITc_iotcon_attributes_add_get_list_p(void);
+extern int ITc_iotcon_attributes_add_get_attributes_p(void);
+extern int ITc_iotcon_attributes_add_is_null_p(void);
+extern int ITc_iotcon_attributes_remove_p(void);
+extern int ITc_iotcon_attributes_get_type_p(void);
+extern int ITc_iotcon_attributes_foreach_p(void);
+extern int ITc_iotcon_attributes_get_keys_count_p(void);
+extern int ITc_iotcon_attributes_add_get_byte_str_p(void);
 //extern int ITc_iotcon_set_persistent_storage_p(void);
 
 
@@ -186,7 +186,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_list_add_get_nth_double_p", ITc_iotcon_list_add_get_nth_double_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_get_nth_str_p", ITc_iotcon_list_add_get_nth_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_get_nth_list_p", ITc_iotcon_list_add_get_nth_list_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
-    {"ITc_iotcon_list_add_get_nth_state_p", ITc_iotcon_list_add_get_nth_state_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
+    {"ITc_iotcon_list_add_get_nth_attributes_p", ITc_iotcon_list_add_get_nth_attributes_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_remove_nth_p", ITc_iotcon_list_remove_nth_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_type_p", ITc_iotcon_list_get_type_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_length_p", ITc_iotcon_list_get_length_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
@@ -195,13 +195,13 @@ testcase tc_array[] = {
     {"ITc_iotcon_list_foreach_double_p", ITc_iotcon_list_foreach_double_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_str_p", ITc_iotcon_list_foreach_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_list_p", ITc_iotcon_list_foreach_list_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
-    {"ITc_iotcon_list_foreach_state_p", ITc_iotcon_list_foreach_state_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
+    {"ITc_iotcon_list_foreach_attributes_p", ITc_iotcon_list_foreach_attributes_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_byte_str_p", ITc_iotcon_list_add_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_nth_byte_str_p", ITc_iotcon_list_get_nth_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_byte_str_p", ITc_iotcon_list_foreach_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_lite_resource_create_destroy_p", ITc_iotcon_lite_resource_create_destroy_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
-    {"ITc_iotcon_lite_resource_update_state_p", ITc_iotcon_lite_resource_update_state_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
-    {"ITc_iotcon_lite_resource_get_state_p", ITc_iotcon_lite_resource_get_state_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
+    {"ITc_iotcon_lite_resource_update_attributes_p", ITc_iotcon_lite_resource_update_attributes_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
+    {"ITc_iotcon_lite_resource_get_attributes_p", ITc_iotcon_lite_resource_get_attributes_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
     {"ITc_iotcon_observers_create_destroy_p", ITc_iotcon_observers_create_destroy_p, ITs_iotcon_observers_startup, ITs_iotcon_observers_cleanup},
     {"ITc_iotcon_observers_add_remove_p", ITc_iotcon_observers_add_remove_p, ITs_iotcon_observers_startup, ITs_iotcon_observers_cleanup},
     {"ITc_iotcon_options_create_destroy_p", ITc_iotcon_options_create_destroy_p, ITs_iotcon_options_startup, ITs_iotcon_options_cleanup},
@@ -235,7 +235,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_remote_resource_get_device_id_p", ITc_iotcon_remote_resource_get_device_id_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_types_p", ITc_iotcon_remote_resource_get_types_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_interfaces_p", ITc_iotcon_remote_resource_get_interfaces_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
-    {"ITc_iotcon_remote_resource_get_properties_p", ITc_iotcon_remote_resource_get_properties_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
+    {"ITc_iotcon_remote_resource_get_policies_p", ITc_iotcon_remote_resource_get_policies_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_set_get_options_p", ITc_iotcon_remote_resource_set_get_options_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_cached_representation_p", ITc_iotcon_remote_resource_get_cached_representation_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
        {"ITc_iotcon_remote_resource_set_get_time_interval_p", ITc_iotcon_remote_resource_set_get_time_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},     
@@ -244,7 +244,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_representation_set_get_uri_path_p", ITc_iotcon_representation_set_get_uri_path_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_resource_types_p", ITc_iotcon_representation_set_get_resource_types_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_resource_interfaces_p", ITc_iotcon_representation_set_get_resource_interfaces_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
-    {"ITc_iotcon_representation_set_get_state_p", ITc_iotcon_representation_set_get_state_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
+    {"ITc_iotcon_representation_set_get_attributes_p", ITc_iotcon_representation_set_get_attributes_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_add_remove_child_p", ITc_iotcon_representation_add_remove_child_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_foreach_children_p", ITc_iotcon_representation_foreach_children_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_get_child_count_p", ITc_iotcon_representation_get_child_count_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
@@ -267,7 +267,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_resource_get_uri_path_p", ITc_iotcon_resource_get_uri_path_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_get_types_p", ITc_iotcon_resource_get_types_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_get_interfaces_p", ITc_iotcon_resource_get_interfaces_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
-    {"ITc_iotcon_resource_get_properties_p", ITc_iotcon_resource_get_properties_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
+    {"ITc_iotcon_resource_get_policies_p", ITc_iotcon_resource_get_policies_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_create_destroy_p", ITc_iotcon_resource_types_create_destroy_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_add_remove_p", ITc_iotcon_resource_types_add_remove_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_foreach_p", ITc_iotcon_resource_types_foreach_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
@@ -282,20 +282,20 @@ testcase tc_array[] = {
     {"ITc_iotcon_set_get_timeout_p", ITc_iotcon_set_get_timeout_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
 //    {"ITc_iotcon_set_get_polling_interval_p", ITc_iotcon_set_get_polling_interval_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
 //    {"ITc_iotcon_polling_invoke_p", ITc_iotcon_polling_invoke_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
-    {"ITc_iotcon_state_create_destroy_p", ITc_iotcon_state_create_destroy_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_clone_p", ITc_iotcon_state_clone_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_int_p", ITc_iotcon_state_add_get_int_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_bool_p", ITc_iotcon_state_add_get_bool_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_double_p", ITc_iotcon_state_add_get_double_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_str_p", ITc_iotcon_state_add_get_str_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_list_p", ITc_iotcon_state_add_get_list_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_state_p", ITc_iotcon_state_add_get_state_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_is_null_p", ITc_iotcon_state_add_is_null_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_remove_p", ITc_iotcon_state_remove_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_get_type_p", ITc_iotcon_state_get_type_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_foreach_p", ITc_iotcon_state_foreach_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_get_keys_count_p", ITc_iotcon_state_get_keys_count_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_byte_str_p", ITc_iotcon_state_add_get_byte_str_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
+    {"ITc_iotcon_attributes_create_destroy_p", ITc_iotcon_attributes_create_destroy_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_clone_p", ITc_iotcon_attributes_clone_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_int_p", ITc_iotcon_attributes_add_get_int_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_bool_p", ITc_iotcon_attributes_add_get_bool_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_double_p", ITc_iotcon_attributes_add_get_double_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_str_p", ITc_iotcon_attributes_add_get_str_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_list_p", ITc_iotcon_attributes_add_get_list_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_attributes_p", ITc_iotcon_attributes_add_get_attributes_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_is_null_p", ITc_iotcon_attributes_add_is_null_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_remove_p", ITc_iotcon_attributes_remove_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_get_type_p", ITc_iotcon_attributes_get_type_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_foreach_p", ITc_iotcon_attributes_foreach_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_get_keys_count_p", ITc_iotcon_attributes_get_keys_count_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_byte_str_p", ITc_iotcon_attributes_add_get_byte_str_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
 //    {"ITc_iotcon_set_persistent_storage_p", ITc_iotcon_set_persistent_storage_p, ITs_iotcon_security_startup, ITs_iotcon_security_cleanup},
     {NULL, NULL}
 };
index bd2d5ab..37226fa 100755 (executable)
@@ -45,8 +45,8 @@ extern void ITs_iotcon_response_startup(void);
 extern void ITs_iotcon_response_cleanup(void);
 extern void ITs_iotcon_startup(void);
 extern void ITs_iotcon_cleanup(void);
-extern void ITs_iotcon_state_startup(void);
-extern void ITs_iotcon_state_cleanup(void);
+extern void ITs_iotcon_attributes_startup(void);
+extern void ITs_iotcon_attributes_cleanup(void);
 extern void ITs_iotcon_security_startup(void);
 extern void ITs_iotcon_security_cleanup(void);
 extern void ITs_iotcon_presence_response_startup(void);
@@ -61,7 +61,7 @@ extern int ITc_iotcon_list_add_get_nth_bool_p(void);
 extern int ITc_iotcon_list_add_get_nth_double_p(void);
 extern int ITc_iotcon_list_add_get_nth_str_p(void);
 extern int ITc_iotcon_list_add_get_nth_list_p(void);
-extern int ITc_iotcon_list_add_get_nth_state_p(void);
+extern int ITc_iotcon_list_add_get_nth_attributes_p(void);
 extern int ITc_iotcon_list_remove_nth_p(void);
 extern int ITc_iotcon_list_get_type_p(void);
 extern int ITc_iotcon_list_get_length_p(void);
@@ -70,13 +70,13 @@ extern int ITc_iotcon_list_foreach_bool_p(void);
 extern int ITc_iotcon_list_foreach_double_p(void);
 extern int ITc_iotcon_list_foreach_str_p(void);
 extern int ITc_iotcon_list_foreach_list_p(void);
-extern int ITc_iotcon_list_foreach_state_p(void);
+extern int ITc_iotcon_list_foreach_attributes_p(void);
 extern int ITc_iotcon_list_add_byte_str_p(void);
 extern int ITc_iotcon_list_get_nth_byte_str_p(void);
 extern int ITc_iotcon_list_foreach_byte_str_p(void);
 extern int ITc_iotcon_lite_resource_create_destroy_p(void);
-extern int ITc_iotcon_lite_resource_update_state_p(void);
-extern int ITc_iotcon_lite_resource_get_state_p(void);
+extern int ITc_iotcon_lite_resource_update_attributes_p(void);
+extern int ITc_iotcon_lite_resource_get_attributes_p(void);
 extern int ITc_iotcon_observers_create_destroy_p(void);
 extern int ITc_iotcon_observers_add_remove_p(void);
 extern int ITc_iotcon_options_create_destroy_p(void);
@@ -110,7 +110,7 @@ extern int ITc_iotcon_remote_resource_get_host_address_p(void);
 extern int ITc_iotcon_remote_resource_get_device_id_p(void);
 extern int ITc_iotcon_remote_resource_get_types_p(void);
 extern int ITc_iotcon_remote_resource_get_interfaces_p(void);
-extern int ITc_iotcon_remote_resource_get_properties_p(void);
+extern int ITc_iotcon_remote_resource_get_policies_p(void);
 extern int ITc_iotcon_remote_resource_set_get_options_p(void);
 extern int ITc_iotcon_remote_resource_get_cached_representation_p(void);
 extern int ITc_iotcon_remote_resource_set_get_time_interval_p(void);
@@ -119,7 +119,7 @@ extern int ITc_iotcon_representation_clone_p(void);
 extern int ITc_iotcon_representation_set_get_uri_path_p(void);
 extern int ITc_iotcon_representation_set_get_resource_types_p(void);
 extern int ITc_iotcon_representation_set_get_resource_interfaces_p(void);
-extern int ITc_iotcon_representation_set_get_state_p(void);
+extern int ITc_iotcon_representation_set_get_attributes_p(void);
 extern int ITc_iotcon_representation_add_remove_child_p(void);
 extern int ITc_iotcon_representation_foreach_children_p(void);
 extern int ITc_iotcon_representation_get_child_count_p(void);
@@ -142,7 +142,7 @@ extern int ITc_iotcon_resource_get_nth_child_p(void);
 extern int ITc_iotcon_resource_get_uri_path_p(void);
 extern int ITc_iotcon_resource_get_types_p(void);
 extern int ITc_iotcon_resource_get_interfaces_p(void);
-extern int ITc_iotcon_resource_get_properties_p(void);
+extern int ITc_iotcon_resource_get_policies_p(void);
 extern int ITc_iotcon_resource_types_create_destroy_p(void);
 extern int ITc_iotcon_resource_types_add_remove_p(void);
 extern int ITc_iotcon_resource_types_foreach_p(void);
@@ -157,20 +157,20 @@ extern int ITc_iotcon_initialize_deinitialize_p(void);
 extern int ITc_iotcon_set_get_timeout_p(void);
 //extern int ITc_iotcon_set_get_polling_interval_p(void);
 //extern int ITc_iotcon_polling_invoke_p(void);
-extern int ITc_iotcon_state_create_destroy_p(void);
-extern int ITc_iotcon_state_clone_p(void);
-extern int ITc_iotcon_state_add_get_int_p(void);
-extern int ITc_iotcon_state_add_get_bool_p(void);
-extern int ITc_iotcon_state_add_get_double_p(void);
-extern int ITc_iotcon_state_add_get_str_p(void);
-extern int ITc_iotcon_state_add_get_list_p(void);
-extern int ITc_iotcon_state_add_get_state_p(void);
-extern int ITc_iotcon_state_add_is_null_p(void);
-extern int ITc_iotcon_state_remove_p(void);
-extern int ITc_iotcon_state_get_type_p(void);
-extern int ITc_iotcon_state_foreach_p(void);
-extern int ITc_iotcon_state_get_keys_count_p(void);
-extern int ITc_iotcon_state_add_get_byte_str_p(void);
+extern int ITc_iotcon_attributes_create_destroy_p(void);
+extern int ITc_iotcon_attributes_clone_p(void);
+extern int ITc_iotcon_attributes_add_get_int_p(void);
+extern int ITc_iotcon_attributes_add_get_bool_p(void);
+extern int ITc_iotcon_attributes_add_get_double_p(void);
+extern int ITc_iotcon_attributes_add_get_str_p(void);
+extern int ITc_iotcon_attributes_add_get_list_p(void);
+extern int ITc_iotcon_attributes_add_get_attributes_p(void);
+extern int ITc_iotcon_attributes_add_is_null_p(void);
+extern int ITc_iotcon_attributes_remove_p(void);
+extern int ITc_iotcon_attributes_get_type_p(void);
+extern int ITc_iotcon_attributes_foreach_p(void);
+extern int ITc_iotcon_attributes_get_keys_count_p(void);
+extern int ITc_iotcon_attributes_add_get_byte_str_p(void);
 //extern int ITc_iotcon_set_persistent_storage_p(void);
 
 
@@ -186,7 +186,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_list_add_get_nth_double_p", ITc_iotcon_list_add_get_nth_double_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_get_nth_str_p", ITc_iotcon_list_add_get_nth_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_get_nth_list_p", ITc_iotcon_list_add_get_nth_list_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
-    {"ITc_iotcon_list_add_get_nth_state_p", ITc_iotcon_list_add_get_nth_state_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
+    {"ITc_iotcon_list_add_get_nth_attributes_p", ITc_iotcon_list_add_get_nth_attributes_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_remove_nth_p", ITc_iotcon_list_remove_nth_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_type_p", ITc_iotcon_list_get_type_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_length_p", ITc_iotcon_list_get_length_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
@@ -195,13 +195,13 @@ testcase tc_array[] = {
     {"ITc_iotcon_list_foreach_double_p", ITc_iotcon_list_foreach_double_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_str_p", ITc_iotcon_list_foreach_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_list_p", ITc_iotcon_list_foreach_list_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
-    {"ITc_iotcon_list_foreach_state_p", ITc_iotcon_list_foreach_state_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
+    {"ITc_iotcon_list_foreach_attributes_p", ITc_iotcon_list_foreach_attributes_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_byte_str_p", ITc_iotcon_list_add_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_nth_byte_str_p", ITc_iotcon_list_get_nth_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_byte_str_p", ITc_iotcon_list_foreach_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_lite_resource_create_destroy_p", ITc_iotcon_lite_resource_create_destroy_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
-    {"ITc_iotcon_lite_resource_update_state_p", ITc_iotcon_lite_resource_update_state_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
-    {"ITc_iotcon_lite_resource_get_state_p", ITc_iotcon_lite_resource_get_state_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
+    {"ITc_iotcon_lite_resource_update_attributes_p", ITc_iotcon_lite_resource_update_attributes_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
+    {"ITc_iotcon_lite_resource_get_attributes_p", ITc_iotcon_lite_resource_get_attributes_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
     {"ITc_iotcon_observers_create_destroy_p", ITc_iotcon_observers_create_destroy_p, ITs_iotcon_observers_startup, ITs_iotcon_observers_cleanup},
     {"ITc_iotcon_observers_add_remove_p", ITc_iotcon_observers_add_remove_p, ITs_iotcon_observers_startup, ITs_iotcon_observers_cleanup},
     {"ITc_iotcon_options_create_destroy_p", ITc_iotcon_options_create_destroy_p, ITs_iotcon_options_startup, ITs_iotcon_options_cleanup},
@@ -235,7 +235,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_remote_resource_get_device_id_p", ITc_iotcon_remote_resource_get_device_id_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_types_p", ITc_iotcon_remote_resource_get_types_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_interfaces_p", ITc_iotcon_remote_resource_get_interfaces_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
-    {"ITc_iotcon_remote_resource_get_properties_p", ITc_iotcon_remote_resource_get_properties_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
+    {"ITc_iotcon_remote_resource_get_policies_p", ITc_iotcon_remote_resource_get_policies_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_set_get_options_p", ITc_iotcon_remote_resource_set_get_options_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_cached_representation_p", ITc_iotcon_remote_resource_get_cached_representation_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
        {"ITc_iotcon_remote_resource_set_get_time_interval_p", ITc_iotcon_remote_resource_set_get_time_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},     
@@ -244,7 +244,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_representation_set_get_uri_path_p", ITc_iotcon_representation_set_get_uri_path_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_resource_types_p", ITc_iotcon_representation_set_get_resource_types_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_resource_interfaces_p", ITc_iotcon_representation_set_get_resource_interfaces_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
-    {"ITc_iotcon_representation_set_get_state_p", ITc_iotcon_representation_set_get_state_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
+    {"ITc_iotcon_representation_set_get_attributes_p", ITc_iotcon_representation_set_get_attributes_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_add_remove_child_p", ITc_iotcon_representation_add_remove_child_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_foreach_children_p", ITc_iotcon_representation_foreach_children_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_get_child_count_p", ITc_iotcon_representation_get_child_count_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
@@ -267,7 +267,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_resource_get_uri_path_p", ITc_iotcon_resource_get_uri_path_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_get_types_p", ITc_iotcon_resource_get_types_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_get_interfaces_p", ITc_iotcon_resource_get_interfaces_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
-    {"ITc_iotcon_resource_get_properties_p", ITc_iotcon_resource_get_properties_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
+    {"ITc_iotcon_resource_get_policies_p", ITc_iotcon_resource_get_policies_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_create_destroy_p", ITc_iotcon_resource_types_create_destroy_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_add_remove_p", ITc_iotcon_resource_types_add_remove_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_foreach_p", ITc_iotcon_resource_types_foreach_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
@@ -282,20 +282,20 @@ testcase tc_array[] = {
     {"ITc_iotcon_set_get_timeout_p", ITc_iotcon_set_get_timeout_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
 //    {"ITc_iotcon_set_get_polling_interval_p", ITc_iotcon_set_get_polling_interval_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
 //    {"ITc_iotcon_polling_invoke_p", ITc_iotcon_polling_invoke_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
-    {"ITc_iotcon_state_create_destroy_p", ITc_iotcon_state_create_destroy_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_clone_p", ITc_iotcon_state_clone_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_int_p", ITc_iotcon_state_add_get_int_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_bool_p", ITc_iotcon_state_add_get_bool_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_double_p", ITc_iotcon_state_add_get_double_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_str_p", ITc_iotcon_state_add_get_str_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_list_p", ITc_iotcon_state_add_get_list_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_state_p", ITc_iotcon_state_add_get_state_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_is_null_p", ITc_iotcon_state_add_is_null_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_remove_p", ITc_iotcon_state_remove_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_get_type_p", ITc_iotcon_state_get_type_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_foreach_p", ITc_iotcon_state_foreach_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_get_keys_count_p", ITc_iotcon_state_get_keys_count_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_byte_str_p", ITc_iotcon_state_add_get_byte_str_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
+    {"ITc_iotcon_attributes_create_destroy_p", ITc_iotcon_attributes_create_destroy_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_clone_p", ITc_iotcon_attributes_clone_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_int_p", ITc_iotcon_attributes_add_get_int_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_bool_p", ITc_iotcon_attributes_add_get_bool_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_double_p", ITc_iotcon_attributes_add_get_double_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_str_p", ITc_iotcon_attributes_add_get_str_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_list_p", ITc_iotcon_attributes_add_get_list_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_attributes_p", ITc_iotcon_attributes_add_get_attributes_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_is_null_p", ITc_iotcon_attributes_add_is_null_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_remove_p", ITc_iotcon_attributes_remove_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_get_type_p", ITc_iotcon_attributes_get_type_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_foreach_p", ITc_iotcon_attributes_foreach_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_get_keys_count_p", ITc_iotcon_attributes_get_keys_count_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_byte_str_p", ITc_iotcon_attributes_add_get_byte_str_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
 //    {"ITc_iotcon_set_persistent_storage_p", ITc_iotcon_set_persistent_storage_p, ITs_iotcon_security_startup, ITs_iotcon_security_cleanup},
     {NULL, NULL}
 };
index f0f54ec..37226fa 100755 (executable)
@@ -45,8 +45,8 @@ extern void ITs_iotcon_response_startup(void);
 extern void ITs_iotcon_response_cleanup(void);
 extern void ITs_iotcon_startup(void);
 extern void ITs_iotcon_cleanup(void);
-extern void ITs_iotcon_state_startup(void);
-extern void ITs_iotcon_state_cleanup(void);
+extern void ITs_iotcon_attributes_startup(void);
+extern void ITs_iotcon_attributes_cleanup(void);
 extern void ITs_iotcon_security_startup(void);
 extern void ITs_iotcon_security_cleanup(void);
 extern void ITs_iotcon_presence_response_startup(void);
@@ -61,7 +61,7 @@ extern int ITc_iotcon_list_add_get_nth_bool_p(void);
 extern int ITc_iotcon_list_add_get_nth_double_p(void);
 extern int ITc_iotcon_list_add_get_nth_str_p(void);
 extern int ITc_iotcon_list_add_get_nth_list_p(void);
-extern int ITc_iotcon_list_add_get_nth_state_p(void);
+extern int ITc_iotcon_list_add_get_nth_attributes_p(void);
 extern int ITc_iotcon_list_remove_nth_p(void);
 extern int ITc_iotcon_list_get_type_p(void);
 extern int ITc_iotcon_list_get_length_p(void);
@@ -70,13 +70,13 @@ extern int ITc_iotcon_list_foreach_bool_p(void);
 extern int ITc_iotcon_list_foreach_double_p(void);
 extern int ITc_iotcon_list_foreach_str_p(void);
 extern int ITc_iotcon_list_foreach_list_p(void);
-extern int ITc_iotcon_list_foreach_state_p(void);
+extern int ITc_iotcon_list_foreach_attributes_p(void);
 extern int ITc_iotcon_list_add_byte_str_p(void);
 extern int ITc_iotcon_list_get_nth_byte_str_p(void);
 extern int ITc_iotcon_list_foreach_byte_str_p(void);
 extern int ITc_iotcon_lite_resource_create_destroy_p(void);
-extern int ITc_iotcon_lite_resource_update_state_p(void);
-extern int ITc_iotcon_lite_resource_get_state_p(void);
+extern int ITc_iotcon_lite_resource_update_attributes_p(void);
+extern int ITc_iotcon_lite_resource_get_attributes_p(void);
 extern int ITc_iotcon_observers_create_destroy_p(void);
 extern int ITc_iotcon_observers_add_remove_p(void);
 extern int ITc_iotcon_options_create_destroy_p(void);
@@ -110,7 +110,7 @@ extern int ITc_iotcon_remote_resource_get_host_address_p(void);
 extern int ITc_iotcon_remote_resource_get_device_id_p(void);
 extern int ITc_iotcon_remote_resource_get_types_p(void);
 extern int ITc_iotcon_remote_resource_get_interfaces_p(void);
-extern int ITc_iotcon_remote_resource_get_properties_p(void);
+extern int ITc_iotcon_remote_resource_get_policies_p(void);
 extern int ITc_iotcon_remote_resource_set_get_options_p(void);
 extern int ITc_iotcon_remote_resource_get_cached_representation_p(void);
 extern int ITc_iotcon_remote_resource_set_get_time_interval_p(void);
@@ -119,7 +119,7 @@ extern int ITc_iotcon_representation_clone_p(void);
 extern int ITc_iotcon_representation_set_get_uri_path_p(void);
 extern int ITc_iotcon_representation_set_get_resource_types_p(void);
 extern int ITc_iotcon_representation_set_get_resource_interfaces_p(void);
-extern int ITc_iotcon_representation_set_get_state_p(void);
+extern int ITc_iotcon_representation_set_get_attributes_p(void);
 extern int ITc_iotcon_representation_add_remove_child_p(void);
 extern int ITc_iotcon_representation_foreach_children_p(void);
 extern int ITc_iotcon_representation_get_child_count_p(void);
@@ -142,7 +142,7 @@ extern int ITc_iotcon_resource_get_nth_child_p(void);
 extern int ITc_iotcon_resource_get_uri_path_p(void);
 extern int ITc_iotcon_resource_get_types_p(void);
 extern int ITc_iotcon_resource_get_interfaces_p(void);
-extern int ITc_iotcon_resource_get_properties_p(void);
+extern int ITc_iotcon_resource_get_policies_p(void);
 extern int ITc_iotcon_resource_types_create_destroy_p(void);
 extern int ITc_iotcon_resource_types_add_remove_p(void);
 extern int ITc_iotcon_resource_types_foreach_p(void);
@@ -157,20 +157,20 @@ extern int ITc_iotcon_initialize_deinitialize_p(void);
 extern int ITc_iotcon_set_get_timeout_p(void);
 //extern int ITc_iotcon_set_get_polling_interval_p(void);
 //extern int ITc_iotcon_polling_invoke_p(void);
-extern int ITc_iotcon_state_create_destroy_p(void);
-extern int ITc_iotcon_state_clone_p(void);
-extern int ITc_iotcon_state_add_get_int_p(void);
-extern int ITc_iotcon_state_add_get_bool_p(void);
-extern int ITc_iotcon_state_add_get_double_p(void);
-extern int ITc_iotcon_state_add_get_str_p(void);
-extern int ITc_iotcon_state_add_get_list_p(void);
-extern int ITc_iotcon_state_add_get_state_p(void);
-extern int ITc_iotcon_state_add_is_null_p(void);
-extern int ITc_iotcon_state_remove_p(void);
-extern int ITc_iotcon_state_get_type_p(void);
-extern int ITc_iotcon_state_foreach_p(void);
-extern int ITc_iotcon_state_get_keys_count_p(void);
-extern int ITc_iotcon_state_add_get_byte_str_p(void);
+extern int ITc_iotcon_attributes_create_destroy_p(void);
+extern int ITc_iotcon_attributes_clone_p(void);
+extern int ITc_iotcon_attributes_add_get_int_p(void);
+extern int ITc_iotcon_attributes_add_get_bool_p(void);
+extern int ITc_iotcon_attributes_add_get_double_p(void);
+extern int ITc_iotcon_attributes_add_get_str_p(void);
+extern int ITc_iotcon_attributes_add_get_list_p(void);
+extern int ITc_iotcon_attributes_add_get_attributes_p(void);
+extern int ITc_iotcon_attributes_add_is_null_p(void);
+extern int ITc_iotcon_attributes_remove_p(void);
+extern int ITc_iotcon_attributes_get_type_p(void);
+extern int ITc_iotcon_attributes_foreach_p(void);
+extern int ITc_iotcon_attributes_get_keys_count_p(void);
+extern int ITc_iotcon_attributes_add_get_byte_str_p(void);
 //extern int ITc_iotcon_set_persistent_storage_p(void);
 
 
@@ -186,7 +186,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_list_add_get_nth_double_p", ITc_iotcon_list_add_get_nth_double_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_get_nth_str_p", ITc_iotcon_list_add_get_nth_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_get_nth_list_p", ITc_iotcon_list_add_get_nth_list_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
-    {"ITc_iotcon_list_add_get_nth_state_p", ITc_iotcon_list_add_get_nth_state_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
+    {"ITc_iotcon_list_add_get_nth_attributes_p", ITc_iotcon_list_add_get_nth_attributes_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_remove_nth_p", ITc_iotcon_list_remove_nth_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_type_p", ITc_iotcon_list_get_type_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_length_p", ITc_iotcon_list_get_length_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
@@ -195,13 +195,13 @@ testcase tc_array[] = {
     {"ITc_iotcon_list_foreach_double_p", ITc_iotcon_list_foreach_double_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_str_p", ITc_iotcon_list_foreach_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_list_p", ITc_iotcon_list_foreach_list_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
-    {"ITc_iotcon_list_foreach_state_p", ITc_iotcon_list_foreach_state_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
+    {"ITc_iotcon_list_foreach_attributes_p", ITc_iotcon_list_foreach_attributes_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_add_byte_str_p", ITc_iotcon_list_add_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_get_nth_byte_str_p", ITc_iotcon_list_get_nth_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_list_foreach_byte_str_p", ITc_iotcon_list_foreach_byte_str_p, ITs_iotcon_list_startup, ITs_iotcon_list_cleanup},
     {"ITc_iotcon_lite_resource_create_destroy_p", ITc_iotcon_lite_resource_create_destroy_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
-    {"ITc_iotcon_lite_resource_update_state_p", ITc_iotcon_lite_resource_update_state_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
-    {"ITc_iotcon_lite_resource_get_state_p", ITc_iotcon_lite_resource_get_state_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
+    {"ITc_iotcon_lite_resource_update_attributes_p", ITc_iotcon_lite_resource_update_attributes_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
+    {"ITc_iotcon_lite_resource_get_attributes_p", ITc_iotcon_lite_resource_get_attributes_p, ITs_iotcon_lite_resource_startup, ITs_iotcon_lite_resource_cleanup},
     {"ITc_iotcon_observers_create_destroy_p", ITc_iotcon_observers_create_destroy_p, ITs_iotcon_observers_startup, ITs_iotcon_observers_cleanup},
     {"ITc_iotcon_observers_add_remove_p", ITc_iotcon_observers_add_remove_p, ITs_iotcon_observers_startup, ITs_iotcon_observers_cleanup},
     {"ITc_iotcon_options_create_destroy_p", ITc_iotcon_options_create_destroy_p, ITs_iotcon_options_startup, ITs_iotcon_options_cleanup},
@@ -235,16 +235,16 @@ testcase tc_array[] = {
     {"ITc_iotcon_remote_resource_get_device_id_p", ITc_iotcon_remote_resource_get_device_id_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_types_p", ITc_iotcon_remote_resource_get_types_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_interfaces_p", ITc_iotcon_remote_resource_get_interfaces_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
-    {"ITc_iotcon_remote_resource_get_properties_p", ITc_iotcon_remote_resource_get_properties_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
+    {"ITc_iotcon_remote_resource_get_policies_p", ITc_iotcon_remote_resource_get_policies_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_set_get_options_p", ITc_iotcon_remote_resource_set_get_options_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
     {"ITc_iotcon_remote_resource_get_cached_representation_p", ITc_iotcon_remote_resource_get_cached_representation_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
-       {"ITc_iotcon_remote_resource_set_get_time_interval_p", ITc_iotcon_remote_resource_set_get_time_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},
+       {"ITc_iotcon_remote_resource_set_get_time_interval_p", ITc_iotcon_remote_resource_set_get_time_interval_p, ITs_iotcon_remote_resource_startup, ITs_iotcon_remote_resource_cleanup},     
     {"ITc_iotcon_representation_create_destroy_p", ITc_iotcon_representation_create_destroy_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_clone_p", ITc_iotcon_representation_clone_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_uri_path_p", ITc_iotcon_representation_set_get_uri_path_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_resource_types_p", ITc_iotcon_representation_set_get_resource_types_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_set_get_resource_interfaces_p", ITc_iotcon_representation_set_get_resource_interfaces_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
-    {"ITc_iotcon_representation_set_get_state_p", ITc_iotcon_representation_set_get_state_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
+    {"ITc_iotcon_representation_set_get_attributes_p", ITc_iotcon_representation_set_get_attributes_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_add_remove_child_p", ITc_iotcon_representation_add_remove_child_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_foreach_children_p", ITc_iotcon_representation_foreach_children_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
     {"ITc_iotcon_representation_get_child_count_p", ITc_iotcon_representation_get_child_count_p, ITs_iotcon_representation_startup, ITs_iotcon_representation_cleanup},
@@ -267,7 +267,7 @@ testcase tc_array[] = {
     {"ITc_iotcon_resource_get_uri_path_p", ITc_iotcon_resource_get_uri_path_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_get_types_p", ITc_iotcon_resource_get_types_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_get_interfaces_p", ITc_iotcon_resource_get_interfaces_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
-    {"ITc_iotcon_resource_get_properties_p", ITc_iotcon_resource_get_properties_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
+    {"ITc_iotcon_resource_get_policies_p", ITc_iotcon_resource_get_policies_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_create_destroy_p", ITc_iotcon_resource_types_create_destroy_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_add_remove_p", ITc_iotcon_resource_types_add_remove_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
     {"ITc_iotcon_resource_types_foreach_p", ITc_iotcon_resource_types_foreach_p, ITs_iotcon_resource_startup, ITs_iotcon_resource_cleanup},
@@ -282,20 +282,20 @@ testcase tc_array[] = {
     {"ITc_iotcon_set_get_timeout_p", ITc_iotcon_set_get_timeout_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
 //    {"ITc_iotcon_set_get_polling_interval_p", ITc_iotcon_set_get_polling_interval_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
 //    {"ITc_iotcon_polling_invoke_p", ITc_iotcon_polling_invoke_p, ITs_iotcon_startup, ITs_iotcon_cleanup},
-    {"ITc_iotcon_state_create_destroy_p", ITc_iotcon_state_create_destroy_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_clone_p", ITc_iotcon_state_clone_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_int_p", ITc_iotcon_state_add_get_int_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_bool_p", ITc_iotcon_state_add_get_bool_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_double_p", ITc_iotcon_state_add_get_double_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_str_p", ITc_iotcon_state_add_get_str_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_list_p", ITc_iotcon_state_add_get_list_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_state_p", ITc_iotcon_state_add_get_state_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_is_null_p", ITc_iotcon_state_add_is_null_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_remove_p", ITc_iotcon_state_remove_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_get_type_p", ITc_iotcon_state_get_type_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_foreach_p", ITc_iotcon_state_foreach_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_get_keys_count_p", ITc_iotcon_state_get_keys_count_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
-    {"ITc_iotcon_state_add_get_byte_str_p", ITc_iotcon_state_add_get_byte_str_p, ITs_iotcon_state_startup, ITs_iotcon_state_cleanup},
+    {"ITc_iotcon_attributes_create_destroy_p", ITc_iotcon_attributes_create_destroy_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_clone_p", ITc_iotcon_attributes_clone_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_int_p", ITc_iotcon_attributes_add_get_int_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_bool_p", ITc_iotcon_attributes_add_get_bool_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_double_p", ITc_iotcon_attributes_add_get_double_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_str_p", ITc_iotcon_attributes_add_get_str_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_list_p", ITc_iotcon_attributes_add_get_list_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_attributes_p", ITc_iotcon_attributes_add_get_attributes_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_is_null_p", ITc_iotcon_attributes_add_is_null_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_remove_p", ITc_iotcon_attributes_remove_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_get_type_p", ITc_iotcon_attributes_get_type_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_foreach_p", ITc_iotcon_attributes_foreach_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_get_keys_count_p", ITc_iotcon_attributes_get_keys_count_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
+    {"ITc_iotcon_attributes_add_get_byte_str_p", ITc_iotcon_attributes_add_get_byte_str_p, ITs_iotcon_attributes_startup, ITs_iotcon_attributes_cleanup},
 //    {"ITc_iotcon_set_persistent_storage_p", ITc_iotcon_set_persistent_storage_p, ITs_iotcon_security_startup, ITs_iotcon_security_cleanup},
     {NULL, NULL}
 };