[UTC][IoTCon][ACR-631][Modify handle/enum/API change (state->attributes)]

Change-Id: Ic6c2ffaf7ad09e3f46a545f8dad7a51bfcbdbebc
Signed-off-by: sung.goo.kim <sung.goo.kim@samsung.com>

diff --git a/src/utc/iotcon/tct-iotcon-core_common_iot.h b/src/utc/iotcon/tct-iotcon-core_common_iot.h
index 9fd1171..156ffad 100755 (executable)
--- a/src/utc/iotcon/tct-iotcon-core_common_iot.h
+++ b/src/utc/iotcon/tct-iotcon-core_common_iot.h
@@ -54,10 +54,10 @@ extern int utc_iotcon_lite_resource_create_n(void);
 extern int utc_iotcon_lite_resource_create_p(void);
 extern int utc_iotcon_lite_resource_destroy_n(void);
 extern int utc_iotcon_lite_resource_destroy_p(void);
-extern int utc_iotcon_lite_resource_update_state_n(void);
-extern int utc_iotcon_lite_resource_update_state_p(void);
-extern int utc_iotcon_lite_resource_get_state_n(void);
-extern int utc_iotcon_lite_resource_get_state_p(void);
+extern int utc_iotcon_lite_resource_update_attributes_n(void);
+extern int utc_iotcon_lite_resource_update_attributes_p(void);
+extern int utc_iotcon_lite_resource_get_attributes_n(void);
+extern int utc_iotcon_lite_resource_get_attributes_p(void);
 extern int utc_iotcon_remote_resource_start_caching_n(void);
 extern int utc_iotcon_remote_resource_start_caching_p(void);
 extern int utc_iotcon_remote_resource_stop_caching_n(void);
@@ -144,52 +144,52 @@ extern int utc_iotcon_representation_set_resource_interfaces_n(void);
 extern int utc_iotcon_representation_set_resource_interfaces_p(void);
 extern int utc_iotcon_representation_get_resource_interfaces_n(void);
 extern int utc_iotcon_representation_get_resource_interfaces_p(void);
-extern int utc_iotcon_representation_set_state_n(void);
-extern int utc_iotcon_representation_set_state_p(void);
-extern int utc_iotcon_representation_get_state_n(void);
-extern int utc_iotcon_representation_get_state_p(void);
-extern int utc_iotcon_state_create_n(void);
-extern int utc_iotcon_state_create_p(void);
-extern int utc_iotcon_state_destroy_n(void);
-extern int utc_iotcon_state_destroy_p(void);
-extern int utc_iotcon_state_clone_n(void);
-extern int utc_iotcon_state_clone_p(void);
-extern int utc_iotcon_state_add_int_n(void);
-extern int utc_iotcon_state_add_int_p(void);
-extern int utc_iotcon_state_add_bool_n(void);
-extern int utc_iotcon_state_add_bool_p(void);
-extern int utc_iotcon_state_add_double_n(void);
-extern int utc_iotcon_state_add_double_p(void);
-extern int utc_iotcon_state_add_str_n(void);
-extern int utc_iotcon_state_add_str_p(void);
-extern int utc_iotcon_state_add_byte_str_n(void);
-extern int utc_iotcon_state_add_byte_str_p(void);
-extern int utc_iotcon_state_add_list_n(void);
-extern int utc_iotcon_state_add_list_p(void);
-extern int utc_iotcon_state_add_state_n(void);
-extern int utc_iotcon_state_add_state_p(void);
-extern int utc_iotcon_state_add_null_n(void);
-extern int utc_iotcon_state_add_null_p(void);
-extern int utc_iotcon_state_get_int_n(void);
-extern int utc_iotcon_state_get_int_p(void);
-extern int utc_iotcon_state_get_bool_n(void);
-extern int utc_iotcon_state_get_bool_p(void);
-extern int utc_iotcon_state_get_double_n(void);
-extern int utc_iotcon_state_get_double_p(void);
-extern int utc_iotcon_state_get_str_n(void);
-extern int utc_iotcon_state_get_str_p(void);
-extern int utc_iotcon_state_get_byte_str_n(void);
-extern int utc_iotcon_state_get_byte_str_p(void);
-extern int utc_iotcon_state_get_list_n(void);
-extern int utc_iotcon_state_get_list_p(void);
-extern int utc_iotcon_state_get_state_n(void);
-extern int utc_iotcon_state_get_state_p(void);
-extern int utc_iotcon_state_is_null_n(void);
-extern int utc_iotcon_state_is_null_p(void);
-extern int utc_iotcon_state_remove_n(void);
-extern int utc_iotcon_state_remove_p(void);
-extern int utc_iotcon_state_get_type_n(void);
-extern int utc_iotcon_state_get_type_p(void);
+extern int utc_iotcon_representation_set_attributes_n(void);
+extern int utc_iotcon_representation_set_attributes_p(void);
+extern int utc_iotcon_representation_get_attributes_n(void);
+extern int utc_iotcon_representation_get_attributes_p(void);
+extern int utc_iotcon_attributes_create_n(void);
+extern int utc_iotcon_attributes_create_p(void);
+extern int utc_iotcon_attributes_destroy_n(void);
+extern int utc_iotcon_attributes_destroy_p(void);
+extern int utc_iotcon_attributes_clone_n(void);
+extern int utc_iotcon_attributes_clone_p(void);
+extern int utc_iotcon_attributes_add_int_n(void);
+extern int utc_iotcon_attributes_add_int_p(void);
+extern int utc_iotcon_attributes_add_bool_n(void);
+extern int utc_iotcon_attributes_add_bool_p(void);
+extern int utc_iotcon_attributes_add_double_n(void);
+extern int utc_iotcon_attributes_add_double_p(void);
+extern int utc_iotcon_attributes_add_str_n(void);
+extern int utc_iotcon_attributes_add_str_p(void);
+extern int utc_iotcon_attributes_add_byte_str_n(void);
+extern int utc_iotcon_attributes_add_byte_str_p(void);
+extern int utc_iotcon_attributes_add_list_n(void);
+extern int utc_iotcon_attributes_add_list_p(void);
+extern int utc_iotcon_attributes_add_attributes_n(void);
+extern int utc_iotcon_attributes_add_attributes_p(void);
+extern int utc_iotcon_attributes_add_null_n(void);
+extern int utc_iotcon_attributes_add_null_p(void);
+extern int utc_iotcon_attributes_get_int_n(void);
+extern int utc_iotcon_attributes_get_int_p(void);
+extern int utc_iotcon_attributes_get_bool_n(void);
+extern int utc_iotcon_attributes_get_bool_p(void);
+extern int utc_iotcon_attributes_get_double_n(void);
+extern int utc_iotcon_attributes_get_double_p(void);
+extern int utc_iotcon_attributes_get_str_n(void);
+extern int utc_iotcon_attributes_get_str_p(void);
+extern int utc_iotcon_attributes_get_byte_str_n(void);
+extern int utc_iotcon_attributes_get_byte_str_p(void);
+extern int utc_iotcon_attributes_get_list_n(void);
+extern int utc_iotcon_attributes_get_list_p(void);
+extern int utc_iotcon_attributes_get_attributes_n(void);
+extern int utc_iotcon_attributes_get_attributes_p(void);
+extern int utc_iotcon_attributes_is_null_n(void);
+extern int utc_iotcon_attributes_is_null_p(void);
+extern int utc_iotcon_attributes_remove_n(void);
+extern int utc_iotcon_attributes_remove_p(void);
+extern int utc_iotcon_attributes_get_type_n(void);
+extern int utc_iotcon_attributes_get_type_p(void);
 extern int utc_iotcon_representation_add_child_n(void);
 extern int utc_iotcon_representation_add_child_p(void);
 extern int utc_iotcon_representation_remove_child_n(void);
@@ -200,10 +200,10 @@ extern int utc_iotcon_representation_get_child_count_n(void);
 extern int utc_iotcon_representation_get_child_count_p(void);
 extern int utc_iotcon_representation_get_nth_child_n(void);
 extern int utc_iotcon_representation_get_nth_child_p(void);
-extern int utc_iotcon_state_foreach_n(void);
-extern int utc_iotcon_state_foreach_p(void);
-extern int utc_iotcon_state_get_keys_count_n(void);
-extern int utc_iotcon_state_get_keys_count_p(void);
+extern int utc_iotcon_attributes_foreach_n(void);
+extern int utc_iotcon_attributes_foreach_p(void);
+extern int utc_iotcon_attributes_get_keys_count_n(void);
+extern int utc_iotcon_attributes_get_keys_count_p(void);
 extern int utc_iotcon_list_create_n(void);
 extern int utc_iotcon_list_create_p(void);
 extern int utc_iotcon_list_destroy_n(void);
@@ -220,8 +220,8 @@ extern int utc_iotcon_list_add_byte_str_n(void);
 extern int utc_iotcon_list_add_byte_str_p(void);
 extern int utc_iotcon_list_add_list_n(void);
 extern int utc_iotcon_list_add_list_p(void);
-extern int utc_iotcon_list_add_state_n(void);
-extern int utc_iotcon_list_add_state_p(void);
+extern int utc_iotcon_list_add_attributes_n(void);
+extern int utc_iotcon_list_add_attributes_p(void);
 extern int utc_iotcon_list_get_nth_int_n(void);
 extern int utc_iotcon_list_get_nth_int_p(void);
 extern int utc_iotcon_list_get_nth_bool_n(void);
@@ -234,8 +234,8 @@ extern int utc_iotcon_list_get_nth_byte_str_n(void);
 extern int utc_iotcon_list_get_nth_byte_str_p(void);
 extern int utc_iotcon_list_get_nth_list_n(void);
 extern int utc_iotcon_list_get_nth_list_p(void);
-extern int utc_iotcon_list_get_nth_state_n(void);
-extern int utc_iotcon_list_get_nth_state_p(void);
+extern int utc_iotcon_list_get_nth_attributes_n(void);
+extern int utc_iotcon_list_get_nth_attributes_p(void);
 extern int utc_iotcon_list_remove_nth_n(void);
 extern int utc_iotcon_list_remove_nth_p(void);
 extern int utc_iotcon_list_get_type_n(void);
@@ -254,8 +254,8 @@ extern int utc_iotcon_list_foreach_byte_str_n(void);
 extern int utc_iotcon_list_foreach_byte_str_p(void);
 extern int utc_iotcon_list_foreach_list_n(void);
 extern int utc_iotcon_list_foreach_list_p(void);
-extern int utc_iotcon_list_foreach_state_n(void);
-extern int utc_iotcon_list_foreach_state_p(void);
+extern int utc_iotcon_list_foreach_attributes_n(void);
+extern int utc_iotcon_list_foreach_attributes_p(void);
 extern int utc_iotcon_resource_create_n(void);
 extern int utc_iotcon_resource_create_p(void);
 extern int utc_iotcon_resource_destroy_n(void);
@@ -419,10 +419,10 @@ testcase tc_array[] = {
     {"utc_iotcon_lite_resource_create_p", utc_iotcon_lite_resource_create_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_lite_resource_destroy_n", utc_iotcon_lite_resource_destroy_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_lite_resource_destroy_p", utc_iotcon_lite_resource_destroy_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_update_state_n", utc_iotcon_lite_resource_update_state_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_update_state_p", utc_iotcon_lite_resource_update_state_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_get_state_n", utc_iotcon_lite_resource_get_state_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_get_state_p", utc_iotcon_lite_resource_get_state_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_update_attributes_n", utc_iotcon_lite_resource_update_attributes_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_update_attributes_p", utc_iotcon_lite_resource_update_attributes_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_get_attributes_n", utc_iotcon_lite_resource_get_attributes_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_get_attributes_p", utc_iotcon_lite_resource_get_attributes_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_start_caching_n", utc_iotcon_remote_resource_start_caching_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_start_caching_p", utc_iotcon_remote_resource_start_caching_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_stop_caching_n", utc_iotcon_remote_resource_stop_caching_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
@@ -509,52 +509,52 @@ testcase tc_array[] = {
     {"utc_iotcon_representation_set_resource_interfaces_p", utc_iotcon_representation_set_resource_interfaces_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_resource_interfaces_n", utc_iotcon_representation_get_resource_interfaces_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_resource_interfaces_p", utc_iotcon_representation_get_resource_interfaces_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_set_state_n", utc_iotcon_representation_set_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_set_state_p", utc_iotcon_representation_set_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_get_state_n", utc_iotcon_representation_get_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_get_state_p", utc_iotcon_representation_get_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_create_n", utc_iotcon_state_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_create_p", utc_iotcon_state_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_destroy_n", utc_iotcon_state_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_destroy_p", utc_iotcon_state_destroy_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_clone_n", utc_iotcon_state_clone_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_clone_p", utc_iotcon_state_clone_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_int_n", utc_iotcon_state_add_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_int_p", utc_iotcon_state_add_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_bool_n", utc_iotcon_state_add_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_bool_p", utc_iotcon_state_add_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_double_n", utc_iotcon_state_add_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_double_p", utc_iotcon_state_add_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_str_n", utc_iotcon_state_add_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_str_p", utc_iotcon_state_add_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_byte_str_n", utc_iotcon_state_add_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_byte_str_p", utc_iotcon_state_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_list_n", utc_iotcon_state_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_list_p", utc_iotcon_state_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_state_n", utc_iotcon_state_add_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_state_p", utc_iotcon_state_add_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_null_n", utc_iotcon_state_add_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_null_p", utc_iotcon_state_add_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_int_n", utc_iotcon_state_get_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_int_p", utc_iotcon_state_get_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_bool_n", utc_iotcon_state_get_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_bool_p", utc_iotcon_state_get_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_double_n", utc_iotcon_state_get_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_double_p", utc_iotcon_state_get_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_str_n", utc_iotcon_state_get_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_str_p", utc_iotcon_state_get_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_byte_str_n", utc_iotcon_state_get_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_byte_str_p", utc_iotcon_state_get_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_list_n", utc_iotcon_state_get_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_list_p", utc_iotcon_state_get_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_state_n", utc_iotcon_state_get_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_state_p", utc_iotcon_state_get_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_is_null_n", utc_iotcon_state_is_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_is_null_p", utc_iotcon_state_is_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_remove_n", utc_iotcon_state_remove_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_remove_p", utc_iotcon_state_remove_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_type_n", utc_iotcon_state_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_type_p", utc_iotcon_state_get_type_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_set_attributes_n", utc_iotcon_representation_set_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_set_attributes_p", utc_iotcon_representation_set_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_get_attributes_n", utc_iotcon_representation_get_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_get_attributes_p", utc_iotcon_representation_get_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_create_n", utc_iotcon_attributes_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_create_p", utc_iotcon_attributes_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_destroy_n", utc_iotcon_attributes_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_destroy_p", utc_iotcon_attributes_destroy_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_clone_n", utc_iotcon_attributes_clone_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_clone_p", utc_iotcon_attributes_clone_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_int_n", utc_iotcon_attributes_add_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_int_p", utc_iotcon_attributes_add_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_bool_n", utc_iotcon_attributes_add_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_bool_p", utc_iotcon_attributes_add_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_double_n", utc_iotcon_attributes_add_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_double_p", utc_iotcon_attributes_add_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_str_n", utc_iotcon_attributes_add_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_str_p", utc_iotcon_attributes_add_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_byte_str_n", utc_iotcon_attributes_add_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_byte_str_p", utc_iotcon_attributes_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_list_n", utc_iotcon_attributes_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_list_p", utc_iotcon_attributes_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_attributes_n", utc_iotcon_attributes_add_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_attributes_p", utc_iotcon_attributes_add_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_null_n", utc_iotcon_attributes_add_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_null_p", utc_iotcon_attributes_add_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_int_n", utc_iotcon_attributes_get_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_int_p", utc_iotcon_attributes_get_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_bool_n", utc_iotcon_attributes_get_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_bool_p", utc_iotcon_attributes_get_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_double_n", utc_iotcon_attributes_get_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_double_p", utc_iotcon_attributes_get_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_str_n", utc_iotcon_attributes_get_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_str_p", utc_iotcon_attributes_get_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_byte_str_n", utc_iotcon_attributes_get_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_byte_str_p", utc_iotcon_attributes_get_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_list_n", utc_iotcon_attributes_get_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_list_p", utc_iotcon_attributes_get_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_attributes_n", utc_iotcon_attributes_get_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_attributes_p", utc_iotcon_attributes_get_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_is_null_n", utc_iotcon_attributes_is_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_is_null_p", utc_iotcon_attributes_is_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_remove_n", utc_iotcon_attributes_remove_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_remove_p", utc_iotcon_attributes_remove_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_type_n", utc_iotcon_attributes_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_type_p", utc_iotcon_attributes_get_type_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_add_child_n", utc_iotcon_representation_add_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_add_child_p", utc_iotcon_representation_add_child_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_remove_child_n", utc_iotcon_representation_remove_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -565,10 +565,10 @@ testcase tc_array[] = {
     {"utc_iotcon_representation_get_child_count_p", utc_iotcon_representation_get_child_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_nth_child_n", utc_iotcon_representation_get_nth_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_nth_child_p", utc_iotcon_representation_get_nth_child_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_foreach_n", utc_iotcon_state_foreach_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_foreach_p", utc_iotcon_state_foreach_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_keys_count_n", utc_iotcon_state_get_keys_count_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_keys_count_p", utc_iotcon_state_get_keys_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_foreach_n", utc_iotcon_attributes_foreach_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_foreach_p", utc_iotcon_attributes_foreach_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_keys_count_n", utc_iotcon_attributes_get_keys_count_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_keys_count_p", utc_iotcon_attributes_get_keys_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_create_n", utc_iotcon_list_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_create_p", utc_iotcon_list_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_destroy_n", utc_iotcon_list_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -585,8 +585,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_add_byte_str_p", utc_iotcon_list_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_add_list_n", utc_iotcon_list_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_add_list_p", utc_iotcon_list_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_add_state_n", utc_iotcon_list_add_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_add_state_p", utc_iotcon_list_add_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_add_attributes_n", utc_iotcon_list_add_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_add_attributes_p", utc_iotcon_list_add_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_int_n", utc_iotcon_list_get_nth_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_int_p", utc_iotcon_list_get_nth_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_bool_n", utc_iotcon_list_get_nth_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -599,8 +599,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_get_nth_byte_str_p", utc_iotcon_list_get_nth_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_list_n", utc_iotcon_list_get_nth_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_list_p", utc_iotcon_list_get_nth_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_get_nth_state_n", utc_iotcon_list_get_nth_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_get_nth_state_p", utc_iotcon_list_get_nth_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_get_nth_attributes_n", utc_iotcon_list_get_nth_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_get_nth_attributes_p", utc_iotcon_list_get_nth_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_remove_nth_n", utc_iotcon_list_remove_nth_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_remove_nth_p", utc_iotcon_list_remove_nth_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_type_n", utc_iotcon_list_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -619,8 +619,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_foreach_byte_str_p", utc_iotcon_list_foreach_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_foreach_list_n", utc_iotcon_list_foreach_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_foreach_list_p", utc_iotcon_list_foreach_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_foreach_state_n", utc_iotcon_list_foreach_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_foreach_state_p", utc_iotcon_list_foreach_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_foreach_attributes_n", utc_iotcon_list_foreach_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_foreach_attributes_p", utc_iotcon_list_foreach_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_resource_create_n", utc_iotcon_resource_create_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},
     {"utc_iotcon_resource_create_p", utc_iotcon_resource_create_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},
     {"utc_iotcon_resource_destroy_n", utc_iotcon_resource_destroy_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},

diff --git a/src/utc/iotcon/tct-iotcon-core_mobile.h b/src/utc/iotcon/tct-iotcon-core_mobile.h
index 9fd1171..156ffad 100755 (executable)
--- a/src/utc/iotcon/tct-iotcon-core_mobile.h
+++ b/src/utc/iotcon/tct-iotcon-core_mobile.h
@@ -54,10 +54,10 @@ extern int utc_iotcon_lite_resource_create_n(void);
 extern int utc_iotcon_lite_resource_create_p(void);
 extern int utc_iotcon_lite_resource_destroy_n(void);
 extern int utc_iotcon_lite_resource_destroy_p(void);
-extern int utc_iotcon_lite_resource_update_state_n(void);
-extern int utc_iotcon_lite_resource_update_state_p(void);
-extern int utc_iotcon_lite_resource_get_state_n(void);
-extern int utc_iotcon_lite_resource_get_state_p(void);
+extern int utc_iotcon_lite_resource_update_attributes_n(void);
+extern int utc_iotcon_lite_resource_update_attributes_p(void);
+extern int utc_iotcon_lite_resource_get_attributes_n(void);
+extern int utc_iotcon_lite_resource_get_attributes_p(void);
 extern int utc_iotcon_remote_resource_start_caching_n(void);
 extern int utc_iotcon_remote_resource_start_caching_p(void);
 extern int utc_iotcon_remote_resource_stop_caching_n(void);
@@ -144,52 +144,52 @@ extern int utc_iotcon_representation_set_resource_interfaces_n(void);
 extern int utc_iotcon_representation_set_resource_interfaces_p(void);
 extern int utc_iotcon_representation_get_resource_interfaces_n(void);
 extern int utc_iotcon_representation_get_resource_interfaces_p(void);
-extern int utc_iotcon_representation_set_state_n(void);
-extern int utc_iotcon_representation_set_state_p(void);
-extern int utc_iotcon_representation_get_state_n(void);
-extern int utc_iotcon_representation_get_state_p(void);
-extern int utc_iotcon_state_create_n(void);
-extern int utc_iotcon_state_create_p(void);
-extern int utc_iotcon_state_destroy_n(void);
-extern int utc_iotcon_state_destroy_p(void);
-extern int utc_iotcon_state_clone_n(void);
-extern int utc_iotcon_state_clone_p(void);
-extern int utc_iotcon_state_add_int_n(void);
-extern int utc_iotcon_state_add_int_p(void);
-extern int utc_iotcon_state_add_bool_n(void);
-extern int utc_iotcon_state_add_bool_p(void);
-extern int utc_iotcon_state_add_double_n(void);
-extern int utc_iotcon_state_add_double_p(void);
-extern int utc_iotcon_state_add_str_n(void);
-extern int utc_iotcon_state_add_str_p(void);
-extern int utc_iotcon_state_add_byte_str_n(void);
-extern int utc_iotcon_state_add_byte_str_p(void);
-extern int utc_iotcon_state_add_list_n(void);
-extern int utc_iotcon_state_add_list_p(void);
-extern int utc_iotcon_state_add_state_n(void);
-extern int utc_iotcon_state_add_state_p(void);
-extern int utc_iotcon_state_add_null_n(void);
-extern int utc_iotcon_state_add_null_p(void);
-extern int utc_iotcon_state_get_int_n(void);
-extern int utc_iotcon_state_get_int_p(void);
-extern int utc_iotcon_state_get_bool_n(void);
-extern int utc_iotcon_state_get_bool_p(void);
-extern int utc_iotcon_state_get_double_n(void);
-extern int utc_iotcon_state_get_double_p(void);
-extern int utc_iotcon_state_get_str_n(void);
-extern int utc_iotcon_state_get_str_p(void);
-extern int utc_iotcon_state_get_byte_str_n(void);
-extern int utc_iotcon_state_get_byte_str_p(void);
-extern int utc_iotcon_state_get_list_n(void);
-extern int utc_iotcon_state_get_list_p(void);
-extern int utc_iotcon_state_get_state_n(void);
-extern int utc_iotcon_state_get_state_p(void);
-extern int utc_iotcon_state_is_null_n(void);
-extern int utc_iotcon_state_is_null_p(void);
-extern int utc_iotcon_state_remove_n(void);
-extern int utc_iotcon_state_remove_p(void);
-extern int utc_iotcon_state_get_type_n(void);
-extern int utc_iotcon_state_get_type_p(void);
+extern int utc_iotcon_representation_set_attributes_n(void);
+extern int utc_iotcon_representation_set_attributes_p(void);
+extern int utc_iotcon_representation_get_attributes_n(void);
+extern int utc_iotcon_representation_get_attributes_p(void);
+extern int utc_iotcon_attributes_create_n(void);
+extern int utc_iotcon_attributes_create_p(void);
+extern int utc_iotcon_attributes_destroy_n(void);
+extern int utc_iotcon_attributes_destroy_p(void);
+extern int utc_iotcon_attributes_clone_n(void);
+extern int utc_iotcon_attributes_clone_p(void);
+extern int utc_iotcon_attributes_add_int_n(void);
+extern int utc_iotcon_attributes_add_int_p(void);
+extern int utc_iotcon_attributes_add_bool_n(void);
+extern int utc_iotcon_attributes_add_bool_p(void);
+extern int utc_iotcon_attributes_add_double_n(void);
+extern int utc_iotcon_attributes_add_double_p(void);
+extern int utc_iotcon_attributes_add_str_n(void);
+extern int utc_iotcon_attributes_add_str_p(void);
+extern int utc_iotcon_attributes_add_byte_str_n(void);
+extern int utc_iotcon_attributes_add_byte_str_p(void);
+extern int utc_iotcon_attributes_add_list_n(void);
+extern int utc_iotcon_attributes_add_list_p(void);
+extern int utc_iotcon_attributes_add_attributes_n(void);
+extern int utc_iotcon_attributes_add_attributes_p(void);
+extern int utc_iotcon_attributes_add_null_n(void);
+extern int utc_iotcon_attributes_add_null_p(void);
+extern int utc_iotcon_attributes_get_int_n(void);
+extern int utc_iotcon_attributes_get_int_p(void);
+extern int utc_iotcon_attributes_get_bool_n(void);
+extern int utc_iotcon_attributes_get_bool_p(void);
+extern int utc_iotcon_attributes_get_double_n(void);
+extern int utc_iotcon_attributes_get_double_p(void);
+extern int utc_iotcon_attributes_get_str_n(void);
+extern int utc_iotcon_attributes_get_str_p(void);
+extern int utc_iotcon_attributes_get_byte_str_n(void);
+extern int utc_iotcon_attributes_get_byte_str_p(void);
+extern int utc_iotcon_attributes_get_list_n(void);
+extern int utc_iotcon_attributes_get_list_p(void);
+extern int utc_iotcon_attributes_get_attributes_n(void);
+extern int utc_iotcon_attributes_get_attributes_p(void);
+extern int utc_iotcon_attributes_is_null_n(void);
+extern int utc_iotcon_attributes_is_null_p(void);
+extern int utc_iotcon_attributes_remove_n(void);
+extern int utc_iotcon_attributes_remove_p(void);
+extern int utc_iotcon_attributes_get_type_n(void);
+extern int utc_iotcon_attributes_get_type_p(void);
 extern int utc_iotcon_representation_add_child_n(void);
 extern int utc_iotcon_representation_add_child_p(void);
 extern int utc_iotcon_representation_remove_child_n(void);
@@ -200,10 +200,10 @@ extern int utc_iotcon_representation_get_child_count_n(void);
 extern int utc_iotcon_representation_get_child_count_p(void);
 extern int utc_iotcon_representation_get_nth_child_n(void);
 extern int utc_iotcon_representation_get_nth_child_p(void);
-extern int utc_iotcon_state_foreach_n(void);
-extern int utc_iotcon_state_foreach_p(void);
-extern int utc_iotcon_state_get_keys_count_n(void);
-extern int utc_iotcon_state_get_keys_count_p(void);
+extern int utc_iotcon_attributes_foreach_n(void);
+extern int utc_iotcon_attributes_foreach_p(void);
+extern int utc_iotcon_attributes_get_keys_count_n(void);
+extern int utc_iotcon_attributes_get_keys_count_p(void);
 extern int utc_iotcon_list_create_n(void);
 extern int utc_iotcon_list_create_p(void);
 extern int utc_iotcon_list_destroy_n(void);
@@ -220,8 +220,8 @@ extern int utc_iotcon_list_add_byte_str_n(void);
 extern int utc_iotcon_list_add_byte_str_p(void);
 extern int utc_iotcon_list_add_list_n(void);
 extern int utc_iotcon_list_add_list_p(void);
-extern int utc_iotcon_list_add_state_n(void);
-extern int utc_iotcon_list_add_state_p(void);
+extern int utc_iotcon_list_add_attributes_n(void);
+extern int utc_iotcon_list_add_attributes_p(void);
 extern int utc_iotcon_list_get_nth_int_n(void);
 extern int utc_iotcon_list_get_nth_int_p(void);
 extern int utc_iotcon_list_get_nth_bool_n(void);
@@ -234,8 +234,8 @@ extern int utc_iotcon_list_get_nth_byte_str_n(void);
 extern int utc_iotcon_list_get_nth_byte_str_p(void);
 extern int utc_iotcon_list_get_nth_list_n(void);
 extern int utc_iotcon_list_get_nth_list_p(void);
-extern int utc_iotcon_list_get_nth_state_n(void);
-extern int utc_iotcon_list_get_nth_state_p(void);
+extern int utc_iotcon_list_get_nth_attributes_n(void);
+extern int utc_iotcon_list_get_nth_attributes_p(void);
 extern int utc_iotcon_list_remove_nth_n(void);
 extern int utc_iotcon_list_remove_nth_p(void);
 extern int utc_iotcon_list_get_type_n(void);
@@ -254,8 +254,8 @@ extern int utc_iotcon_list_foreach_byte_str_n(void);
 extern int utc_iotcon_list_foreach_byte_str_p(void);
 extern int utc_iotcon_list_foreach_list_n(void);
 extern int utc_iotcon_list_foreach_list_p(void);
-extern int utc_iotcon_list_foreach_state_n(void);
-extern int utc_iotcon_list_foreach_state_p(void);
+extern int utc_iotcon_list_foreach_attributes_n(void);
+extern int utc_iotcon_list_foreach_attributes_p(void);
 extern int utc_iotcon_resource_create_n(void);
 extern int utc_iotcon_resource_create_p(void);
 extern int utc_iotcon_resource_destroy_n(void);
@@ -419,10 +419,10 @@ testcase tc_array[] = {
     {"utc_iotcon_lite_resource_create_p", utc_iotcon_lite_resource_create_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_lite_resource_destroy_n", utc_iotcon_lite_resource_destroy_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_lite_resource_destroy_p", utc_iotcon_lite_resource_destroy_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_update_state_n", utc_iotcon_lite_resource_update_state_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_update_state_p", utc_iotcon_lite_resource_update_state_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_get_state_n", utc_iotcon_lite_resource_get_state_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_get_state_p", utc_iotcon_lite_resource_get_state_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_update_attributes_n", utc_iotcon_lite_resource_update_attributes_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_update_attributes_p", utc_iotcon_lite_resource_update_attributes_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_get_attributes_n", utc_iotcon_lite_resource_get_attributes_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_get_attributes_p", utc_iotcon_lite_resource_get_attributes_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_start_caching_n", utc_iotcon_remote_resource_start_caching_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_start_caching_p", utc_iotcon_remote_resource_start_caching_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_stop_caching_n", utc_iotcon_remote_resource_stop_caching_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
@@ -509,52 +509,52 @@ testcase tc_array[] = {
     {"utc_iotcon_representation_set_resource_interfaces_p", utc_iotcon_representation_set_resource_interfaces_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_resource_interfaces_n", utc_iotcon_representation_get_resource_interfaces_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_resource_interfaces_p", utc_iotcon_representation_get_resource_interfaces_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_set_state_n", utc_iotcon_representation_set_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_set_state_p", utc_iotcon_representation_set_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_get_state_n", utc_iotcon_representation_get_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_get_state_p", utc_iotcon_representation_get_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_create_n", utc_iotcon_state_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_create_p", utc_iotcon_state_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_destroy_n", utc_iotcon_state_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_destroy_p", utc_iotcon_state_destroy_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_clone_n", utc_iotcon_state_clone_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_clone_p", utc_iotcon_state_clone_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_int_n", utc_iotcon_state_add_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_int_p", utc_iotcon_state_add_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_bool_n", utc_iotcon_state_add_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_bool_p", utc_iotcon_state_add_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_double_n", utc_iotcon_state_add_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_double_p", utc_iotcon_state_add_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_str_n", utc_iotcon_state_add_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_str_p", utc_iotcon_state_add_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_byte_str_n", utc_iotcon_state_add_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_byte_str_p", utc_iotcon_state_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_list_n", utc_iotcon_state_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_list_p", utc_iotcon_state_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_state_n", utc_iotcon_state_add_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_state_p", utc_iotcon_state_add_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_null_n", utc_iotcon_state_add_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_null_p", utc_iotcon_state_add_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_int_n", utc_iotcon_state_get_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_int_p", utc_iotcon_state_get_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_bool_n", utc_iotcon_state_get_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_bool_p", utc_iotcon_state_get_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_double_n", utc_iotcon_state_get_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_double_p", utc_iotcon_state_get_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_str_n", utc_iotcon_state_get_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_str_p", utc_iotcon_state_get_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_byte_str_n", utc_iotcon_state_get_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_byte_str_p", utc_iotcon_state_get_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_list_n", utc_iotcon_state_get_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_list_p", utc_iotcon_state_get_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_state_n", utc_iotcon_state_get_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_state_p", utc_iotcon_state_get_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_is_null_n", utc_iotcon_state_is_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_is_null_p", utc_iotcon_state_is_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_remove_n", utc_iotcon_state_remove_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_remove_p", utc_iotcon_state_remove_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_type_n", utc_iotcon_state_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_type_p", utc_iotcon_state_get_type_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_set_attributes_n", utc_iotcon_representation_set_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_set_attributes_p", utc_iotcon_representation_set_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_get_attributes_n", utc_iotcon_representation_get_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_get_attributes_p", utc_iotcon_representation_get_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_create_n", utc_iotcon_attributes_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_create_p", utc_iotcon_attributes_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_destroy_n", utc_iotcon_attributes_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_destroy_p", utc_iotcon_attributes_destroy_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_clone_n", utc_iotcon_attributes_clone_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_clone_p", utc_iotcon_attributes_clone_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_int_n", utc_iotcon_attributes_add_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_int_p", utc_iotcon_attributes_add_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_bool_n", utc_iotcon_attributes_add_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_bool_p", utc_iotcon_attributes_add_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_double_n", utc_iotcon_attributes_add_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_double_p", utc_iotcon_attributes_add_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_str_n", utc_iotcon_attributes_add_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_str_p", utc_iotcon_attributes_add_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_byte_str_n", utc_iotcon_attributes_add_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_byte_str_p", utc_iotcon_attributes_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_list_n", utc_iotcon_attributes_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_list_p", utc_iotcon_attributes_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_attributes_n", utc_iotcon_attributes_add_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_attributes_p", utc_iotcon_attributes_add_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_null_n", utc_iotcon_attributes_add_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_null_p", utc_iotcon_attributes_add_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_int_n", utc_iotcon_attributes_get_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_int_p", utc_iotcon_attributes_get_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_bool_n", utc_iotcon_attributes_get_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_bool_p", utc_iotcon_attributes_get_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_double_n", utc_iotcon_attributes_get_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_double_p", utc_iotcon_attributes_get_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_str_n", utc_iotcon_attributes_get_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_str_p", utc_iotcon_attributes_get_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_byte_str_n", utc_iotcon_attributes_get_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_byte_str_p", utc_iotcon_attributes_get_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_list_n", utc_iotcon_attributes_get_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_list_p", utc_iotcon_attributes_get_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_attributes_n", utc_iotcon_attributes_get_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_attributes_p", utc_iotcon_attributes_get_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_is_null_n", utc_iotcon_attributes_is_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_is_null_p", utc_iotcon_attributes_is_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_remove_n", utc_iotcon_attributes_remove_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_remove_p", utc_iotcon_attributes_remove_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_type_n", utc_iotcon_attributes_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_type_p", utc_iotcon_attributes_get_type_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_add_child_n", utc_iotcon_representation_add_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_add_child_p", utc_iotcon_representation_add_child_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_remove_child_n", utc_iotcon_representation_remove_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -565,10 +565,10 @@ testcase tc_array[] = {
     {"utc_iotcon_representation_get_child_count_p", utc_iotcon_representation_get_child_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_nth_child_n", utc_iotcon_representation_get_nth_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_nth_child_p", utc_iotcon_representation_get_nth_child_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_foreach_n", utc_iotcon_state_foreach_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_foreach_p", utc_iotcon_state_foreach_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_keys_count_n", utc_iotcon_state_get_keys_count_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_keys_count_p", utc_iotcon_state_get_keys_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_foreach_n", utc_iotcon_attributes_foreach_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_foreach_p", utc_iotcon_attributes_foreach_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_keys_count_n", utc_iotcon_attributes_get_keys_count_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_keys_count_p", utc_iotcon_attributes_get_keys_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_create_n", utc_iotcon_list_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_create_p", utc_iotcon_list_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_destroy_n", utc_iotcon_list_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -585,8 +585,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_add_byte_str_p", utc_iotcon_list_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_add_list_n", utc_iotcon_list_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_add_list_p", utc_iotcon_list_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_add_state_n", utc_iotcon_list_add_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_add_state_p", utc_iotcon_list_add_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_add_attributes_n", utc_iotcon_list_add_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_add_attributes_p", utc_iotcon_list_add_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_int_n", utc_iotcon_list_get_nth_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_int_p", utc_iotcon_list_get_nth_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_bool_n", utc_iotcon_list_get_nth_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -599,8 +599,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_get_nth_byte_str_p", utc_iotcon_list_get_nth_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_list_n", utc_iotcon_list_get_nth_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_list_p", utc_iotcon_list_get_nth_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_get_nth_state_n", utc_iotcon_list_get_nth_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_get_nth_state_p", utc_iotcon_list_get_nth_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_get_nth_attributes_n", utc_iotcon_list_get_nth_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_get_nth_attributes_p", utc_iotcon_list_get_nth_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_remove_nth_n", utc_iotcon_list_remove_nth_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_remove_nth_p", utc_iotcon_list_remove_nth_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_type_n", utc_iotcon_list_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -619,8 +619,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_foreach_byte_str_p", utc_iotcon_list_foreach_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_foreach_list_n", utc_iotcon_list_foreach_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_foreach_list_p", utc_iotcon_list_foreach_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_foreach_state_n", utc_iotcon_list_foreach_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_foreach_state_p", utc_iotcon_list_foreach_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_foreach_attributes_n", utc_iotcon_list_foreach_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_foreach_attributes_p", utc_iotcon_list_foreach_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_resource_create_n", utc_iotcon_resource_create_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},
     {"utc_iotcon_resource_create_p", utc_iotcon_resource_create_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},
     {"utc_iotcon_resource_destroy_n", utc_iotcon_resource_destroy_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},

diff --git a/src/utc/iotcon/tct-iotcon-core_tv.h b/src/utc/iotcon/tct-iotcon-core_tv.h
index 9fd1171..156ffad 100755 (executable)
--- a/src/utc/iotcon/tct-iotcon-core_tv.h
+++ b/src/utc/iotcon/tct-iotcon-core_tv.h
@@ -54,10 +54,10 @@ extern int utc_iotcon_lite_resource_create_n(void);
 extern int utc_iotcon_lite_resource_create_p(void);
 extern int utc_iotcon_lite_resource_destroy_n(void);
 extern int utc_iotcon_lite_resource_destroy_p(void);
-extern int utc_iotcon_lite_resource_update_state_n(void);
-extern int utc_iotcon_lite_resource_update_state_p(void);
-extern int utc_iotcon_lite_resource_get_state_n(void);
-extern int utc_iotcon_lite_resource_get_state_p(void);
+extern int utc_iotcon_lite_resource_update_attributes_n(void);
+extern int utc_iotcon_lite_resource_update_attributes_p(void);
+extern int utc_iotcon_lite_resource_get_attributes_n(void);
+extern int utc_iotcon_lite_resource_get_attributes_p(void);
 extern int utc_iotcon_remote_resource_start_caching_n(void);
 extern int utc_iotcon_remote_resource_start_caching_p(void);
 extern int utc_iotcon_remote_resource_stop_caching_n(void);
@@ -144,52 +144,52 @@ extern int utc_iotcon_representation_set_resource_interfaces_n(void);
 extern int utc_iotcon_representation_set_resource_interfaces_p(void);
 extern int utc_iotcon_representation_get_resource_interfaces_n(void);
 extern int utc_iotcon_representation_get_resource_interfaces_p(void);
-extern int utc_iotcon_representation_set_state_n(void);
-extern int utc_iotcon_representation_set_state_p(void);
-extern int utc_iotcon_representation_get_state_n(void);
-extern int utc_iotcon_representation_get_state_p(void);
-extern int utc_iotcon_state_create_n(void);
-extern int utc_iotcon_state_create_p(void);
-extern int utc_iotcon_state_destroy_n(void);
-extern int utc_iotcon_state_destroy_p(void);
-extern int utc_iotcon_state_clone_n(void);
-extern int utc_iotcon_state_clone_p(void);
-extern int utc_iotcon_state_add_int_n(void);
-extern int utc_iotcon_state_add_int_p(void);
-extern int utc_iotcon_state_add_bool_n(void);
-extern int utc_iotcon_state_add_bool_p(void);
-extern int utc_iotcon_state_add_double_n(void);
-extern int utc_iotcon_state_add_double_p(void);
-extern int utc_iotcon_state_add_str_n(void);
-extern int utc_iotcon_state_add_str_p(void);
-extern int utc_iotcon_state_add_byte_str_n(void);
-extern int utc_iotcon_state_add_byte_str_p(void);
-extern int utc_iotcon_state_add_list_n(void);
-extern int utc_iotcon_state_add_list_p(void);
-extern int utc_iotcon_state_add_state_n(void);
-extern int utc_iotcon_state_add_state_p(void);
-extern int utc_iotcon_state_add_null_n(void);
-extern int utc_iotcon_state_add_null_p(void);
-extern int utc_iotcon_state_get_int_n(void);
-extern int utc_iotcon_state_get_int_p(void);
-extern int utc_iotcon_state_get_bool_n(void);
-extern int utc_iotcon_state_get_bool_p(void);
-extern int utc_iotcon_state_get_double_n(void);
-extern int utc_iotcon_state_get_double_p(void);
-extern int utc_iotcon_state_get_str_n(void);
-extern int utc_iotcon_state_get_str_p(void);
-extern int utc_iotcon_state_get_byte_str_n(void);
-extern int utc_iotcon_state_get_byte_str_p(void);
-extern int utc_iotcon_state_get_list_n(void);
-extern int utc_iotcon_state_get_list_p(void);
-extern int utc_iotcon_state_get_state_n(void);
-extern int utc_iotcon_state_get_state_p(void);
-extern int utc_iotcon_state_is_null_n(void);
-extern int utc_iotcon_state_is_null_p(void);
-extern int utc_iotcon_state_remove_n(void);
-extern int utc_iotcon_state_remove_p(void);
-extern int utc_iotcon_state_get_type_n(void);
-extern int utc_iotcon_state_get_type_p(void);
+extern int utc_iotcon_representation_set_attributes_n(void);
+extern int utc_iotcon_representation_set_attributes_p(void);
+extern int utc_iotcon_representation_get_attributes_n(void);
+extern int utc_iotcon_representation_get_attributes_p(void);
+extern int utc_iotcon_attributes_create_n(void);
+extern int utc_iotcon_attributes_create_p(void);
+extern int utc_iotcon_attributes_destroy_n(void);
+extern int utc_iotcon_attributes_destroy_p(void);
+extern int utc_iotcon_attributes_clone_n(void);
+extern int utc_iotcon_attributes_clone_p(void);
+extern int utc_iotcon_attributes_add_int_n(void);
+extern int utc_iotcon_attributes_add_int_p(void);
+extern int utc_iotcon_attributes_add_bool_n(void);
+extern int utc_iotcon_attributes_add_bool_p(void);
+extern int utc_iotcon_attributes_add_double_n(void);
+extern int utc_iotcon_attributes_add_double_p(void);
+extern int utc_iotcon_attributes_add_str_n(void);
+extern int utc_iotcon_attributes_add_str_p(void);
+extern int utc_iotcon_attributes_add_byte_str_n(void);
+extern int utc_iotcon_attributes_add_byte_str_p(void);
+extern int utc_iotcon_attributes_add_list_n(void);
+extern int utc_iotcon_attributes_add_list_p(void);
+extern int utc_iotcon_attributes_add_attributes_n(void);
+extern int utc_iotcon_attributes_add_attributes_p(void);
+extern int utc_iotcon_attributes_add_null_n(void);
+extern int utc_iotcon_attributes_add_null_p(void);
+extern int utc_iotcon_attributes_get_int_n(void);
+extern int utc_iotcon_attributes_get_int_p(void);
+extern int utc_iotcon_attributes_get_bool_n(void);
+extern int utc_iotcon_attributes_get_bool_p(void);
+extern int utc_iotcon_attributes_get_double_n(void);
+extern int utc_iotcon_attributes_get_double_p(void);
+extern int utc_iotcon_attributes_get_str_n(void);
+extern int utc_iotcon_attributes_get_str_p(void);
+extern int utc_iotcon_attributes_get_byte_str_n(void);
+extern int utc_iotcon_attributes_get_byte_str_p(void);
+extern int utc_iotcon_attributes_get_list_n(void);
+extern int utc_iotcon_attributes_get_list_p(void);
+extern int utc_iotcon_attributes_get_attributes_n(void);
+extern int utc_iotcon_attributes_get_attributes_p(void);
+extern int utc_iotcon_attributes_is_null_n(void);
+extern int utc_iotcon_attributes_is_null_p(void);
+extern int utc_iotcon_attributes_remove_n(void);
+extern int utc_iotcon_attributes_remove_p(void);
+extern int utc_iotcon_attributes_get_type_n(void);
+extern int utc_iotcon_attributes_get_type_p(void);
 extern int utc_iotcon_representation_add_child_n(void);
 extern int utc_iotcon_representation_add_child_p(void);
 extern int utc_iotcon_representation_remove_child_n(void);
@@ -200,10 +200,10 @@ extern int utc_iotcon_representation_get_child_count_n(void);
 extern int utc_iotcon_representation_get_child_count_p(void);
 extern int utc_iotcon_representation_get_nth_child_n(void);
 extern int utc_iotcon_representation_get_nth_child_p(void);
-extern int utc_iotcon_state_foreach_n(void);
-extern int utc_iotcon_state_foreach_p(void);
-extern int utc_iotcon_state_get_keys_count_n(void);
-extern int utc_iotcon_state_get_keys_count_p(void);
+extern int utc_iotcon_attributes_foreach_n(void);
+extern int utc_iotcon_attributes_foreach_p(void);
+extern int utc_iotcon_attributes_get_keys_count_n(void);
+extern int utc_iotcon_attributes_get_keys_count_p(void);
 extern int utc_iotcon_list_create_n(void);
 extern int utc_iotcon_list_create_p(void);
 extern int utc_iotcon_list_destroy_n(void);
@@ -220,8 +220,8 @@ extern int utc_iotcon_list_add_byte_str_n(void);
 extern int utc_iotcon_list_add_byte_str_p(void);
 extern int utc_iotcon_list_add_list_n(void);
 extern int utc_iotcon_list_add_list_p(void);
-extern int utc_iotcon_list_add_state_n(void);
-extern int utc_iotcon_list_add_state_p(void);
+extern int utc_iotcon_list_add_attributes_n(void);
+extern int utc_iotcon_list_add_attributes_p(void);
 extern int utc_iotcon_list_get_nth_int_n(void);
 extern int utc_iotcon_list_get_nth_int_p(void);
 extern int utc_iotcon_list_get_nth_bool_n(void);
@@ -234,8 +234,8 @@ extern int utc_iotcon_list_get_nth_byte_str_n(void);
 extern int utc_iotcon_list_get_nth_byte_str_p(void);
 extern int utc_iotcon_list_get_nth_list_n(void);
 extern int utc_iotcon_list_get_nth_list_p(void);
-extern int utc_iotcon_list_get_nth_state_n(void);
-extern int utc_iotcon_list_get_nth_state_p(void);
+extern int utc_iotcon_list_get_nth_attributes_n(void);
+extern int utc_iotcon_list_get_nth_attributes_p(void);
 extern int utc_iotcon_list_remove_nth_n(void);
 extern int utc_iotcon_list_remove_nth_p(void);
 extern int utc_iotcon_list_get_type_n(void);
@@ -254,8 +254,8 @@ extern int utc_iotcon_list_foreach_byte_str_n(void);
 extern int utc_iotcon_list_foreach_byte_str_p(void);
 extern int utc_iotcon_list_foreach_list_n(void);
 extern int utc_iotcon_list_foreach_list_p(void);
-extern int utc_iotcon_list_foreach_state_n(void);
-extern int utc_iotcon_list_foreach_state_p(void);
+extern int utc_iotcon_list_foreach_attributes_n(void);
+extern int utc_iotcon_list_foreach_attributes_p(void);
 extern int utc_iotcon_resource_create_n(void);
 extern int utc_iotcon_resource_create_p(void);
 extern int utc_iotcon_resource_destroy_n(void);
@@ -419,10 +419,10 @@ testcase tc_array[] = {
     {"utc_iotcon_lite_resource_create_p", utc_iotcon_lite_resource_create_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_lite_resource_destroy_n", utc_iotcon_lite_resource_destroy_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_lite_resource_destroy_p", utc_iotcon_lite_resource_destroy_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_update_state_n", utc_iotcon_lite_resource_update_state_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_update_state_p", utc_iotcon_lite_resource_update_state_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_get_state_n", utc_iotcon_lite_resource_get_state_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_get_state_p", utc_iotcon_lite_resource_get_state_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_update_attributes_n", utc_iotcon_lite_resource_update_attributes_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_update_attributes_p", utc_iotcon_lite_resource_update_attributes_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_get_attributes_n", utc_iotcon_lite_resource_get_attributes_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_get_attributes_p", utc_iotcon_lite_resource_get_attributes_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_start_caching_n", utc_iotcon_remote_resource_start_caching_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_start_caching_p", utc_iotcon_remote_resource_start_caching_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_stop_caching_n", utc_iotcon_remote_resource_stop_caching_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
@@ -509,52 +509,52 @@ testcase tc_array[] = {
     {"utc_iotcon_representation_set_resource_interfaces_p", utc_iotcon_representation_set_resource_interfaces_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_resource_interfaces_n", utc_iotcon_representation_get_resource_interfaces_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_resource_interfaces_p", utc_iotcon_representation_get_resource_interfaces_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_set_state_n", utc_iotcon_representation_set_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_set_state_p", utc_iotcon_representation_set_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_get_state_n", utc_iotcon_representation_get_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_get_state_p", utc_iotcon_representation_get_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_create_n", utc_iotcon_state_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_create_p", utc_iotcon_state_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_destroy_n", utc_iotcon_state_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_destroy_p", utc_iotcon_state_destroy_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_clone_n", utc_iotcon_state_clone_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_clone_p", utc_iotcon_state_clone_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_int_n", utc_iotcon_state_add_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_int_p", utc_iotcon_state_add_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_bool_n", utc_iotcon_state_add_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_bool_p", utc_iotcon_state_add_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_double_n", utc_iotcon_state_add_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_double_p", utc_iotcon_state_add_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_str_n", utc_iotcon_state_add_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_str_p", utc_iotcon_state_add_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_byte_str_n", utc_iotcon_state_add_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_byte_str_p", utc_iotcon_state_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_list_n", utc_iotcon_state_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_list_p", utc_iotcon_state_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_state_n", utc_iotcon_state_add_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_state_p", utc_iotcon_state_add_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_null_n", utc_iotcon_state_add_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_null_p", utc_iotcon_state_add_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_int_n", utc_iotcon_state_get_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_int_p", utc_iotcon_state_get_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_bool_n", utc_iotcon_state_get_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_bool_p", utc_iotcon_state_get_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_double_n", utc_iotcon_state_get_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_double_p", utc_iotcon_state_get_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_str_n", utc_iotcon_state_get_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_str_p", utc_iotcon_state_get_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_byte_str_n", utc_iotcon_state_get_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_byte_str_p", utc_iotcon_state_get_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_list_n", utc_iotcon_state_get_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_list_p", utc_iotcon_state_get_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_state_n", utc_iotcon_state_get_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_state_p", utc_iotcon_state_get_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_is_null_n", utc_iotcon_state_is_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_is_null_p", utc_iotcon_state_is_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_remove_n", utc_iotcon_state_remove_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_remove_p", utc_iotcon_state_remove_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_type_n", utc_iotcon_state_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_type_p", utc_iotcon_state_get_type_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_set_attributes_n", utc_iotcon_representation_set_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_set_attributes_p", utc_iotcon_representation_set_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_get_attributes_n", utc_iotcon_representation_get_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_get_attributes_p", utc_iotcon_representation_get_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_create_n", utc_iotcon_attributes_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_create_p", utc_iotcon_attributes_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_destroy_n", utc_iotcon_attributes_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_destroy_p", utc_iotcon_attributes_destroy_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_clone_n", utc_iotcon_attributes_clone_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_clone_p", utc_iotcon_attributes_clone_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_int_n", utc_iotcon_attributes_add_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_int_p", utc_iotcon_attributes_add_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_bool_n", utc_iotcon_attributes_add_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_bool_p", utc_iotcon_attributes_add_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_double_n", utc_iotcon_attributes_add_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_double_p", utc_iotcon_attributes_add_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_str_n", utc_iotcon_attributes_add_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_str_p", utc_iotcon_attributes_add_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_byte_str_n", utc_iotcon_attributes_add_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_byte_str_p", utc_iotcon_attributes_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_list_n", utc_iotcon_attributes_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_list_p", utc_iotcon_attributes_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_attributes_n", utc_iotcon_attributes_add_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_attributes_p", utc_iotcon_attributes_add_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_null_n", utc_iotcon_attributes_add_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_null_p", utc_iotcon_attributes_add_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_int_n", utc_iotcon_attributes_get_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_int_p", utc_iotcon_attributes_get_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_bool_n", utc_iotcon_attributes_get_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_bool_p", utc_iotcon_attributes_get_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_double_n", utc_iotcon_attributes_get_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_double_p", utc_iotcon_attributes_get_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_str_n", utc_iotcon_attributes_get_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_str_p", utc_iotcon_attributes_get_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_byte_str_n", utc_iotcon_attributes_get_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_byte_str_p", utc_iotcon_attributes_get_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_list_n", utc_iotcon_attributes_get_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_list_p", utc_iotcon_attributes_get_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_attributes_n", utc_iotcon_attributes_get_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_attributes_p", utc_iotcon_attributes_get_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_is_null_n", utc_iotcon_attributes_is_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_is_null_p", utc_iotcon_attributes_is_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_remove_n", utc_iotcon_attributes_remove_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_remove_p", utc_iotcon_attributes_remove_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_type_n", utc_iotcon_attributes_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_type_p", utc_iotcon_attributes_get_type_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_add_child_n", utc_iotcon_representation_add_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_add_child_p", utc_iotcon_representation_add_child_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_remove_child_n", utc_iotcon_representation_remove_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -565,10 +565,10 @@ testcase tc_array[] = {
     {"utc_iotcon_representation_get_child_count_p", utc_iotcon_representation_get_child_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_nth_child_n", utc_iotcon_representation_get_nth_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_nth_child_p", utc_iotcon_representation_get_nth_child_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_foreach_n", utc_iotcon_state_foreach_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_foreach_p", utc_iotcon_state_foreach_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_keys_count_n", utc_iotcon_state_get_keys_count_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_keys_count_p", utc_iotcon_state_get_keys_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_foreach_n", utc_iotcon_attributes_foreach_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_foreach_p", utc_iotcon_attributes_foreach_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_keys_count_n", utc_iotcon_attributes_get_keys_count_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_keys_count_p", utc_iotcon_attributes_get_keys_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_create_n", utc_iotcon_list_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_create_p", utc_iotcon_list_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_destroy_n", utc_iotcon_list_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -585,8 +585,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_add_byte_str_p", utc_iotcon_list_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_add_list_n", utc_iotcon_list_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_add_list_p", utc_iotcon_list_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_add_state_n", utc_iotcon_list_add_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_add_state_p", utc_iotcon_list_add_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_add_attributes_n", utc_iotcon_list_add_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_add_attributes_p", utc_iotcon_list_add_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_int_n", utc_iotcon_list_get_nth_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_int_p", utc_iotcon_list_get_nth_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_bool_n", utc_iotcon_list_get_nth_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -599,8 +599,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_get_nth_byte_str_p", utc_iotcon_list_get_nth_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_list_n", utc_iotcon_list_get_nth_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_list_p", utc_iotcon_list_get_nth_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_get_nth_state_n", utc_iotcon_list_get_nth_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_get_nth_state_p", utc_iotcon_list_get_nth_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_get_nth_attributes_n", utc_iotcon_list_get_nth_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_get_nth_attributes_p", utc_iotcon_list_get_nth_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_remove_nth_n", utc_iotcon_list_remove_nth_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_remove_nth_p", utc_iotcon_list_remove_nth_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_type_n", utc_iotcon_list_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -619,8 +619,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_foreach_byte_str_p", utc_iotcon_list_foreach_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_foreach_list_n", utc_iotcon_list_foreach_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_foreach_list_p", utc_iotcon_list_foreach_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_foreach_state_n", utc_iotcon_list_foreach_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_foreach_state_p", utc_iotcon_list_foreach_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_foreach_attributes_n", utc_iotcon_list_foreach_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_foreach_attributes_p", utc_iotcon_list_foreach_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_resource_create_n", utc_iotcon_resource_create_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},
     {"utc_iotcon_resource_create_p", utc_iotcon_resource_create_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},
     {"utc_iotcon_resource_destroy_n", utc_iotcon_resource_destroy_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},

diff --git a/src/utc/iotcon/tct-iotcon-core_wearable.h b/src/utc/iotcon/tct-iotcon-core_wearable.h
index 9fd1171..156ffad 100755 (executable)
--- a/src/utc/iotcon/tct-iotcon-core_wearable.h
+++ b/src/utc/iotcon/tct-iotcon-core_wearable.h
@@ -54,10 +54,10 @@ extern int utc_iotcon_lite_resource_create_n(void);
 extern int utc_iotcon_lite_resource_create_p(void);
 extern int utc_iotcon_lite_resource_destroy_n(void);
 extern int utc_iotcon_lite_resource_destroy_p(void);
-extern int utc_iotcon_lite_resource_update_state_n(void);
-extern int utc_iotcon_lite_resource_update_state_p(void);
-extern int utc_iotcon_lite_resource_get_state_n(void);
-extern int utc_iotcon_lite_resource_get_state_p(void);
+extern int utc_iotcon_lite_resource_update_attributes_n(void);
+extern int utc_iotcon_lite_resource_update_attributes_p(void);
+extern int utc_iotcon_lite_resource_get_attributes_n(void);
+extern int utc_iotcon_lite_resource_get_attributes_p(void);
 extern int utc_iotcon_remote_resource_start_caching_n(void);
 extern int utc_iotcon_remote_resource_start_caching_p(void);
 extern int utc_iotcon_remote_resource_stop_caching_n(void);
@@ -144,52 +144,52 @@ extern int utc_iotcon_representation_set_resource_interfaces_n(void);
 extern int utc_iotcon_representation_set_resource_interfaces_p(void);
 extern int utc_iotcon_representation_get_resource_interfaces_n(void);
 extern int utc_iotcon_representation_get_resource_interfaces_p(void);
-extern int utc_iotcon_representation_set_state_n(void);
-extern int utc_iotcon_representation_set_state_p(void);
-extern int utc_iotcon_representation_get_state_n(void);
-extern int utc_iotcon_representation_get_state_p(void);
-extern int utc_iotcon_state_create_n(void);
-extern int utc_iotcon_state_create_p(void);
-extern int utc_iotcon_state_destroy_n(void);
-extern int utc_iotcon_state_destroy_p(void);
-extern int utc_iotcon_state_clone_n(void);
-extern int utc_iotcon_state_clone_p(void);
-extern int utc_iotcon_state_add_int_n(void);
-extern int utc_iotcon_state_add_int_p(void);
-extern int utc_iotcon_state_add_bool_n(void);
-extern int utc_iotcon_state_add_bool_p(void);
-extern int utc_iotcon_state_add_double_n(void);
-extern int utc_iotcon_state_add_double_p(void);
-extern int utc_iotcon_state_add_str_n(void);
-extern int utc_iotcon_state_add_str_p(void);
-extern int utc_iotcon_state_add_byte_str_n(void);
-extern int utc_iotcon_state_add_byte_str_p(void);
-extern int utc_iotcon_state_add_list_n(void);
-extern int utc_iotcon_state_add_list_p(void);
-extern int utc_iotcon_state_add_state_n(void);
-extern int utc_iotcon_state_add_state_p(void);
-extern int utc_iotcon_state_add_null_n(void);
-extern int utc_iotcon_state_add_null_p(void);
-extern int utc_iotcon_state_get_int_n(void);
-extern int utc_iotcon_state_get_int_p(void);
-extern int utc_iotcon_state_get_bool_n(void);
-extern int utc_iotcon_state_get_bool_p(void);
-extern int utc_iotcon_state_get_double_n(void);
-extern int utc_iotcon_state_get_double_p(void);
-extern int utc_iotcon_state_get_str_n(void);
-extern int utc_iotcon_state_get_str_p(void);
-extern int utc_iotcon_state_get_byte_str_n(void);
-extern int utc_iotcon_state_get_byte_str_p(void);
-extern int utc_iotcon_state_get_list_n(void);
-extern int utc_iotcon_state_get_list_p(void);
-extern int utc_iotcon_state_get_state_n(void);
-extern int utc_iotcon_state_get_state_p(void);
-extern int utc_iotcon_state_is_null_n(void);
-extern int utc_iotcon_state_is_null_p(void);
-extern int utc_iotcon_state_remove_n(void);
-extern int utc_iotcon_state_remove_p(void);
-extern int utc_iotcon_state_get_type_n(void);
-extern int utc_iotcon_state_get_type_p(void);
+extern int utc_iotcon_representation_set_attributes_n(void);
+extern int utc_iotcon_representation_set_attributes_p(void);
+extern int utc_iotcon_representation_get_attributes_n(void);
+extern int utc_iotcon_representation_get_attributes_p(void);
+extern int utc_iotcon_attributes_create_n(void);
+extern int utc_iotcon_attributes_create_p(void);
+extern int utc_iotcon_attributes_destroy_n(void);
+extern int utc_iotcon_attributes_destroy_p(void);
+extern int utc_iotcon_attributes_clone_n(void);
+extern int utc_iotcon_attributes_clone_p(void);
+extern int utc_iotcon_attributes_add_int_n(void);
+extern int utc_iotcon_attributes_add_int_p(void);
+extern int utc_iotcon_attributes_add_bool_n(void);
+extern int utc_iotcon_attributes_add_bool_p(void);
+extern int utc_iotcon_attributes_add_double_n(void);
+extern int utc_iotcon_attributes_add_double_p(void);
+extern int utc_iotcon_attributes_add_str_n(void);
+extern int utc_iotcon_attributes_add_str_p(void);
+extern int utc_iotcon_attributes_add_byte_str_n(void);
+extern int utc_iotcon_attributes_add_byte_str_p(void);
+extern int utc_iotcon_attributes_add_list_n(void);
+extern int utc_iotcon_attributes_add_list_p(void);
+extern int utc_iotcon_attributes_add_attributes_n(void);
+extern int utc_iotcon_attributes_add_attributes_p(void);
+extern int utc_iotcon_attributes_add_null_n(void);
+extern int utc_iotcon_attributes_add_null_p(void);
+extern int utc_iotcon_attributes_get_int_n(void);
+extern int utc_iotcon_attributes_get_int_p(void);
+extern int utc_iotcon_attributes_get_bool_n(void);
+extern int utc_iotcon_attributes_get_bool_p(void);
+extern int utc_iotcon_attributes_get_double_n(void);
+extern int utc_iotcon_attributes_get_double_p(void);
+extern int utc_iotcon_attributes_get_str_n(void);
+extern int utc_iotcon_attributes_get_str_p(void);
+extern int utc_iotcon_attributes_get_byte_str_n(void);
+extern int utc_iotcon_attributes_get_byte_str_p(void);
+extern int utc_iotcon_attributes_get_list_n(void);
+extern int utc_iotcon_attributes_get_list_p(void);
+extern int utc_iotcon_attributes_get_attributes_n(void);
+extern int utc_iotcon_attributes_get_attributes_p(void);
+extern int utc_iotcon_attributes_is_null_n(void);
+extern int utc_iotcon_attributes_is_null_p(void);
+extern int utc_iotcon_attributes_remove_n(void);
+extern int utc_iotcon_attributes_remove_p(void);
+extern int utc_iotcon_attributes_get_type_n(void);
+extern int utc_iotcon_attributes_get_type_p(void);
 extern int utc_iotcon_representation_add_child_n(void);
 extern int utc_iotcon_representation_add_child_p(void);
 extern int utc_iotcon_representation_remove_child_n(void);
@@ -200,10 +200,10 @@ extern int utc_iotcon_representation_get_child_count_n(void);
 extern int utc_iotcon_representation_get_child_count_p(void);
 extern int utc_iotcon_representation_get_nth_child_n(void);
 extern int utc_iotcon_representation_get_nth_child_p(void);
-extern int utc_iotcon_state_foreach_n(void);
-extern int utc_iotcon_state_foreach_p(void);
-extern int utc_iotcon_state_get_keys_count_n(void);
-extern int utc_iotcon_state_get_keys_count_p(void);
+extern int utc_iotcon_attributes_foreach_n(void);
+extern int utc_iotcon_attributes_foreach_p(void);
+extern int utc_iotcon_attributes_get_keys_count_n(void);
+extern int utc_iotcon_attributes_get_keys_count_p(void);
 extern int utc_iotcon_list_create_n(void);
 extern int utc_iotcon_list_create_p(void);
 extern int utc_iotcon_list_destroy_n(void);
@@ -220,8 +220,8 @@ extern int utc_iotcon_list_add_byte_str_n(void);
 extern int utc_iotcon_list_add_byte_str_p(void);
 extern int utc_iotcon_list_add_list_n(void);
 extern int utc_iotcon_list_add_list_p(void);
-extern int utc_iotcon_list_add_state_n(void);
-extern int utc_iotcon_list_add_state_p(void);
+extern int utc_iotcon_list_add_attributes_n(void);
+extern int utc_iotcon_list_add_attributes_p(void);
 extern int utc_iotcon_list_get_nth_int_n(void);
 extern int utc_iotcon_list_get_nth_int_p(void);
 extern int utc_iotcon_list_get_nth_bool_n(void);
@@ -234,8 +234,8 @@ extern int utc_iotcon_list_get_nth_byte_str_n(void);
 extern int utc_iotcon_list_get_nth_byte_str_p(void);
 extern int utc_iotcon_list_get_nth_list_n(void);
 extern int utc_iotcon_list_get_nth_list_p(void);
-extern int utc_iotcon_list_get_nth_state_n(void);
-extern int utc_iotcon_list_get_nth_state_p(void);
+extern int utc_iotcon_list_get_nth_attributes_n(void);
+extern int utc_iotcon_list_get_nth_attributes_p(void);
 extern int utc_iotcon_list_remove_nth_n(void);
 extern int utc_iotcon_list_remove_nth_p(void);
 extern int utc_iotcon_list_get_type_n(void);
@@ -254,8 +254,8 @@ extern int utc_iotcon_list_foreach_byte_str_n(void);
 extern int utc_iotcon_list_foreach_byte_str_p(void);
 extern int utc_iotcon_list_foreach_list_n(void);
 extern int utc_iotcon_list_foreach_list_p(void);
-extern int utc_iotcon_list_foreach_state_n(void);
-extern int utc_iotcon_list_foreach_state_p(void);
+extern int utc_iotcon_list_foreach_attributes_n(void);
+extern int utc_iotcon_list_foreach_attributes_p(void);
 extern int utc_iotcon_resource_create_n(void);
 extern int utc_iotcon_resource_create_p(void);
 extern int utc_iotcon_resource_destroy_n(void);
@@ -419,10 +419,10 @@ testcase tc_array[] = {
     {"utc_iotcon_lite_resource_create_p", utc_iotcon_lite_resource_create_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_lite_resource_destroy_n", utc_iotcon_lite_resource_destroy_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_lite_resource_destroy_p", utc_iotcon_lite_resource_destroy_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_update_state_n", utc_iotcon_lite_resource_update_state_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_update_state_p", utc_iotcon_lite_resource_update_state_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_get_state_n", utc_iotcon_lite_resource_get_state_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
-    {"utc_iotcon_lite_resource_get_state_p", utc_iotcon_lite_resource_get_state_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_update_attributes_n", utc_iotcon_lite_resource_update_attributes_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_update_attributes_p", utc_iotcon_lite_resource_update_attributes_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_get_attributes_n", utc_iotcon_lite_resource_get_attributes_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
+    {"utc_iotcon_lite_resource_get_attributes_p", utc_iotcon_lite_resource_get_attributes_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_start_caching_n", utc_iotcon_remote_resource_start_caching_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_start_caching_p", utc_iotcon_remote_resource_start_caching_p, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
     {"utc_iotcon_remote_resource_stop_caching_n", utc_iotcon_remote_resource_stop_caching_n, utc_iotcon_encap_startup, utc_iotcon_encap_cleanup},
@@ -509,52 +509,52 @@ testcase tc_array[] = {
     {"utc_iotcon_representation_set_resource_interfaces_p", utc_iotcon_representation_set_resource_interfaces_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_resource_interfaces_n", utc_iotcon_representation_get_resource_interfaces_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_resource_interfaces_p", utc_iotcon_representation_get_resource_interfaces_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_set_state_n", utc_iotcon_representation_set_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_set_state_p", utc_iotcon_representation_set_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_get_state_n", utc_iotcon_representation_get_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_representation_get_state_p", utc_iotcon_representation_get_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_create_n", utc_iotcon_state_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_create_p", utc_iotcon_state_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_destroy_n", utc_iotcon_state_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_destroy_p", utc_iotcon_state_destroy_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_clone_n", utc_iotcon_state_clone_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_clone_p", utc_iotcon_state_clone_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_int_n", utc_iotcon_state_add_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_int_p", utc_iotcon_state_add_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_bool_n", utc_iotcon_state_add_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_bool_p", utc_iotcon_state_add_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_double_n", utc_iotcon_state_add_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_double_p", utc_iotcon_state_add_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_str_n", utc_iotcon_state_add_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_str_p", utc_iotcon_state_add_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_byte_str_n", utc_iotcon_state_add_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_byte_str_p", utc_iotcon_state_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_list_n", utc_iotcon_state_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_list_p", utc_iotcon_state_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_state_n", utc_iotcon_state_add_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_state_p", utc_iotcon_state_add_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_null_n", utc_iotcon_state_add_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_add_null_p", utc_iotcon_state_add_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_int_n", utc_iotcon_state_get_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_int_p", utc_iotcon_state_get_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_bool_n", utc_iotcon_state_get_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_bool_p", utc_iotcon_state_get_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_double_n", utc_iotcon_state_get_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_double_p", utc_iotcon_state_get_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_str_n", utc_iotcon_state_get_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_str_p", utc_iotcon_state_get_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_byte_str_n", utc_iotcon_state_get_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_byte_str_p", utc_iotcon_state_get_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_list_n", utc_iotcon_state_get_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_list_p", utc_iotcon_state_get_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_state_n", utc_iotcon_state_get_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_state_p", utc_iotcon_state_get_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_is_null_n", utc_iotcon_state_is_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_is_null_p", utc_iotcon_state_is_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_remove_n", utc_iotcon_state_remove_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_remove_p", utc_iotcon_state_remove_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_type_n", utc_iotcon_state_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_type_p", utc_iotcon_state_get_type_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_set_attributes_n", utc_iotcon_representation_set_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_set_attributes_p", utc_iotcon_representation_set_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_get_attributes_n", utc_iotcon_representation_get_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_representation_get_attributes_p", utc_iotcon_representation_get_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_create_n", utc_iotcon_attributes_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_create_p", utc_iotcon_attributes_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_destroy_n", utc_iotcon_attributes_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_destroy_p", utc_iotcon_attributes_destroy_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_clone_n", utc_iotcon_attributes_clone_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_clone_p", utc_iotcon_attributes_clone_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_int_n", utc_iotcon_attributes_add_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_int_p", utc_iotcon_attributes_add_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_bool_n", utc_iotcon_attributes_add_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_bool_p", utc_iotcon_attributes_add_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_double_n", utc_iotcon_attributes_add_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_double_p", utc_iotcon_attributes_add_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_str_n", utc_iotcon_attributes_add_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_str_p", utc_iotcon_attributes_add_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_byte_str_n", utc_iotcon_attributes_add_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_byte_str_p", utc_iotcon_attributes_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_list_n", utc_iotcon_attributes_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_list_p", utc_iotcon_attributes_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_attributes_n", utc_iotcon_attributes_add_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_attributes_p", utc_iotcon_attributes_add_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_null_n", utc_iotcon_attributes_add_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_add_null_p", utc_iotcon_attributes_add_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_int_n", utc_iotcon_attributes_get_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_int_p", utc_iotcon_attributes_get_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_bool_n", utc_iotcon_attributes_get_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_bool_p", utc_iotcon_attributes_get_bool_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_double_n", utc_iotcon_attributes_get_double_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_double_p", utc_iotcon_attributes_get_double_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_str_n", utc_iotcon_attributes_get_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_str_p", utc_iotcon_attributes_get_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_byte_str_n", utc_iotcon_attributes_get_byte_str_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_byte_str_p", utc_iotcon_attributes_get_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_list_n", utc_iotcon_attributes_get_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_list_p", utc_iotcon_attributes_get_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_attributes_n", utc_iotcon_attributes_get_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_attributes_p", utc_iotcon_attributes_get_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_is_null_n", utc_iotcon_attributes_is_null_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_is_null_p", utc_iotcon_attributes_is_null_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_remove_n", utc_iotcon_attributes_remove_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_remove_p", utc_iotcon_attributes_remove_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_type_n", utc_iotcon_attributes_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_type_p", utc_iotcon_attributes_get_type_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_add_child_n", utc_iotcon_representation_add_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_add_child_p", utc_iotcon_representation_add_child_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_remove_child_n", utc_iotcon_representation_remove_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -565,10 +565,10 @@ testcase tc_array[] = {
     {"utc_iotcon_representation_get_child_count_p", utc_iotcon_representation_get_child_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_nth_child_n", utc_iotcon_representation_get_nth_child_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_representation_get_nth_child_p", utc_iotcon_representation_get_nth_child_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_foreach_n", utc_iotcon_state_foreach_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_foreach_p", utc_iotcon_state_foreach_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_keys_count_n", utc_iotcon_state_get_keys_count_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_state_get_keys_count_p", utc_iotcon_state_get_keys_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_foreach_n", utc_iotcon_attributes_foreach_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_foreach_p", utc_iotcon_attributes_foreach_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_keys_count_n", utc_iotcon_attributes_get_keys_count_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_attributes_get_keys_count_p", utc_iotcon_attributes_get_keys_count_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_create_n", utc_iotcon_list_create_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_create_p", utc_iotcon_list_create_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_destroy_n", utc_iotcon_list_destroy_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -585,8 +585,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_add_byte_str_p", utc_iotcon_list_add_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_add_list_n", utc_iotcon_list_add_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_add_list_p", utc_iotcon_list_add_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_add_state_n", utc_iotcon_list_add_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_add_state_p", utc_iotcon_list_add_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_add_attributes_n", utc_iotcon_list_add_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_add_attributes_p", utc_iotcon_list_add_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_int_n", utc_iotcon_list_get_nth_int_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_int_p", utc_iotcon_list_get_nth_int_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_bool_n", utc_iotcon_list_get_nth_bool_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -599,8 +599,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_get_nth_byte_str_p", utc_iotcon_list_get_nth_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_list_n", utc_iotcon_list_get_nth_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_nth_list_p", utc_iotcon_list_get_nth_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_get_nth_state_n", utc_iotcon_list_get_nth_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_get_nth_state_p", utc_iotcon_list_get_nth_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_get_nth_attributes_n", utc_iotcon_list_get_nth_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_get_nth_attributes_p", utc_iotcon_list_get_nth_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_remove_nth_n", utc_iotcon_list_remove_nth_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_remove_nth_p", utc_iotcon_list_remove_nth_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_get_type_n", utc_iotcon_list_get_type_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
@@ -619,8 +619,8 @@ testcase tc_array[] = {
     {"utc_iotcon_list_foreach_byte_str_p", utc_iotcon_list_foreach_byte_str_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_foreach_list_n", utc_iotcon_list_foreach_list_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_list_foreach_list_p", utc_iotcon_list_foreach_list_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_foreach_state_n", utc_iotcon_list_foreach_state_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
-    {"utc_iotcon_list_foreach_state_p", utc_iotcon_list_foreach_state_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_foreach_attributes_n", utc_iotcon_list_foreach_attributes_n, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
+    {"utc_iotcon_list_foreach_attributes_p", utc_iotcon_list_foreach_attributes_p, utc_iotcon_representation_startup, utc_iotcon_representation_cleanup},
     {"utc_iotcon_resource_create_n", utc_iotcon_resource_create_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},
     {"utc_iotcon_resource_create_p", utc_iotcon_resource_create_p, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},
     {"utc_iotcon_resource_destroy_n", utc_iotcon_resource_destroy_n, utc_iotcon_resource_startup, utc_iotcon_resource_cleanup},

diff --git a/src/utc/iotcon/utc-iotcon-common.c b/src/utc/iotcon/utc-iotcon-common.c
index 83ac7d5..e515229 100755 (executable)
--- a/src/utc/iotcon/utc-iotcon-common.c
+++ b/src/utc/iotcon/utc-iotcon-common.c
@@ -199,109 +199,109 @@ int icutc_create_resource(const char *resource_type, const char *resource_uri,
        return 0;
 }
 
-int icutc_create_state(iotcon_state_h *state_h)
+int icutc_create_attributes(iotcon_attributes_h *attributes_h)
 {
        int ret;
-       iotcon_state_h state, val_state;
+       iotcon_attributes_h attributes, val_attributes;
        unsigned char byte_str[3] = {70, 71, 72};
        iotcon_list_h list1, list2, list3, list4, list5, list6, list7;
 
-       ret = iotcon_state_create(&state);
+       ret = iotcon_attributes_create(&attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_create() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_create() Fail(%d)", ret);
                return ret;
        }
 
-       ret = iotcon_state_add_int(state, "int", 1);
+       ret = iotcon_attributes_add_int(attributes, "int", 1);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_int() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_int() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_bool(state, "bool", true);
+       ret = iotcon_attributes_add_bool(attributes, "bool", true);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_bool() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_bool() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_double(state, "double", 1.1);
+       ret = iotcon_attributes_add_double(attributes, "double", 1.1);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_double() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_double() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_null(state, "null");
+       ret = iotcon_attributes_add_null(attributes, "null");
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_null() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_null() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_str(state, "str", "string");
+       ret = iotcon_attributes_add_str(attributes, "str", "string");
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_byte_str(state, "bytestr", byte_str, 3);
+       ret = iotcon_attributes_add_byte_str(attributes, "bytestr", byte_str, 3);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_byte_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_byte_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       /* state */
-       ret = iotcon_state_create(&val_state);
+       /* attributes */
+       ret = iotcon_attributes_create(&val_attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_create() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_create() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_int(val_state, "val_state", 10);
+       ret = iotcon_attributes_add_int(val_attributes, "val_attributes", 10);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_int() Fail(%d)", ret);
-               iotcon_state_destroy(val_state);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_int() Fail(%d)", ret);
+               iotcon_attributes_destroy(val_attributes);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_state(state, "state", val_state);
+       ret = iotcon_attributes_add_attributes(attributes, "attributes", val_attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_state() Fail(%d)", ret);
-               iotcon_state_destroy(val_state);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(val_attributes);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       /* state list */
-       ret = iotcon_list_create(IOTCON_TYPE_STATE, &list6);
+       /* attributes list */
+       ret = iotcon_list_create(IOTCON_TYPE_ATTRIBUTES, &list6);
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_create() Fail(%d)", ret);
-               iotcon_state_destroy(val_state);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(val_attributes);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_list_add_state(list6, val_state, -1);
+       ret = iotcon_list_add_attributes(list6, val_attributes, -1);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_list_add_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_list_add_attributes() Fail(%d)", ret);
                iotcon_list_destroy(list6);
-               iotcon_state_destroy(val_state);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(val_attributes);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
-       iotcon_state_destroy(val_state);
+       iotcon_attributes_destroy(val_attributes);
 
-       ret = iotcon_state_add_list(state, "state_list", list6);
+       ret = iotcon_attributes_add_list(attributes, "attributes_list", list6);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list6);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
        iotcon_list_destroy(list6);
@@ -310,7 +310,7 @@ int icutc_create_state(iotcon_state_h *state_h)
        ret = iotcon_list_create(IOTCON_TYPE_INT, &list1);
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_create() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
@@ -318,15 +318,15 @@ int icutc_create_state(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_add_int() Fail(%d)", ret);
                iotcon_list_destroy(list1);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_list(state, "int_list", list1);
+       ret = iotcon_attributes_add_list(attributes, "int_list", list1);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list1);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
        iotcon_list_destroy(list1);
@@ -335,7 +335,7 @@ int icutc_create_state(iotcon_state_h *state_h)
        ret = iotcon_list_create(IOTCON_TYPE_BOOL, &list2);
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_create() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
@@ -343,15 +343,15 @@ int icutc_create_state(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_add_bool() Fail(%d)", ret);
                iotcon_list_destroy(list2);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_list(state, "bool_list", list2);
+       ret = iotcon_attributes_add_list(attributes, "bool_list", list2);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list2);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
        iotcon_list_destroy(list2);
@@ -360,7 +360,7 @@ int icutc_create_state(iotcon_state_h *state_h)
        ret = iotcon_list_create(IOTCON_TYPE_STR, &list3);
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_create() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
@@ -368,15 +368,15 @@ int icutc_create_state(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_add_str() Fail(%d)", ret);
                iotcon_list_destroy(list3);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_list(state, "str_list", list3);
+       ret = iotcon_attributes_add_list(attributes, "str_list", list3);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list3);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
        iotcon_list_destroy(list3);
@@ -385,7 +385,7 @@ int icutc_create_state(iotcon_state_h *state_h)
        ret = iotcon_list_create(IOTCON_TYPE_BYTE_STR, &list4);
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_create() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
@@ -393,15 +393,15 @@ int icutc_create_state(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_add_byte_str() Fail(%d)", ret);
                iotcon_list_destroy(list4);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret = iotcon_state_add_list(state, "byte_str_list", list4);
+       ret = iotcon_attributes_add_list(attributes, "byte_str_list", list4);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list4);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
@@ -410,7 +410,7 @@ int icutc_create_state(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_create() Fail(%d)", ret);
                iotcon_list_destroy(list4);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
@@ -419,16 +419,16 @@ int icutc_create_state(iotcon_state_h *state_h)
                ICUTC_ERR("iotcon_list_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list5);
                iotcon_list_destroy(list4);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
        iotcon_list_destroy(list4);
 
-       ret = iotcon_state_add_list(state, "list_list", list5);
+       ret = iotcon_attributes_add_list(attributes, "list_list", list5);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list5);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
        iotcon_list_destroy(list5);
@@ -437,7 +437,7 @@ int icutc_create_state(iotcon_state_h *state_h)
        ret = iotcon_list_create(IOTCON_TYPE_DOUBLE, &list7);
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_create() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
@@ -445,21 +445,21 @@ int icutc_create_state(iotcon_state_h *state_h)
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_list_add_double() Fail(%d)", ret);
                iotcon_list_destroy(list7);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
-       ret =iotcon_state_add_list(state, "double_list", list7);
+       ret =iotcon_attributes_add_list(attributes, "double_list", list7);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list7);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return ret;
        }
 
        iotcon_list_destroy(list7);
 
-       *state_h = state;
+       *attributes_h = attributes;
 
        return 0;
 }
@@ -468,7 +468,7 @@ int icutc_create_representation(iotcon_representation_h *representation)
 {
        int ret;
        char *uri_path = "/uri_path";
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        iotcon_representation_h repr;
        iotcon_resource_types_h types;
        iotcon_resource_interfaces_h ifaces;
@@ -523,23 +523,23 @@ int icutc_create_representation(iotcon_representation_h *representation)
 
        iotcon_resource_interfaces_destroy(ifaces);
 
-       /* state */
-       ret = icutc_create_state(&state);
+       /* attributes */
+       ret = icutc_create_attributes(&attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("icutc_create_state() Fail(%d)", ret);
+               ICUTC_ERR("icutc_create_attributes() Fail(%d)", ret);
                iotcon_representation_destroy(repr);
                return ret;
        }
 
-       ret = iotcon_representation_set_state(repr, state);
+       ret = iotcon_representation_set_attributes(repr, attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_representation_set_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_representation_set_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                iotcon_representation_destroy(repr);
                return ret;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        *representation = repr;
 
        return 0;

diff --git a/src/utc/iotcon/utc-iotcon-common.h b/src/utc/iotcon/utc-iotcon-common.h
index b1a281e..3118537 100755 (executable)
--- a/src/utc/iotcon/utc-iotcon-common.h
+++ b/src/utc/iotcon/utc-iotcon-common.h
@@ -95,7 +95,7 @@ int icutc_create_resource_types(const char *type, iotcon_resource_types_h *types
 int icutc_create_resource_interfaces(iotcon_resource_interfaces_h *ifaces_h);
 int icutc_create_resource(const char *resource_type, const char *resource_uri,
                iotcon_resource_h *resource_handle);
-int icutc_create_state(iotcon_state_h *state);
+int icutc_create_attributes(iotcon_attributes_h *attributes);
 int icutc_create_representation(iotcon_representation_h *representation);
 bool icutc_storage_device_supported_cb(int storage_id, storage_type_e type,
                storage_state_e state, const char *path, void *user_data);

diff --git a/src/utc/iotcon/utc-iotcon-encap.c b/src/utc/iotcon/utc-iotcon-encap.c
index 524beaa..294f572 100755 (executable)
--- a/src/utc/iotcon/utc-iotcon-encap.c
+++ b/src/utc/iotcon/utc-iotcon-encap.c
@@ -74,7 +74,7 @@ static int _encap_create_lite_resource()
 {
        FN_CALL;
        int ret;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
        iotcon_resource_types_h types;
 
        ret = iotcon_resource_types_create(&types);
@@ -90,9 +90,9 @@ static int _encap_create_lite_resource()
                return ret;
        }
 
-       ret = icutc_create_state(&state);
+       ret = icutc_create_attributes(&attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("icutc_create_state() Fail(%d)", ret);
+               ICUTC_ERR("icutc_create_attributes() Fail(%d)", ret);
                iotcon_resource_types_destroy(types);
                return ret;
        }
@@ -101,18 +101,18 @@ static int _encap_create_lite_resource()
        ret = iotcon_lite_resource_create(ENCAP_LIGHT_RESOURCE_URI,
                        types,
                        (IOTCON_RESOURCE_DISCOVERABLE | IOTCON_RESOURCE_OBSERVABLE),
-                       state,
+                       attributes,
                        NULL,
                        NULL,
                        &g_lite_light_resource);
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_lite_resource_create() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                iotcon_resource_types_destroy(types);
                return ret;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        iotcon_resource_types_destroy(types);
 
        return 0;
@@ -122,29 +122,29 @@ static gboolean _update_lite_resource(gpointer p)
 {
        FN_CALL;
        int ret;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
-       ret = icutc_create_state(&state);
+       ret = icutc_create_attributes(&attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("icutc_create_state() Fail(%d)", ret);
+               ICUTC_ERR("icutc_create_attributes() Fail(%d)", ret);
                _encap_main_loop_quit(false);
                return G_SOURCE_REMOVE;
        }
 
-       ret = iotcon_state_add_bool(state, "bool", false);
+       ret = iotcon_attributes_add_bool(attributes, "bool", false);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_add_bool() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_bool() Fail(%d)", ret);
                _encap_main_loop_quit(false);
                return G_SOURCE_REMOVE;
        }
 
-       ret = iotcon_lite_resource_update_state(g_lite_light_resource, state);
+       ret = iotcon_lite_resource_update_attributes(g_lite_light_resource, attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_lite_resource_update_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_lite_resource_update_attributes() Fail(%d)", ret);
                _encap_main_loop_quit(false);
                return G_SOURCE_REMOVE;
        }
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return G_SOURCE_REMOVE;
 }
 
@@ -234,8 +234,6 @@ static void _encap_monitoring_cb(iotcon_remote_resource_h resource,
        }
 }
 
-
-
 static void _encap_found_resource(iotcon_remote_resource_h resource,
                iotcon_error_e err, void *user_data)
 {
@@ -663,17 +661,17 @@ int utc_iotcon_lite_resource_destroy_p(void)
 
 
 /**
- * @testcase      utc_iotcon_lite_resource_update_state_n
+ * @testcase      utc_iotcon_lite_resource_update_attributes_n
  * @since_tizen   3.0
- * @description   Test fail updating state from lite resource with invalid parameter.
+ * @description   Test fail updating attributes from lite resource with invalid parameter.
  */
-int utc_iotcon_lite_resource_update_state_n(void)
+int utc_iotcon_lite_resource_update_attributes_n(void)
 {
        int ret;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_lite_resource_update_state(NULL, state);
+               ret = iotcon_lite_resource_update_attributes(NULL, attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
@@ -681,11 +679,11 @@ int utc_iotcon_lite_resource_update_state_n(void)
        ret = _encap_create_lite_resource();
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
-       ret = iotcon_state_create(&state);
+       ret = iotcon_attributes_create(&attributes);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
-       ret = iotcon_lite_resource_update_state(NULL, state);
-       iotcon_state_destroy(state);
+       ret = iotcon_lite_resource_update_attributes(NULL, attributes);
+       iotcon_attributes_destroy(attributes);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER);
 
        _encap_destroy_lite_resource();
@@ -694,17 +692,17 @@ int utc_iotcon_lite_resource_update_state_n(void)
 }
 
 /**
- * @testcase      utc_iotcon_lite_resource_update_state_p
+ * @testcase      utc_iotcon_lite_resource_update_attributes_p
  * @since_tizen   3.0
- * @description   Test updating state from lite resource.
+ * @description   Test updating attributes from lite resource.
  */
-int utc_iotcon_lite_resource_update_state_p(void)
+int utc_iotcon_lite_resource_update_attributes_p(void)
 {
        int ret;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_lite_resource_update_state(g_lite_light_resource, state);
+               ret = iotcon_lite_resource_update_attributes(g_lite_light_resource, attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
@@ -712,33 +710,33 @@ int utc_iotcon_lite_resource_update_state_p(void)
        ret = _encap_create_lite_resource();
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
-       ret = iotcon_state_create(&state);
+       ret = iotcon_attributes_create(&attributes);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
-       ret = iotcon_state_add_int(state, "int", ++g_brightness);
+       ret = iotcon_attributes_add_int(attributes, "int", ++g_brightness);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
-       ret = iotcon_lite_resource_update_state(g_lite_light_resource, state);
+       ret = iotcon_lite_resource_update_attributes(g_lite_light_resource, attributes);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        _encap_destroy_lite_resource();
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_lite_resource_get_state_n
+ * @testcase      utc_iotcon_lite_resource_get_attributes_n
  * @since_tizen   3.0
- * @description   Test fail getting state from lite resource with invalid parameter.
+ * @description   Test fail getting attributes from lite resource with invalid parameter.
  */
-int utc_iotcon_lite_resource_get_state_n(void)
+int utc_iotcon_lite_resource_get_attributes_n(void)
 {
        int ret;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_lite_resource_get_state(NULL, &state);
+               ret = iotcon_lite_resource_get_attributes(NULL, &attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
@@ -746,10 +744,10 @@ int utc_iotcon_lite_resource_get_state_n(void)
        ret = _encap_create_lite_resource();
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
-       ret = iotcon_lite_resource_get_state(NULL, &state);
+       ret = iotcon_lite_resource_get_attributes(NULL, &attributes);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER);
 
-       ret = iotcon_lite_resource_get_state(g_lite_light_resource, NULL);
+       ret = iotcon_lite_resource_get_attributes(g_lite_light_resource, NULL);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER);
 
        _encap_destroy_lite_resource();
@@ -758,17 +756,17 @@ int utc_iotcon_lite_resource_get_state_n(void)
 }
 
 /**
- * @testcase      utc_iotcon_lite_resource_get_state_p
+ * @testcase      utc_iotcon_lite_resource_get_attributes_p
  * @since_tizen   3.0
- * @description   Test getting state from lite resource.
+ * @description   Test getting attributes from lite resource.
  */
-int utc_iotcon_lite_resource_get_state_p(void)
+int utc_iotcon_lite_resource_get_attributes_p(void)
 {
        int ret;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_lite_resource_get_state(g_lite_light_resource, &state);
+               ret = iotcon_lite_resource_get_attributes(g_lite_light_resource, &attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
@@ -776,7 +774,7 @@ int utc_iotcon_lite_resource_get_state_p(void)
        ret = _encap_create_lite_resource();
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
-       ret = iotcon_lite_resource_get_state(g_lite_light_resource, &state);
+       ret = iotcon_lite_resource_get_attributes(g_lite_light_resource, &attributes);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
        _encap_destroy_lite_resource();

diff --git a/src/utc/iotcon/utc-iotcon-remote-resource.c b/src/utc/iotcon/utc-iotcon-remote-resource.c
index 832c1fc..dfca7c4 100755 (executable)
--- a/src/utc/iotcon/utc-iotcon-remote-resource.c
+++ b/src/utc/iotcon/utc-iotcon-remote-resource.c
@@ -247,7 +247,7 @@ static int _remote_resource_create_resource(int tc_index)
 static int _remote_resource_create_lite_resource()
 {
        int ret;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
        iotcon_resource_types_h light_types;
 
        ret = iotcon_resource_types_create(&light_types);
@@ -260,9 +260,9 @@ static int _remote_resource_create_lite_resource()
                return 1;
        }
 
-       ret = icutc_create_state(&state);
+       ret = icutc_create_attributes(&attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("icutc_create_state() Fail(%d)", ret);
+               ICUTC_ERR("icutc_create_attributes() Fail(%d)", ret);
                iotcon_resource_types_destroy(light_types);
                return 1;
        }
@@ -270,18 +270,18 @@ static int _remote_resource_create_lite_resource()
        ret = iotcon_lite_resource_create(LIGHT_RESOURCE_URI,
                        light_types,
                        (IOTCON_RESOURCE_DISCOVERABLE | IOTCON_RESOURCE_OBSERVABLE),
-                       state,
+                       attributes,
                        NULL,
                        NULL,
                        &g_lite_light_resource);
        if (IOTCON_ERROR_NONE != ret) {
                ICUTC_ERR("iotcon_resource_create() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                iotcon_resource_types_destroy(light_types);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        iotcon_resource_types_destroy(light_types);
 
        return 0;

diff --git a/src/utc/iotcon/utc-iotcon-representation.c b/src/utc/iotcon/utc-iotcon-representation.c
index 926d92b..7d94951 100755 (executable)
--- a/src/utc/iotcon/utc-iotcon-representation.c
+++ b/src/utc/iotcon/utc-iotcon-representation.c
@@ -21,48 +21,48 @@
 #include "utc-iotcon-common.h"
 
 #define REPRESENTATION_LIST_COUNT 10
-#define REPRESENTATION_STATE_KEY_INT "int1"
-#define REPRESENTATION_STATE_KEY_DOUBLE "double1"
-#define REPRESENTATION_STATE_KEY_BOOL "bool1"
-#define REPRESENTATION_STATE_KEY_STR "str1"
-#define REPRESENTATION_STATE_KEY_BYTE_STR "byte_str1"
-#define REPRESENTATION_STATE_KEY_STATE "state1"
-#define REPRESENTATION_STATE_KEY_LIST "list1_1"
-#define REPRESENTATION_STATE_KEY_NULL "null1"
+#define REPRESENTATION_ATTRIBUTES_KEY_INT "int1"
+#define REPRESENTATION_ATTRIBUTES_KEY_DOUBLE "double1"
+#define REPRESENTATION_ATTRIBUTES_KEY_BOOL "bool1"
+#define REPRESENTATION_ATTRIBUTES_KEY_STR "str1"
+#define REPRESENTATION_ATTRIBUTES_KEY_BYTE_STR "byte_str1"
+#define REPRESENTATION_ATTRIBUTES_KEY_ATTRIBUTES "attributes1"
+#define REPRESENTATION_ATTRIBUTES_KEY_LIST "list1_1"
+#define REPRESENTATION_ATTRIBUTES_KEY_NULL "null1"
 #define REPRESENTATION_LIGHT_RESOURCE_TYPE "core.light"
 #define REPRESENTATION_LIGHT_RESOURCE_URI "/a/light"
 
 static bool g_feature;
 
-static int _representation_create_list_state(iotcon_list_h *list_state)
+static int _representation_create_list_attributes(iotcon_list_h *list_attributes)
 {
        int i;
        int ret;
        iotcon_list_h list = NULL;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
-       ret = iotcon_list_create(IOTCON_TYPE_STATE, &list);
+       ret = iotcon_list_create(IOTCON_TYPE_ATTRIBUTES, &list);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
        for (i = 0; i < REPRESENTATION_LIST_COUNT; i++) {
-               ret = iotcon_state_create(&state);
+               ret = iotcon_attributes_create(&attributes);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_create() Fail(%d)", ret);
+                       ICUTC_ERR("iotcon_attributes_create() Fail(%d)", ret);
                        iotcon_list_destroy(list);
                        return 1;
                }
 
-               ret = iotcon_list_add_state(list, state, -1);
+               ret = iotcon_list_add_attributes(list, attributes, -1);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_create() Fail(%d)", ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_create() Fail(%d)", ret);
+                       iotcon_attributes_destroy(attributes);
                        iotcon_list_destroy(list);
                        return 1;
                }
 
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
        }
-       *list_state = list;
+       *list_attributes = list;
 
        return 0;
 }
@@ -210,92 +210,92 @@ static int _representation_create_list_list(iotcon_list_h *list_list)
        return 0;
 }
 
-static int _representation_create_state(iotcon_state_h *state_handle)
+static int _representation_create_attributes(iotcon_attributes_h *attributes_handle)
 {
        int i;
        int ret;
-       iotcon_state_h state = NULL;
-       char key[10];
+       iotcon_attributes_h attributes = NULL;
+       char key[20];
        unsigned char byte_str[3] = {70, 71, 72};
        bool val_bool;
-       iotcon_state_h val_state = NULL;
+       iotcon_attributes_h val_attributes = NULL;
        iotcon_list_h val_list1, val_list2, val_list3;
 
-       ret = iotcon_state_create(&state);
+       ret = iotcon_attributes_create(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
        for (i = 0; i < REPRESENTATION_LIST_COUNT; i++) {
                snprintf(key, sizeof(key), "int%d", i);
-               ret = iotcon_state_add_int(state, key, i);
+               ret = iotcon_attributes_add_int(attributes, key, i);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_int() Fail(%d)", ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_add_int() Fail(%d)", ret);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
                snprintf(key, sizeof(key), "bool%d", i);
                val_bool = (i % 2)? true: false;
-               ret = iotcon_state_add_bool(state, key, val_bool);
+               ret = iotcon_attributes_add_bool(attributes, key, val_bool);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_bool() Fail(%d)", ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_add_bool() Fail(%d)", ret);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
                snprintf(key, sizeof(key), "double%d", i);
-               ret = iotcon_state_add_double(state, key, (double)i);
+               ret = iotcon_attributes_add_double(attributes, key, (double)i);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_double() Fail(%d)", ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_add_double() Fail(%d)", ret);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
                snprintf(key, sizeof(key), "str%d", i);
-               ret = iotcon_state_add_str(state, key, key);
+               ret = iotcon_attributes_add_str(attributes, key, key);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_str() Fail(%d)", ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_add_str() Fail(%d)", ret);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
                snprintf(key, sizeof(key), "byte_str%d", i);
-               ret = iotcon_state_add_byte_str(state, key, byte_str, 3);
+               ret = iotcon_attributes_add_byte_str(attributes, key, byte_str, 3);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_byte_str() Fail(%d)", ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_add_byte_str() Fail(%d)", ret);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
-               snprintf(key, sizeof(key), "state%d", i);
-               ret = iotcon_state_create(&val_state);
+               snprintf(key, sizeof(key), "attributes%d", i);
+               ret = iotcon_attributes_create(&val_attributes);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_create() Fail(%d)", ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_create() Fail(%d)", ret);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
-               ret = iotcon_state_add_int(val_state, "val_state", 10);
+               ret = iotcon_attributes_add_int(val_attributes, "val_attributes", 10);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_int() Fail(%d)", ret);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_add_int() Fail(%d)", ret);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
-               ret = iotcon_state_add_state(state, key, val_state);
+               ret = iotcon_attributes_add_attributes(attributes, key, val_attributes);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_state() Fail(%d)", ret);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_add_attributes() Fail(%d)", ret);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
                snprintf(key, sizeof(key), "list1_%d", i);
                ret = iotcon_list_create(IOTCON_TYPE_INT, &val_list1);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_create() Fail(%d)", ret);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_create() Fail(%d)", ret);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
@@ -303,8 +303,8 @@ static int _representation_create_state(iotcon_state_h *state_handle)
                if (IOTCON_ERROR_NONE != ret) {
                        ICUTC_ERR("iotcon_list_add_int() Fail(%d)", ret);
                        iotcon_list_destroy(val_list1);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
@@ -312,8 +312,8 @@ static int _representation_create_state(iotcon_state_h *state_handle)
                if (IOTCON_ERROR_NONE != ret) {
                        ICUTC_ERR("iotcon_list_add_int() Fail(%d)", ret);
                        iotcon_list_destroy(val_list1);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
@@ -321,27 +321,27 @@ static int _representation_create_state(iotcon_state_h *state_handle)
                if (IOTCON_ERROR_NONE != ret) {
                        ICUTC_ERR("iotcon_list_add_int() Fail(%d)", ret);
                        iotcon_list_destroy(val_list1);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
-               ret = iotcon_state_add_list(state, key, val_list1);
+               ret = iotcon_attributes_add_list(attributes, key, val_list1);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+                       ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                        iotcon_list_destroy(val_list1);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
                snprintf(key, sizeof(key), "list2_%d", i);
                ret = iotcon_list_create(IOTCON_TYPE_LIST, &val_list2);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_create() Fail(%d)", ret);
+                       ICUTC_ERR("iotcon_attributes_create() Fail(%d)", ret);
                        iotcon_list_destroy(val_list1);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
@@ -350,71 +350,71 @@ static int _representation_create_state(iotcon_state_h *state_handle)
                        ICUTC_ERR("iotcon_list_add_list() Fail(%d)", ret);
                        iotcon_list_destroy(val_list2);
                        iotcon_list_destroy(val_list1);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
                iotcon_list_destroy(val_list1);
 
-               ret = iotcon_state_add_list(state, key, val_list2);
+               ret = iotcon_attributes_add_list(attributes, key, val_list2);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+                       ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                        iotcon_list_destroy(val_list2);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
                iotcon_list_destroy(val_list2);
 
                snprintf(key, sizeof(key), "list3_%d", i);
-               ret = iotcon_list_create(IOTCON_TYPE_STATE, &val_list3);
+               ret = iotcon_list_create(IOTCON_TYPE_ATTRIBUTES, &val_list3);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_create() Fail(%d)", ret);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_create() Fail(%d)", ret);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
-               ret = iotcon_list_add_state(val_list3, val_state, -1);
+               ret = iotcon_list_add_attributes(val_list3, val_attributes, -1);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_list_add_state() Fail(%d)", ret);
+                       ICUTC_ERR("iotcon_list_add_attributes() Fail(%d)", ret);
                        iotcon_list_destroy(val_list3);
-                       iotcon_state_destroy(val_state);
-                       iotcon_state_destroy(state);
+                       iotcon_attributes_destroy(val_attributes);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
-               iotcon_state_destroy(val_state);
+               iotcon_attributes_destroy(val_attributes);
 
-               ret = iotcon_state_add_list(state, key, val_list3);
+               ret = iotcon_attributes_add_list(attributes, key, val_list3);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+                       ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                        iotcon_list_destroy(val_list3);
-                       iotcon_state_destroy(state);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
 
                iotcon_list_destroy(val_list3);
 
                snprintf(key, sizeof(key), "null%d", i);
-               ret = iotcon_state_add_null(state, key);
+               ret = iotcon_attributes_add_null(attributes, key);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_add_null() Fail(%d)", ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_add_null() Fail(%d)", ret);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
        }
 
-       *state_handle = state;
+       *attributes_handle = attributes;
        return 0;
 }
 
 static int _representation_create_representation(iotcon_representation_h *repr_handle)
 {
        int ret;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
        iotcon_representation_h repr;
        iotcon_resource_types_h types = NULL;
        iotcon_resource_interfaces_h ifaces = NULL;
@@ -425,21 +425,21 @@ static int _representation_create_representation(iotcon_representation_h *repr_h
                return 1;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("_representation_create_state() Fail(%d)", ret);
+               ICUTC_ERR("_representation_create_attributes() Fail(%d)", ret);
                iotcon_representation_destroy(repr);
                return 1;
        }
 
-       ret = iotcon_representation_set_state(repr, state);
+       ret = iotcon_representation_set_attributes(repr, attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_representation_set_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_representation_set_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                iotcon_representation_destroy(repr);
                return 1;
        }
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        ret = iotcon_resource_interfaces_create(&ifaces);
        if (IOTCON_ERROR_NONE != ret) {
@@ -489,7 +489,7 @@ static int _representation_create_representation(iotcon_representation_h *repr_h
        }
        ret = iotcon_representation_set_resource_types(repr, types);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("_representation_create_state() Fail(%d)", ret);
+               ICUTC_ERR("_representation_create_attributes() Fail(%d)", ret);
                iotcon_resource_interfaces_destroy(ifaces);
                iotcon_resource_types_destroy(types);
                iotcon_representation_destroy(repr);
@@ -1155,18 +1155,18 @@ int utc_iotcon_representation_get_resource_interfaces_p(void)
 }
 
 /**
- * @testcase      utc_iotcon_representation_set_state_n
+ * @testcase      utc_iotcon_representation_set_attributes_n
  * @since_tizen   3.0
- * @description   Test fail setting state to presentation with invalid parameter.
+ * @description   Test fail setting attributes to presentation with invalid parameter.
  */
-int utc_iotcon_representation_set_state_n(void)
+int utc_iotcon_representation_set_attributes_n(void)
 {
        int ret;
        iotcon_representation_h repr;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_representation_set_state(NULL, state);
+               ret = iotcon_representation_set_attributes(NULL, attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
@@ -1174,39 +1174,39 @@ int utc_iotcon_representation_set_state_n(void)
        ret = _representation_create_representation(&repr);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        if (0 != ret) {
-               ICUTC_ERR("_representation_create_state() Fail(%d)", ret);
+               ICUTC_ERR("_representation_create_attributes() Fail(%d)", ret);
                iotcon_representation_destroy(repr);
                return 1;
        }
 
-       ret = iotcon_representation_set_state(NULL, state);
+       ret = iotcon_representation_set_attributes(NULL, attributes);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_representation_get_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_representation_get_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                iotcon_representation_destroy(repr);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        iotcon_representation_destroy(repr);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_representation_set_state_p
+ * @testcase      utc_iotcon_representation_set_attributes_p
  * @since_tizen   3.0
- * @description   Test setting state to presentation.
+ * @description   Test setting attributes to presentation.
  */
-int utc_iotcon_representation_set_state_p(void)
+int utc_iotcon_representation_set_attributes_p(void)
 {
        int ret;
        iotcon_representation_h repr;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_representation_set_state(NULL, state);
+               ret = iotcon_representation_set_attributes(NULL, attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
@@ -1219,18 +1219,18 @@ int utc_iotcon_representation_set_state_p(void)
 }
 
 /**
- * @testcase      utc_iotcon_representation_get_state_n
+ * @testcase      utc_iotcon_representation_get_attributes_n
  * @since_tizen   3.0
- * @description   Test fail getting state from presentation with invalid parameter.
+ * @description   Test fail getting attributes from presentation with invalid parameter.
  */
-int utc_iotcon_representation_get_state_n(void)
+int utc_iotcon_representation_get_attributes_n(void)
 {
        int ret;
        iotcon_representation_h repr;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_representation_get_state(NULL, &state);
+               ret = iotcon_representation_get_attributes(NULL, &attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
@@ -1238,16 +1238,16 @@ int utc_iotcon_representation_get_state_n(void)
        ret = _representation_create_representation(&repr);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_representation_get_state(NULL, &state);
+       ret = iotcon_representation_get_attributes(NULL, &attributes);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_representation_get_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_representation_get_attributes() Fail(%d)", ret);
                iotcon_representation_destroy(repr);
                return 1;
        }
 
-       ret = iotcon_representation_get_state(repr, NULL);
+       ret = iotcon_representation_get_attributes(repr, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_representation_get_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_representation_get_attributes() Fail(%d)", ret);
                iotcon_representation_destroy(repr);
                return 1;
        }
@@ -1258,18 +1258,18 @@ int utc_iotcon_representation_get_state_n(void)
 }
 
 /**
- * @testcase      utc_iotcon_representation_get_state_p
+ * @testcase      utc_iotcon_representation_get_attributes_p
  * @since_tizen   3.0
- * @description   Test getting state from presentation.
+ * @description   Test getting attributes from presentation.
  */
-int utc_iotcon_representation_get_state_p(void)
+int utc_iotcon_representation_get_attributes_p(void)
 {
        int ret;
        iotcon_representation_h repr;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_representation_get_state(NULL, &state);
+               ret = iotcon_representation_get_attributes(NULL, &attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
@@ -1277,9 +1277,9 @@ int utc_iotcon_representation_get_state_p(void)
        ret = _representation_create_representation(&repr);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_representation_get_state(repr, &state);
+       ret = iotcon_representation_get_attributes(repr, &attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_representation_get_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_representation_get_attributes() Fail(%d)", ret);
                iotcon_representation_destroy(repr);
                return 1;
        }
@@ -1289,1511 +1289,1511 @@ int utc_iotcon_representation_get_state_p(void)
 }
 
 /**
- * @testcase      utc_iotcon_state_create_n
+ * @testcase      utc_iotcon_attributes_create_n
  * @since_tizen   3.0
- * @description   Test fail creating a state with invalid parameter.
+ * @description   Test fail creating a attributes with invalid parameter.
  */
-int utc_iotcon_state_create_n(void)
+int utc_iotcon_attributes_create_n(void)
 {
        int ret;
 
        if (false == g_feature) {
-               ret = iotcon_state_create(NULL);
+               ret = iotcon_attributes_create(NULL);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = iotcon_state_create(NULL);
+       ret = iotcon_attributes_create(NULL);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_create_p
+ * @testcase      utc_iotcon_attributes_create_p
  * @since_tizen   3.0
- * @description   Test creating a state.
+ * @description   Test creating a attributes.
  */
-int utc_iotcon_state_create_p(void)
+int utc_iotcon_attributes_create_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_create(NULL);
+               ret = iotcon_attributes_create(NULL);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_destroy_n
+ * @testcase      utc_iotcon_attributes_destroy_n
  * @since_tizen   3.0
- * @description   Test fail destroying a state with invalid parameter.
+ * @description   Test fail destroying a attributes with invalid parameter.
  */
-int utc_iotcon_state_destroy_n(void)
+int utc_iotcon_attributes_destroy_n(void)
 {
        if (false == g_feature) {
-               iotcon_state_destroy(NULL);
+               iotcon_attributes_destroy(NULL);
                return 0;
        }
 
-       iotcon_state_destroy(NULL);
+       iotcon_attributes_destroy(NULL);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_destroy_p
+ * @testcase      utc_iotcon_attributes_destroy_p
  * @since_tizen   3.0
- * @description   Test destroying a state.
+ * @description   Test destroying a attributes.
  */
-int utc_iotcon_state_destroy_p(void)
+int utc_iotcon_attributes_destroy_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_create(NULL);
+               ret = iotcon_attributes_create(NULL);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_clone_n
+ * @testcase      utc_iotcon_attributes_clone_n
  * @since_tizen   3.0
- * @description   Test fail cloning a state with invalid parameter.
+ * @description   Test fail cloning a attributes with invalid parameter.
  */
-int utc_iotcon_state_clone_n(void)
+int utc_iotcon_attributes_clone_n(void)
 {
        int ret;
-       iotcon_state_h state;
-       iotcon_state_h state_clone;
+       iotcon_attributes_h attributes;
+       iotcon_attributes_h attributes_clone;
 
        if (false == g_feature) {
-               ret = iotcon_state_clone(NULL, &state_clone);
+               ret = iotcon_attributes_clone(NULL, &attributes_clone);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_clone(NULL, &state_clone);
+       ret = iotcon_attributes_clone(NULL, &attributes_clone);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_clone() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_clone() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_clone(state, NULL);
+       ret = iotcon_attributes_clone(attributes, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_clone() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_clone() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_clone_p
+ * @testcase      utc_iotcon_attributes_clone_p
  * @since_tizen   3.0
- * @description   Test cloning a state.
+ * @description   Test cloning a attributes.
  */
-int utc_iotcon_state_clone_p(void)
+int utc_iotcon_attributes_clone_p(void)
 {
        int ret;
-       iotcon_state_h state;
-       iotcon_state_h state_clone;
+       iotcon_attributes_h attributes;
+       iotcon_attributes_h attributes_clone;
 
        if (false == g_feature) {
-               ret = iotcon_state_clone(NULL, &state_clone);
+               ret = iotcon_attributes_clone(NULL, &attributes_clone);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_clone(state, &state_clone);
+       ret = iotcon_attributes_clone(attributes, &attributes_clone);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_clone() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_clone() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state_clone);
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes_clone);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_int_n
+ * @testcase      utc_iotcon_attributes_add_int_n
  * @since_tizen   3.0
- * @description   Test fail adding integer value to state with invalid parameter.
+ * @description   Test fail adding integer value to attributes with invalid parameter.
  */
-int utc_iotcon_state_add_int_n(void)
+int utc_iotcon_attributes_add_int_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        int value = 1;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_int(NULL, "key", value);
+               ret = iotcon_attributes_add_int(NULL, "key", value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_add_int(NULL, "key", value);
+       ret = iotcon_attributes_add_int(NULL, "key", value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_int() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_int() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_int(state, NULL, value);
+       ret = iotcon_attributes_add_int(attributes, NULL, value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_int() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_int() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_int_p
+ * @testcase      utc_iotcon_attributes_add_int_p
  * @since_tizen   3.0
- * @description   Test adding integer value to state.
+ * @description   Test adding integer value to attributes.
  */
-int utc_iotcon_state_add_int_p(void)
+int utc_iotcon_attributes_add_int_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        int value = 1;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_int(NULL, "key", value);
+               ret = iotcon_attributes_add_int(NULL, "key", value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_bool_n
+ * @testcase      utc_iotcon_attributes_add_bool_n
  * @since_tizen   3.0
- * @description   Test fail adding boolean value to state with invalid parameter.
+ * @description   Test fail adding boolean value to attributes with invalid parameter.
  */
-int utc_iotcon_state_add_bool_n(void)
+int utc_iotcon_attributes_add_bool_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        bool value = false;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_bool(NULL, "key", value);
+               ret = iotcon_attributes_add_bool(NULL, "key", value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_add_bool(NULL, "key", value);
+       ret = iotcon_attributes_add_bool(NULL, "key", value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_bool() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_bool() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_bool(state, NULL, value);
+       ret = iotcon_attributes_add_bool(attributes, NULL, value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_bool() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_bool() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_bool_p
+ * @testcase      utc_iotcon_attributes_add_bool_p
  * @since_tizen   3.0
- * @description   Test adding boolean value to state.
+ * @description   Test adding boolean value to attributes.
  */
-int utc_iotcon_state_add_bool_p(void)
+int utc_iotcon_attributes_add_bool_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        bool value = false;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_bool(NULL, "key", value);
+               ret = iotcon_attributes_add_bool(NULL, "key", value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_double_n
+ * @testcase      utc_iotcon_attributes_add_double_n
  * @since_tizen   3.0
- * @description   Test fail adding double value to state with invalid parameter.
+ * @description   Test fail adding double value to attributes with invalid parameter.
  */
-int utc_iotcon_state_add_double_n(void)
+int utc_iotcon_attributes_add_double_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        double value = 1.0;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_double(NULL, "key", value);
+               ret = iotcon_attributes_add_double(NULL, "key", value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_add_double(NULL, "key", value);
+       ret = iotcon_attributes_add_double(NULL, "key", value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_double() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_double() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_double(state, NULL, value);
+       ret = iotcon_attributes_add_double(attributes, NULL, value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_double() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_double() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 
 }
 
 /**
- * @testcase      utc_iotcon_state_add_double_p
+ * @testcase      utc_iotcon_attributes_add_double_p
  * @since_tizen   3.0
- * @description   Test adding double value to state.
+ * @description   Test adding double value to attributes.
  */
-int utc_iotcon_state_add_double_p(void)
+int utc_iotcon_attributes_add_double_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        double value = 1.0;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_double(NULL, "key", value);
+               ret = iotcon_attributes_add_double(NULL, "key", value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 
 /**
- * @testcase      utc_iotcon_state_add_str_n
+ * @testcase      utc_iotcon_attributes_add_str_n
  * @since_tizen   3.0
- * @description   Test fail adding string value to state with invalid parameter.
+ * @description   Test fail adding string value to attributes with invalid parameter.
  */
-int utc_iotcon_state_add_str_n(void)
+int utc_iotcon_attributes_add_str_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        char *value = "value";
 
        if (false == g_feature) {
-               ret = iotcon_state_add_str(NULL, "key", value);
+               ret = iotcon_attributes_add_str(NULL, "key", value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_add_str(NULL, "key", value);
+       ret = iotcon_attributes_add_str(NULL, "key", value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_str(state, NULL, value);
+       ret = iotcon_attributes_add_str(attributes, NULL, value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_str(state, "key", NULL);
+       ret = iotcon_attributes_add_str(attributes, "key", NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_str_p
+ * @testcase      utc_iotcon_attributes_add_str_p
  * @since_tizen   3.0
- * @description   Test adding string value to state.
+ * @description   Test adding string value to attributes.
  */
-int utc_iotcon_state_add_str_p(void)
+int utc_iotcon_attributes_add_str_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        char *value = "value";
 
        if (false == g_feature) {
-               ret = iotcon_state_add_str(NULL, "key", value);
+               ret = iotcon_attributes_add_str(NULL, "key", value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_byte_str_n
+ * @testcase      utc_iotcon_attributes_add_byte_str_n
  * @since_tizen   3.0
- * @description   Test fail adding byte string value to state with invalid parameter.
+ * @description   Test fail adding byte string value to attributes with invalid parameter.
  */
-int utc_iotcon_state_add_byte_str_n(void)
+int utc_iotcon_attributes_add_byte_str_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        unsigned char value[3] = {70, 71, 72};
 
        if (false == g_feature) {
-               ret = iotcon_state_add_byte_str(NULL, "key", value, 3);
+               ret = iotcon_attributes_add_byte_str(NULL, "key", value, 3);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_add_byte_str(NULL, "key", value, 3);
+       ret = iotcon_attributes_add_byte_str(NULL, "key", value, 3);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_byte_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_byte_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_byte_str(state, NULL, value, 3);
+       ret = iotcon_attributes_add_byte_str(attributes, NULL, value, 3);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_byte_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_byte_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_byte_str(state, "key", NULL, 3);
+       ret = iotcon_attributes_add_byte_str(attributes, "key", NULL, 3);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_byte_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_byte_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_byte_str_p
+ * @testcase      utc_iotcon_attributes_add_byte_str_p
  * @since_tizen   3.0
- * @description   Test adding byte string value to state.
+ * @description   Test adding byte string value to attributes.
  */
-int utc_iotcon_state_add_byte_str_p(void)
+int utc_iotcon_attributes_add_byte_str_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        unsigned char value[3] = {70, 71, 72};
 
        if (false == g_feature) {
-               ret = iotcon_state_add_byte_str(NULL, "key", value, 3);
+               ret = iotcon_attributes_add_byte_str(NULL, "key", value, 3);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_list_n
+ * @testcase      utc_iotcon_attributes_add_list_n
  * @since_tizen   3.0
- * @description   Test fail adding list value to state with invalid parameter.
+ * @description   Test fail adding list value to attributes with invalid parameter.
  */
-int utc_iotcon_state_add_list_n(void)
+int utc_iotcon_attributes_add_list_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        iotcon_list_h list_temp;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_list(NULL, "key", list_temp);
+               ret = iotcon_attributes_add_list(NULL, "key", list_temp);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
        ret = _representation_create_list_int(&list_temp);
        if (0 != ret) {
                ICUTC_ERR("_representation_create_list_int() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_list(NULL, "key", list_temp);
+       ret = iotcon_attributes_add_list(NULL, "key", list_temp);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list_temp);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_list(state, NULL, list_temp);
+       ret = iotcon_attributes_add_list(attributes, NULL, list_temp);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list_temp);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_list(state, "key", NULL);
+       ret = iotcon_attributes_add_list(attributes, "key", NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_list() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_add_list() Fail(%d)", ret);
                iotcon_list_destroy(list_temp);
-               iotcon_state_destroy(state);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
        iotcon_list_destroy(list_temp);
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 
 }
 
 /**
- * @testcase      utc_iotcon_state_add_list_p
+ * @testcase      utc_iotcon_attributes_add_list_p
  * @since_tizen   3.0
- * @description   Test adding list value to state.
+ * @description   Test adding list value to attributes.
  */
-int utc_iotcon_state_add_list_p(void)
+int utc_iotcon_attributes_add_list_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        iotcon_list_h list_temp = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_list(NULL, "key", list_temp);
+               ret = iotcon_attributes_add_list(NULL, "key", list_temp);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_state_n
+ * @testcase      utc_iotcon_attributes_add_attributes_n
  * @since_tizen   3.0
- * @description   Test fail adding state value to state with invalid parameter.
+ * @description   Test fail adding attributes value to attributes with invalid parameter.
  */
-int utc_iotcon_state_add_state_n(void)
+int utc_iotcon_attributes_add_attributes_n(void)
 {
        int ret;
-       iotcon_state_h state;
-       iotcon_state_h state_temp;
+       iotcon_attributes_h attributes;
+       iotcon_attributes_h attributes_temp;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_state(NULL, "key", state_temp);
+               ret = iotcon_attributes_add_attributes(NULL, "key", attributes_temp);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = _representation_create_state(&state_temp);
+       ret = _representation_create_attributes(&attributes_temp);
        if (0 != ret) {
-               ICUTC_ERR("_representation_create_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("_representation_create_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_state(NULL, "key", state_temp);
+       ret = iotcon_attributes_add_attributes(NULL, "key", attributes_temp);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_state() Fail(%d)", ret);
-               iotcon_state_destroy(state_temp);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes_temp);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_state(state, NULL, state_temp);
+       ret = iotcon_attributes_add_attributes(attributes, NULL, attributes_temp);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_state() Fail(%d)", ret);
-               iotcon_state_destroy(state_temp);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes_temp);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_state(state, "key", NULL);
+       ret = iotcon_attributes_add_attributes(attributes, "key", NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_state() Fail(%d)", ret);
-               iotcon_state_destroy(state_temp);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes_temp);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state_temp);
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes_temp);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_state_p
+ * @testcase      utc_iotcon_attributes_add_attributes_p
  * @since_tizen   3.0
- * @description   Test adding state value to state.
+ * @description   Test adding attributes value to attributes.
  */
-int utc_iotcon_state_add_state_p(void)
+int utc_iotcon_attributes_add_attributes_p(void)
 {
        int ret;
-       iotcon_state_h state;
-       iotcon_state_h state_temp = NULL;
+       iotcon_attributes_h attributes;
+       iotcon_attributes_h attributes_temp = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_state(NULL, "key", state_temp);
+               ret = iotcon_attributes_add_attributes(NULL, "key", attributes_temp);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_null_n
+ * @testcase      utc_iotcon_attributes_add_null_n
  * @since_tizen   3.0
- * @description   Test fail adding null value to state with invalid parameter.
+ * @description   Test fail adding null value to attributes with invalid parameter.
  */
-int utc_iotcon_state_add_null_n(void)
+int utc_iotcon_attributes_add_null_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_null(NULL, "key");
+               ret = iotcon_attributes_add_null(NULL, "key");
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_add_null(NULL, "key");
+       ret = iotcon_attributes_add_null(NULL, "key");
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_null() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_null() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_add_null(state, NULL);
+       ret = iotcon_attributes_add_null(attributes, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_add_null() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_add_null() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_add_null_p
+ * @testcase      utc_iotcon_attributes_add_null_p
  * @since_tizen   3.0
- * @description   Test adding null value to state.
+ * @description   Test adding null value to attributes.
  */
-int utc_iotcon_state_add_null_p(void)
+int utc_iotcon_attributes_add_null_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_add_null(NULL, "key");
+               ret = iotcon_attributes_add_null(NULL, "key");
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_int_n
+ * @testcase      utc_iotcon_attributes_get_int_n
  * @since_tizen   3.0
- * @description   Test fail getting integer value from state with invalid parameter.
+ * @description   Test fail getting integer value from attributes with invalid parameter.
  */
-int utc_iotcon_state_get_int_n(void)
+int utc_iotcon_attributes_get_int_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        int value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_int(NULL, REPRESENTATION_STATE_KEY_INT, &value);
+               ret = iotcon_attributes_get_int(NULL, REPRESENTATION_ATTRIBUTES_KEY_INT, &value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_int(NULL, REPRESENTATION_STATE_KEY_INT, &value);
+       ret = iotcon_attributes_get_int(NULL, REPRESENTATION_ATTRIBUTES_KEY_INT, &value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_int() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_int() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_int(state, NULL, &value);
+       ret = iotcon_attributes_get_int(attributes, NULL, &value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_int() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_int() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_int(state, REPRESENTATION_STATE_KEY_INT, NULL);
+       ret = iotcon_attributes_get_int(attributes, REPRESENTATION_ATTRIBUTES_KEY_INT, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_int() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_int() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_int_p
+ * @testcase      utc_iotcon_attributes_get_int_p
  * @since_tizen   3.0
- * @description   Test getting integer value from state.
+ * @description   Test getting integer value from attributes.
  */
-int utc_iotcon_state_get_int_p(void)
+int utc_iotcon_attributes_get_int_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        int value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_int(NULL, REPRESENTATION_STATE_KEY_INT, &value);
+               ret = iotcon_attributes_get_int(NULL, REPRESENTATION_ATTRIBUTES_KEY_INT, &value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_int(state, REPRESENTATION_STATE_KEY_INT, &value);
+       ret = iotcon_attributes_get_int(attributes, REPRESENTATION_ATTRIBUTES_KEY_INT, &value);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_get_int() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_int() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_bool_n
+ * @testcase      utc_iotcon_attributes_get_bool_n
  * @since_tizen   3.0
- * @description   Test fail getting boolean value from state with invalid parameter.
+ * @description   Test fail getting boolean value from attributes with invalid parameter.
  */
-int utc_iotcon_state_get_bool_n(void)
+int utc_iotcon_attributes_get_bool_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        bool value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_bool(NULL, REPRESENTATION_STATE_KEY_BOOL, &value);
+               ret = iotcon_attributes_get_bool(NULL, REPRESENTATION_ATTRIBUTES_KEY_BOOL, &value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_bool(NULL, REPRESENTATION_STATE_KEY_BOOL, &value);
+       ret = iotcon_attributes_get_bool(NULL, REPRESENTATION_ATTRIBUTES_KEY_BOOL, &value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_bool() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_bool() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_bool(state, NULL, &value);
+       ret = iotcon_attributes_get_bool(attributes, NULL, &value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_bool() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_bool() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_bool(state, REPRESENTATION_STATE_KEY_BOOL, NULL);
+       ret = iotcon_attributes_get_bool(attributes, REPRESENTATION_ATTRIBUTES_KEY_BOOL, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_bool() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_bool() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 
 }
 
 /**
- * @testcase      utc_iotcon_state_get_bool_p
+ * @testcase      utc_iotcon_attributes_get_bool_p
  * @since_tizen   3.0
- * @description   Test getting boolean value from state
+ * @description   Test getting boolean value from attributes
  */
-int utc_iotcon_state_get_bool_p(void)
+int utc_iotcon_attributes_get_bool_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        bool value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_bool(NULL, REPRESENTATION_STATE_KEY_BOOL, &value);
+               ret = iotcon_attributes_get_bool(NULL, REPRESENTATION_ATTRIBUTES_KEY_BOOL, &value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_bool(state, REPRESENTATION_STATE_KEY_BOOL, &value);
+       ret = iotcon_attributes_get_bool(attributes, REPRESENTATION_ATTRIBUTES_KEY_BOOL, &value);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_get_bool() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_bool() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 
 }
 
 /**
- * @testcase      utc_iotcon_state_get_double_n
+ * @testcase      utc_iotcon_attributes_get_double_n
  * @since_tizen   3.0
- * @description   Test fail getting double value from state with invalid parameter.
+ * @description   Test fail getting double value from attributes with invalid parameter.
  */
-int utc_iotcon_state_get_double_n(void)
+int utc_iotcon_attributes_get_double_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        double value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_double(NULL, REPRESENTATION_STATE_KEY_DOUBLE, &value);
+               ret = iotcon_attributes_get_double(NULL, REPRESENTATION_ATTRIBUTES_KEY_DOUBLE, &value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_double(NULL, REPRESENTATION_STATE_KEY_DOUBLE, &value);
+       ret = iotcon_attributes_get_double(NULL, REPRESENTATION_ATTRIBUTES_KEY_DOUBLE, &value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_double() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_double() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_double(state, NULL, &value);
+       ret = iotcon_attributes_get_double(attributes, NULL, &value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_double() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_double() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_double(state, REPRESENTATION_STATE_KEY_DOUBLE, NULL);
+       ret = iotcon_attributes_get_double(attributes, REPRESENTATION_ATTRIBUTES_KEY_DOUBLE, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_double() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_double() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 
 /**
- * @testcase      utc_iotcon_state_get_double_p
+ * @testcase      utc_iotcon_attributes_get_double_p
  * @since_tizen   3.0
- * @description   Test getting double value from state.
+ * @description   Test getting double value from attributes.
  */
-int utc_iotcon_state_get_double_p(void)
+int utc_iotcon_attributes_get_double_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        double value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_double(NULL, REPRESENTATION_STATE_KEY_DOUBLE, &value);
+               ret = iotcon_attributes_get_double(NULL, REPRESENTATION_ATTRIBUTES_KEY_DOUBLE, &value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_double(state, REPRESENTATION_STATE_KEY_DOUBLE, &value);
+       ret = iotcon_attributes_get_double(attributes, REPRESENTATION_ATTRIBUTES_KEY_DOUBLE, &value);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_get_double() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_double() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 
 }
 
 /**
- * @testcase      utc_iotcon_state_get_str_n
+ * @testcase      utc_iotcon_attributes_get_str_n
  * @since_tizen   3.0
- * @description   Test fail getting string value from state with invalid parameter.
+ * @description   Test fail getting string value from attributes with invalid parameter.
  */
-int utc_iotcon_state_get_str_n(void)
+int utc_iotcon_attributes_get_str_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        char *value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_str(NULL, REPRESENTATION_STATE_KEY_STR, &value);
+               ret = iotcon_attributes_get_str(NULL, REPRESENTATION_ATTRIBUTES_KEY_STR, &value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_str(NULL, REPRESENTATION_STATE_KEY_STR, &value);
+       ret = iotcon_attributes_get_str(NULL, REPRESENTATION_ATTRIBUTES_KEY_STR, &value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_str(state, NULL, &value);
+       ret = iotcon_attributes_get_str(attributes, NULL, &value);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_str(state, REPRESENTATION_STATE_KEY_STR, NULL);
+       ret = iotcon_attributes_get_str(attributes, REPRESENTATION_ATTRIBUTES_KEY_STR, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_str_p
+ * @testcase      utc_iotcon_attributes_get_str_p
  * @since_tizen   3.0
- * @description   Test getting string value from state.
+ * @description   Test getting string value from attributes.
  */
-int utc_iotcon_state_get_str_p(void)
+int utc_iotcon_attributes_get_str_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        char *value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_str(NULL, REPRESENTATION_STATE_KEY_STR, &value);
+               ret = iotcon_attributes_get_str(NULL, REPRESENTATION_ATTRIBUTES_KEY_STR, &value);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_str(state, REPRESENTATION_STATE_KEY_STR, &value);
+       ret = iotcon_attributes_get_str(attributes, REPRESENTATION_ATTRIBUTES_KEY_STR, &value);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_get_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_byte_str_n
+ * @testcase      utc_iotcon_attributes_get_byte_str_n
  * @since_tizen   3.0
- * @description   Test fail getting byte string value from state with invalid parameter.
+ * @description   Test fail getting byte string value from attributes with invalid parameter.
  */
-int utc_iotcon_state_get_byte_str_n(void)
+int utc_iotcon_attributes_get_byte_str_n(void)
 {
        int ret;
        int len;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        unsigned char *value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_byte_str(NULL, REPRESENTATION_STATE_KEY_BYTE_STR, &value, &len);
+               ret = iotcon_attributes_get_byte_str(NULL, REPRESENTATION_ATTRIBUTES_KEY_BYTE_STR, &value, &len);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_byte_str(NULL, REPRESENTATION_STATE_KEY_BYTE_STR, &value, &len);
+       ret = iotcon_attributes_get_byte_str(NULL, REPRESENTATION_ATTRIBUTES_KEY_BYTE_STR, &value, &len);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_byte_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_byte_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_byte_str(state, NULL, &value, &len);
+       ret = iotcon_attributes_get_byte_str(attributes, NULL, &value, &len);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_byte_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_byte_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_byte_str(state, REPRESENTATION_STATE_KEY_BYTE_STR, NULL, &len);
+       ret = iotcon_attributes_get_byte_str(attributes, REPRESENTATION_ATTRIBUTES_KEY_BYTE_STR, NULL, &len);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_byte_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_byte_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_byte_str(state, REPRESENTATION_STATE_KEY_BYTE_STR, &value, NULL);
+       ret = iotcon_attributes_get_byte_str(attributes, REPRESENTATION_ATTRIBUTES_KEY_BYTE_STR, &value, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_byte_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_byte_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_byte_str_p
+ * @testcase      utc_iotcon_attributes_get_byte_str_p
  * @since_tizen   3.0
- * @description   Test getting byte string value from state.
+ * @description   Test getting byte string value from attributes.
  */
-int utc_iotcon_state_get_byte_str_p(void)
+int utc_iotcon_attributes_get_byte_str_p(void)
 {
        int ret;
        int len;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        unsigned char *value;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_byte_str(NULL, REPRESENTATION_STATE_KEY_BYTE_STR, &value, &len);
+               ret = iotcon_attributes_get_byte_str(NULL, REPRESENTATION_ATTRIBUTES_KEY_BYTE_STR, &value, &len);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_byte_str(state, REPRESENTATION_STATE_KEY_BYTE_STR, &value, &len);
+       ret = iotcon_attributes_get_byte_str(attributes, REPRESENTATION_ATTRIBUTES_KEY_BYTE_STR, &value, &len);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_get_byte_str() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_byte_str() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 
 /**
- * @testcase      utc_iotcon_state_get_list_n
+ * @testcase      utc_iotcon_attributes_get_list_n
  * @since_tizen   3.0
- * @description   Test fail getting list value from state with invalid parameter.
+ * @description   Test fail getting list value from attributes with invalid parameter.
  */
-int utc_iotcon_state_get_list_n(void)
+int utc_iotcon_attributes_get_list_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        iotcon_list_h list_temp;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_list(NULL, REPRESENTATION_STATE_KEY_LIST, &list_temp);
+               ret = iotcon_attributes_get_list(NULL, REPRESENTATION_ATTRIBUTES_KEY_LIST, &list_temp);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_list(NULL, REPRESENTATION_STATE_KEY_LIST, &list_temp);
+       ret = iotcon_attributes_get_list(NULL, REPRESENTATION_ATTRIBUTES_KEY_LIST, &list_temp);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_list() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_list() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_list(state, NULL, &list_temp);
+       ret = iotcon_attributes_get_list(attributes, NULL, &list_temp);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_list() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_list() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_list(state, REPRESENTATION_STATE_KEY_LIST, NULL);
+       ret = iotcon_attributes_get_list(attributes, REPRESENTATION_ATTRIBUTES_KEY_LIST, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_list() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_list() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 
 }
 
 /**
- * @testcase      utc_iotcon_state_get_list_p
+ * @testcase      utc_iotcon_attributes_get_list_p
  * @since_tizen   3.0
- * @description   Test getting list value from state.
+ * @description   Test getting list value from attributes.
  */
-int utc_iotcon_state_get_list_p(void)
+int utc_iotcon_attributes_get_list_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        iotcon_list_h list_temp;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_list(NULL, REPRESENTATION_STATE_KEY_LIST, &list_temp);
+               ret = iotcon_attributes_get_list(NULL, REPRESENTATION_ATTRIBUTES_KEY_LIST, &list_temp);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_list(state, REPRESENTATION_STATE_KEY_LIST, &list_temp);
+       ret = iotcon_attributes_get_list(attributes, REPRESENTATION_ATTRIBUTES_KEY_LIST, &list_temp);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_get_list() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_list() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_state_n
+ * @testcase      utc_iotcon_attributes_get_attributes_n
  * @since_tizen   3.0
- * @description   Test fail getting state value from state with invalid parameter.
+ * @description   Test fail getting attributes value from attributes with invalid parameter.
  */
-int utc_iotcon_state_get_state_n(void)
+int utc_iotcon_attributes_get_attributes_n(void)
 {
        int ret;
-       iotcon_state_h state;
-       iotcon_state_h state_temp;
+       iotcon_attributes_h attributes;
+       iotcon_attributes_h attributes_temp;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_state(NULL, REPRESENTATION_STATE_KEY_STATE, &state_temp);
+               ret = iotcon_attributes_get_attributes(NULL, REPRESENTATION_ATTRIBUTES_KEY_ATTRIBUTES, &attributes_temp);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_state(NULL, REPRESENTATION_STATE_KEY_STATE, &state_temp);
+       ret = iotcon_attributes_get_attributes(NULL, REPRESENTATION_ATTRIBUTES_KEY_ATTRIBUTES, &attributes_temp);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_state(state, NULL, &state_temp);
+       ret = iotcon_attributes_get_attributes(attributes, NULL, &attributes_temp);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_state(state, REPRESENTATION_STATE_KEY_STATE, NULL);
+       ret = iotcon_attributes_get_attributes(attributes, REPRESENTATION_ATTRIBUTES_KEY_ATTRIBUTES, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 
 }
 
 /**
- * @testcase      utc_iotcon_state_get_state_p
+ * @testcase      utc_iotcon_attributes_get_attributes_p
  * @since_tizen   3.0
- * @description   Test getting state value from state.
+ * @description   Test getting attributes value from attributes.
  */
-int utc_iotcon_state_get_state_p(void)
+int utc_iotcon_attributes_get_attributes_p(void)
 {
        int ret;
-       iotcon_state_h state;
-       iotcon_state_h state_temp;
+       iotcon_attributes_h attributes;
+       iotcon_attributes_h attributes_temp;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_state(NULL, REPRESENTATION_STATE_KEY_STATE, &state_temp);
+               ret = iotcon_attributes_get_attributes(NULL, REPRESENTATION_ATTRIBUTES_KEY_ATTRIBUTES, &attributes_temp);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_state(state, REPRESENTATION_STATE_KEY_STATE, &state_temp);
+       ret = iotcon_attributes_get_attributes(attributes, REPRESENTATION_ATTRIBUTES_KEY_ATTRIBUTES, &attributes_temp);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_get_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_is_null_n
+ * @testcase      utc_iotcon_attributes_is_null_n
  * @since_tizen   3.0
- * @description   Test fail getting value is null from state with invalid parameter.
+ * @description   Test fail getting value is null from attributes with invalid parameter.
  */
-int utc_iotcon_state_is_null_n(void)
+int utc_iotcon_attributes_is_null_n(void)
 {
        bool is_null;
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_is_null(NULL, REPRESENTATION_STATE_KEY_NULL, &is_null);
+               ret = iotcon_attributes_is_null(NULL, REPRESENTATION_ATTRIBUTES_KEY_NULL, &is_null);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_is_null(NULL, REPRESENTATION_STATE_KEY_NULL, &is_null);
+       ret = iotcon_attributes_is_null(NULL, REPRESENTATION_ATTRIBUTES_KEY_NULL, &is_null);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_is_null() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_is_null() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_is_null(state, NULL, &is_null);
+       ret = iotcon_attributes_is_null(attributes, NULL, &is_null);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_is_null() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_is_null() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_is_null(state, REPRESENTATION_STATE_KEY_NULL, NULL);
+       ret = iotcon_attributes_is_null(attributes, REPRESENTATION_ATTRIBUTES_KEY_NULL, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_is_null() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_is_null() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_is_null_p
+ * @testcase      utc_iotcon_attributes_is_null_p
  * @since_tizen   3.0
- * @description   Test getting value is null from state.
+ * @description   Test getting value is null from attributes.
  */
-int utc_iotcon_state_is_null_p(void)
+int utc_iotcon_attributes_is_null_p(void)
 {
        bool is_null;
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_is_null(NULL, REPRESENTATION_STATE_KEY_NULL, &is_null);
+               ret = iotcon_attributes_is_null(NULL, REPRESENTATION_ATTRIBUTES_KEY_NULL, &is_null);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_is_null(state, REPRESENTATION_STATE_KEY_NULL, &is_null);
+       ret = iotcon_attributes_is_null(attributes, REPRESENTATION_ATTRIBUTES_KEY_NULL, &is_null);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_is_null() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_is_null() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        ICUTC_ASSERT_EQ(is_null, true);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_remove_n
+ * @testcase      utc_iotcon_attributes_remove_n
  * @since_tizen   3.0
- * @description   Test fail removing a value from state with invalid parameter.
+ * @description   Test fail removing a value from attributes with invalid parameter.
  */
-int utc_iotcon_state_remove_n(void)
+int utc_iotcon_attributes_remove_n(void)
 {
        int i;
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        const char *keys[] = {
-               REPRESENTATION_STATE_KEY_BOOL,
-               REPRESENTATION_STATE_KEY_INT,
-               REPRESENTATION_STATE_KEY_DOUBLE,
-               REPRESENTATION_STATE_KEY_STR,
-               REPRESENTATION_STATE_KEY_STATE,
-               REPRESENTATION_STATE_KEY_LIST,
+               REPRESENTATION_ATTRIBUTES_KEY_BOOL,
+               REPRESENTATION_ATTRIBUTES_KEY_INT,
+               REPRESENTATION_ATTRIBUTES_KEY_DOUBLE,
+               REPRESENTATION_ATTRIBUTES_KEY_STR,
+               REPRESENTATION_ATTRIBUTES_KEY_ATTRIBUTES,
+               REPRESENTATION_ATTRIBUTES_KEY_LIST,
        };
 
        if (false == g_feature) {
-               ret = iotcon_state_remove(state, NULL);
+               ret = iotcon_attributes_remove(attributes, NULL);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_remove(state, NULL);
+       ret = iotcon_attributes_remove(attributes, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_remove() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_remove() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
        for (i = 0; i < sizeof(keys)/sizeof(char *); i++) {
-               ret = iotcon_state_remove(NULL, keys[i]);
+               ret = iotcon_attributes_remove(NULL, keys[i]);
                if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-                       ICUTC_ERR("iotcon_state_remove(%s) Fail(%d)", keys[i], ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_remove(%s) Fail(%d)", keys[i], ret);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_remove_p
+ * @testcase      utc_iotcon_attributes_remove_p
  * @since_tizen   3.0
- * @description   Test removing a value from state.
+ * @description   Test removing a value from attributes.
  */
-int utc_iotcon_state_remove_p(void)
+int utc_iotcon_attributes_remove_p(void)
 {
        int i;
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        const char *keys[] = {
-               REPRESENTATION_STATE_KEY_BOOL,
-               REPRESENTATION_STATE_KEY_INT,
-               REPRESENTATION_STATE_KEY_DOUBLE,
-               REPRESENTATION_STATE_KEY_STR,
-               REPRESENTATION_STATE_KEY_STATE,
-               REPRESENTATION_STATE_KEY_LIST,
+               REPRESENTATION_ATTRIBUTES_KEY_BOOL,
+               REPRESENTATION_ATTRIBUTES_KEY_INT,
+               REPRESENTATION_ATTRIBUTES_KEY_DOUBLE,
+               REPRESENTATION_ATTRIBUTES_KEY_STR,
+               REPRESENTATION_ATTRIBUTES_KEY_ATTRIBUTES,
+               REPRESENTATION_ATTRIBUTES_KEY_LIST,
        };
 
        if (false == g_feature) {
-               ret = iotcon_state_remove(state, NULL);
+               ret = iotcon_attributes_remove(attributes, NULL);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
        for (i = 0; i < sizeof(keys)/sizeof(char *); i++) {
-               ret = iotcon_state_remove(state, keys[i]);
+               ret = iotcon_attributes_remove(attributes, keys[i]);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_state_remove(%s) Fail(%d)", keys[i], ret);
-                       iotcon_state_destroy(state);
+                       ICUTC_ERR("iotcon_attributes_remove(%s) Fail(%d)", keys[i], ret);
+                       iotcon_attributes_destroy(attributes);
                        return 1;
                }
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_type_n
+ * @testcase      utc_iotcon_attributes_get_type_n
  * @since_tizen   3.0
- * @description   Test fail getting value type from state with invalid parameter.
+ * @description   Test fail getting value type from attributes with invalid parameter.
  */
-int utc_iotcon_state_get_type_n(void)
+int utc_iotcon_attributes_get_type_n(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        iotcon_type_e type;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_type(NULL, REPRESENTATION_STATE_KEY_INT, &type);
+               ret = iotcon_attributes_get_type(NULL, REPRESENTATION_ATTRIBUTES_KEY_INT, &type);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_type(NULL, REPRESENTATION_STATE_KEY_INT, &type);
+       ret = iotcon_attributes_get_type(NULL, REPRESENTATION_ATTRIBUTES_KEY_INT, &type);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_type() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_type() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_type(state, NULL, &type);
+       ret = iotcon_attributes_get_type(attributes, NULL, &type);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_type() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_type() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_type(state, REPRESENTATION_STATE_KEY_INT, NULL);
+       ret = iotcon_attributes_get_type(attributes, REPRESENTATION_ATTRIBUTES_KEY_INT, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_type() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_type() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 
 }
 
 /**
- * @testcase      utc_iotcon_state_get_type_p
+ * @testcase      utc_iotcon_attributes_get_type_p
  * @since_tizen   3.0
- * @description   Test getting value type from state.
+ * @description   Test getting value type from attributes.
  */
-int utc_iotcon_state_get_type_p(void)
+int utc_iotcon_attributes_get_type_p(void)
 {
        int ret;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
        iotcon_type_e type;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_type(NULL, REPRESENTATION_STATE_KEY_INT, &type);
+               ret = iotcon_attributes_get_type(NULL, REPRESENTATION_ATTRIBUTES_KEY_INT, &type);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_type(state, REPRESENTATION_STATE_KEY_INT, &type);
+       ret = iotcon_attributes_get_type(attributes, REPRESENTATION_ATTRIBUTES_KEY_INT, &type);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_get_type() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_type() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        ICUTC_ASSERT_EQ(type, IOTCON_TYPE_INT);
 
        return 0;
@@ -3370,150 +3370,150 @@ int utc_iotcon_representation_get_nth_child_p(void)
        return 0;
 }
 
-bool _representation_state_cb(iotcon_state_h state, const char *key, void *user_data)
+bool _representation_attributes_cb(iotcon_attributes_h attributes, const char *key, void *user_data)
 {
        ++(*((int *)user_data));
        return IOTCON_FUNC_CONTINUE;
 }
 
 /**
- * @testcase      utc_iotcon_state_foreach_n
+ * @testcase      utc_iotcon_attributes_foreach_n
  * @since_tizen   3.0
- * @description   Test fail iterating keys from state with invalid parameter.
+ * @description   Test fail iterating keys from attributes with invalid parameter.
  */
-int utc_iotcon_state_foreach_n(void)
+int utc_iotcon_attributes_foreach_n(void)
 {
        int ret;
        int count = 0;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_foreach(NULL, _representation_state_cb, &count);
+               ret = iotcon_attributes_foreach(NULL, _representation_attributes_cb, &count);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_foreach(NULL, _representation_state_cb, &count);
+       ret = iotcon_attributes_foreach(NULL, _representation_attributes_cb, &count);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_foreach() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_foreach() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_foreach(state, NULL, &count);
+       ret = iotcon_attributes_foreach(attributes, NULL, &count);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_foreach() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_foreach() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_foreach_p
+ * @testcase      utc_iotcon_attributes_foreach_p
  * @since_tizen   3.0
- * @description   Test iterating keys from state.
+ * @description   Test iterating keys from attributes.
  */
-int utc_iotcon_state_foreach_p(void)
+int utc_iotcon_attributes_foreach_p(void)
 {
        int ret;
        int count = 0;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_foreach(NULL, _representation_state_cb, &count);
+               ret = iotcon_attributes_foreach(NULL, _representation_attributes_cb, &count);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_foreach(state, _representation_state_cb, &count);
+       ret = iotcon_attributes_foreach(attributes, _representation_attributes_cb, &count);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_foreach() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_foreach() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        ICUTC_ASSERT_NEQ(count, 0);
 
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_keys_count_n
+ * @testcase      utc_iotcon_attributes_get_keys_count_n
  * @since_tizen   3.0
- * @description   Test fail getting keys count from state with invalid parameter.
+ * @description   Test fail getting keys count from attributes with invalid parameter.
  */
-int utc_iotcon_state_get_keys_count_n(void)
+int utc_iotcon_attributes_get_keys_count_n(void)
 {
        int ret;
        unsigned int count = 0;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_keys_count(NULL, &count);
+               ret = iotcon_attributes_get_keys_count(NULL, &count);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_keys_count(NULL, &count);
+       ret = iotcon_attributes_get_keys_count(NULL, &count);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_keys_count() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_keys_count() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       ret = iotcon_state_get_keys_count(state, NULL);
+       ret = iotcon_attributes_get_keys_count(attributes, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_state_get_keys_count() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_keys_count() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_state_get_keys_count_p
+ * @testcase      utc_iotcon_attributes_get_keys_count_p
  * @since_tizen   3.0
- * @description   Test getting keys count from state.
+ * @description   Test getting keys count from attributes.
  */
-int utc_iotcon_state_get_keys_count_p(void)
+int utc_iotcon_attributes_get_keys_count_p(void)
 {
        int ret;
        unsigned int count = 0;
-       iotcon_state_h state;
+       iotcon_attributes_h attributes;
 
        if (false == g_feature) {
-               ret = iotcon_state_get_keys_count(NULL, &count);
+               ret = iotcon_attributes_get_keys_count(NULL, &count);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_state(&state);
+       ret = _representation_create_attributes(&attributes);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_get_keys_count(state, &count);
+       ret = iotcon_attributes_get_keys_count(attributes, &count);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_get_keys_count() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_attributes_get_keys_count() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        return 0;
 }
 
@@ -3538,10 +3538,10 @@ int utc_iotcon_list_create_n(void)
        ret = iotcon_list_create(IOTCON_TYPE_NONE, &list);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_TYPE);
 
-       ret = iotcon_list_create(IOTCON_TYPE_STATE+1, &list);
+       ret = iotcon_list_create(IOTCON_TYPE_ATTRIBUTES+1, &list);
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_TYPE);
 
-       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_STATE; i++) {
+       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_ATTRIBUTES; i++) {
                ret = iotcon_list_create(i, NULL);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_INVALID_PARAMETER);
        }
@@ -3565,7 +3565,7 @@ int utc_iotcon_list_create_p(void)
                return 0;
        }
 
-       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_STATE; i++) {
+       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_ATTRIBUTES; i++) {
                ret = iotcon_list_create(i, &list);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
                iotcon_list_destroy(list);
@@ -3606,7 +3606,7 @@ int utc_iotcon_list_destroy_p(void)
                return 0;
        }
 
-       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_STATE; i++) {
+       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_ATTRIBUTES; i++) {
                ret = iotcon_list_create(i, &list);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
                iotcon_list_destroy(list);
@@ -3973,70 +3973,70 @@ int utc_iotcon_list_add_list_p(void)
 }
 
 /**
- * @testcase      utc_iotcon_list_add_state_n
+ * @testcase      utc_iotcon_list_add_attributes_n
  * @since_tizen   3.0
- * @description   Test fail adding state value to list with invalid parameter.
+ * @description   Test fail adding attributes value to list with invalid parameter.
  */
-int utc_iotcon_list_add_state_n(void)
+int utc_iotcon_list_add_attributes_n(void)
 {
        int ret;
        iotcon_list_h list = NULL;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_list_add_state(list, NULL, -1);
+               ret = iotcon_list_add_attributes(list, NULL, -1);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_list_state(&list);
+       ret = _representation_create_list_attributes(&list);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_state_create(&state);
+       ret = iotcon_attributes_create(&attributes);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_state_create() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_attributes_create() Fail(%d)", ret);
                iotcon_list_destroy(list);
                return 1;
        }
 
-       ret = iotcon_list_add_state(list, NULL, -1);
+       ret = iotcon_list_add_attributes(list, NULL, -1);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_list_add_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_list_add_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                iotcon_list_destroy(list);
                return 1;
        }
 
-       ret = iotcon_list_add_state(NULL, state, -1);
+       ret = iotcon_list_add_attributes(NULL, attributes, -1);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_list_add_state() Fail(%d)", ret);
-               iotcon_state_destroy(state);
+               ICUTC_ERR("iotcon_list_add_attributes() Fail(%d)", ret);
+               iotcon_attributes_destroy(attributes);
                iotcon_list_destroy(list);
                return 1;
        }
 
-       iotcon_state_destroy(state);
+       iotcon_attributes_destroy(attributes);
        iotcon_list_destroy(list);
        return 0;
 }
 
 /**
- * @testcase      utc_iotcon_list_add_state_p
+ * @testcase      utc_iotcon_list_add_attributes_p
  * @since_tizen   3.0
- * @description   Test adding state value to list.
+ * @description   Test adding attributes value to list.
  */
-int utc_iotcon_list_add_state_p(void)
+int utc_iotcon_list_add_attributes_p(void)
 {
        int ret;
        iotcon_list_h list = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_list_add_state(list, NULL, -1);
+               ret = iotcon_list_add_attributes(list, NULL, -1);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_list_state(&list);
+       ret = _representation_create_list_attributes(&list);
        ICUTC_ASSERT_EQ(ret, 0);
 
        iotcon_list_destroy(list);
@@ -4572,49 +4572,49 @@ int utc_iotcon_list_get_nth_list_p(void)
 }
 
 /**
- * @testcase      utc_iotcon_list_get_nth_state_n
+ * @testcase      utc_iotcon_list_get_nth_attributes_n
  * @since_tizen   3.0
- * @description   Test fail getting nth state value from list with invalid parameter.
+ * @description   Test fail getting nth attributes value from list with invalid parameter.
  */
-int utc_iotcon_list_get_nth_state_n(void)
+int utc_iotcon_list_get_nth_attributes_n(void)
 {
        int ret;
        iotcon_list_h list = NULL;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_list_get_nth_state(list, -1, &state);
+               ret = iotcon_list_get_nth_attributes(list, -1, &attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_list_state(&list);
+       ret = _representation_create_list_attributes(&list);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_list_get_nth_state(list, -1, &state);
+       ret = iotcon_list_get_nth_attributes(list, -1, &attributes);
        if (IOTCON_ERROR_NO_DATA != ret) {
-               ICUTC_ERR("iotcon_list_get_nth_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_list_get_nth_attributes() Fail(%d)", ret);
                iotcon_list_destroy(list);
                return 1;
        }
 
-       ret = iotcon_list_get_nth_state(list, REPRESENTATION_LIST_COUNT, &state);
+       ret = iotcon_list_get_nth_attributes(list, REPRESENTATION_LIST_COUNT, &attributes);
        if (IOTCON_ERROR_NO_DATA != ret) {
-               ICUTC_ERR("iotcon_list_get_nth_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_list_get_nth_attributes() Fail(%d)", ret);
                iotcon_list_destroy(list);
                return 1;
        }
 
-       ret = iotcon_list_get_nth_state(NULL, 0, &state);
+       ret = iotcon_list_get_nth_attributes(NULL, 0, &attributes);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_list_get_nth_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_list_get_nth_attributes() Fail(%d)", ret);
                iotcon_list_destroy(list);
                return 1;
        }
 
-       ret = iotcon_list_get_nth_state(list, 0, NULL);
+       ret = iotcon_list_get_nth_attributes(list, 0, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_list_get_nth_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_list_get_nth_attributes() Fail(%d)", ret);
                iotcon_list_destroy(list);
                return 1;
        }
@@ -4625,30 +4625,30 @@ int utc_iotcon_list_get_nth_state_n(void)
 
 
 /**
- * @testcase      utc_iotcon_list_get_nth_state_p
+ * @testcase      utc_iotcon_list_get_nth_attributes_p
  * @since_tizen   3.0
- * @description   Test getting nth state value from list.
+ * @description   Test getting nth attributes value from list.
  */
-int utc_iotcon_list_get_nth_state_p(void)
+int utc_iotcon_list_get_nth_attributes_p(void)
 {
        int i;
        int ret;
        iotcon_list_h list = NULL;
-       iotcon_state_h state = NULL;
+       iotcon_attributes_h attributes = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_list_get_nth_state(list, -1, &state);
+               ret = iotcon_list_get_nth_attributes(list, -1, &attributes);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_list_state(&list);
+       ret = _representation_create_list_attributes(&list);
        ICUTC_ASSERT_EQ(ret, 0);
 
        for (i = 0; i < REPRESENTATION_LIST_COUNT; i++) {
-               ret = iotcon_list_get_nth_state(list, i, &state);
+               ret = iotcon_list_get_nth_attributes(list, i, &attributes);
                if (IOTCON_ERROR_NONE != ret) {
-                       ICUTC_ERR("iotcon_list_get_nth_state() Fail(%d)", ret);
+                       ICUTC_ERR("iotcon_list_get_nth_attributes() Fail(%d)", ret);
                        iotcon_list_destroy(list);
                        return 1;
                }
@@ -4779,7 +4779,7 @@ int utc_iotcon_list_get_type_n(void)
                return 1;
        }
 
-       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_STATE; i++) {
+       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_ATTRIBUTES; i++) {
                ret = iotcon_list_create(i, &list);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
@@ -4813,7 +4813,7 @@ int utc_iotcon_list_get_type_p(void)
                return 0;
        }
 
-       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_STATE; i++) {
+       for (i = IOTCON_TYPE_INT; i <= IOTCON_TYPE_ATTRIBUTES; i++) {
                ret = iotcon_list_create(i, &list);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
@@ -5447,7 +5447,7 @@ int utc_iotcon_list_foreach_list_p(void)
 
 }
 
-static bool _representation_list_state_cb(int pos, iotcon_state_h value,
+static bool _representation_list_attributes_cb(int pos, iotcon_attributes_h value,
                void *user_data)
 {
        (*((int *)user_data))++;
@@ -5455,34 +5455,34 @@ static bool _representation_list_state_cb(int pos, iotcon_state_h value,
 }
 
 /**
- * @testcase      utc_iotcon_list_foreach_state_n
+ * @testcase      utc_iotcon_list_foreach_attributes_n
  * @since_tizen   3.0
- * @description   Test fail iterating state value from list with invalid parameter.
+ * @description   Test fail iterating attributes value from list with invalid parameter.
  */
-int utc_iotcon_list_foreach_state_n(void)
+int utc_iotcon_list_foreach_attributes_n(void)
 {
        int ret;
        iotcon_list_h list = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_list_foreach_state(NULL, _representation_list_state_cb, NULL);
+               ret = iotcon_list_foreach_attributes(NULL, _representation_list_attributes_cb, NULL);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_list_state(&list);
+       ret = _representation_create_list_attributes(&list);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_list_foreach_state(NULL, _representation_list_state_cb, NULL);
+       ret = iotcon_list_foreach_attributes(NULL, _representation_list_attributes_cb, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_list_foreach_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_list_foreach_attributes() Fail(%d)", ret);
                iotcon_list_destroy(list);
                return 1;
        }
 
-       ret = iotcon_list_foreach_state(list, NULL, NULL);
+       ret = iotcon_list_foreach_attributes(list, NULL, NULL);
        if (IOTCON_ERROR_INVALID_PARAMETER != ret) {
-               ICUTC_ERR("iotcon_list_foreach_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_list_foreach_attributes() Fail(%d)", ret);
                iotcon_list_destroy(list);
                return 1;
        }
@@ -5492,9 +5492,9 @@ int utc_iotcon_list_foreach_state_n(void)
        ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NONE);
 
        /* list is NULL */
-       ret = iotcon_list_foreach_state(list, _representation_list_state_cb, NULL);
+       ret = iotcon_list_foreach_attributes(list, _representation_list_attributes_cb, NULL);
        if (IOTCON_ERROR_INVALID_TYPE != ret) {
-               ICUTC_ERR("iotcon_list_foreach_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_list_foreach_attributes() Fail(%d)", ret);
                iotcon_list_destroy(list);
                return 1;
        }
@@ -5504,28 +5504,28 @@ int utc_iotcon_list_foreach_state_n(void)
 }
 
 /**
- * @testcase      utc_iotcon_list_foreach_state_p
+ * @testcase      utc_iotcon_list_foreach_attributes_p
  * @since_tizen   3.0
- * @description   Test iterating state value from list.
+ * @description   Test iterating attributes value from list.
  */
-int utc_iotcon_list_foreach_state_p(void)
+int utc_iotcon_list_foreach_attributes_p(void)
 {
        int ret;
        int count = 0;
        iotcon_list_h list = NULL;
 
        if (false == g_feature) {
-               ret = iotcon_list_foreach_state(NULL, _representation_list_state_cb, NULL);
+               ret = iotcon_list_foreach_attributes(NULL, _representation_list_attributes_cb, NULL);
                ICUTC_ASSERT_EQ(ret, IOTCON_ERROR_NOT_SUPPORTED);
                return 0;
        }
 
-       ret = _representation_create_list_state(&list);
+       ret = _representation_create_list_attributes(&list);
        ICUTC_ASSERT_EQ(ret, 0);
 
-       ret = iotcon_list_foreach_state(list, _representation_list_state_cb, &count);
+       ret = iotcon_list_foreach_attributes(list, _representation_list_attributes_cb, &count);
        if (IOTCON_ERROR_NONE != ret) {
-               ICUTC_ERR("iotcon_list_foreach_state() Fail(%d)", ret);
+               ICUTC_ERR("iotcon_list_foreach_attributes() Fail(%d)", ret);
                iotcon_list_destroy(list);
                return 1;
        }