From 7669e2b14e070a48817137e6c8014ea1dedca4e5 Mon Sep 17 00:00:00 2001
From: "saerome.kim" <saerome.kim@samsung.com>
Date: Mon, 1 Oct 2018 12:04:33 +0900
Subject: [PATCH] dbus-policy : Simplify complex dbus config. rules.

Change-Id: I3a66cfd950cafa35e505526c61c052421b2136c8
Signed-off-by: saerome.kim <saerome.kim@samsung.com>
---
 haltest/common.h      |   2 +-
 packaging/zigbee.conf | 280 ++++++--------------------------------------------
 2 files changed, 31 insertions(+), 251 deletions(-)

diff --git a/haltest/common.h b/haltest/common.h
index e2707a7..3196c91 100644
--- a/haltest/common.h
+++ b/haltest/common.h
@@ -21,7 +21,7 @@
 #ifdef USE_DLOG
 #include <dlog.h>
 #undef LOG_TAG
-#define LOG_TAG "ZIGBEE_GTEST"
+#define LOG_TAG "ZIGBEE_HALTEST"
 #define GLOGD(format, args...)	LOGD(format, ##args)
 #else
 #define GLOGD(format, args...)
diff --git a/packaging/zigbee.conf b/packaging/zigbee.conf
index 1b7b821..479f7fd 100644
--- a/packaging/zigbee.conf
+++ b/packaging/zigbee.conf
@@ -8,359 +8,139 @@
 		<allow send_destination="org.tizen.zigbee.manager"/>
 	</policy>
 
-	<policy context="default">
-		<allow send_destination="org.tizen.zigbee.manager" send_interface="org.tizen.zigbee.manager"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_bind"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_alarm"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_basic"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_on_off"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_door_lock"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_group"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_fan_control"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_ias_zone"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_identify"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_level_control"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_poll_control"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_scene"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_thermostat"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.custom"/>
-		<allow send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"/>
+	<policy user="network_fw">
+		<allow own="org.tizen.zigbee"/>
+		<allow own="org.tizen.zigbee.manager"/>
+		<allow send_destination="org.tizen.zigbee"/>
+		<allow send_destination="org.tizen.zigbee.manager"/>
+	</policy>
 
+	<policy context="default">
+		<deny own="org.tizen.zigbee"/>
+		<deny own="org.tizen.zigbee.manager"/>
 		<!-- Manager -->
 		<check send_destination="org.tizen.zigbee.manager" send_interface="org.tizen.zigbee.manager"
-				send_member="enable" privilege="http://tizen.org/privilege/zigbee.admin"/>
-		<check send_destination="org.tizen.zigbee.manager" send_interface="org.tizen.zigbee.manager"
-				send_member="disable" privilege="http://tizen.org/privilege/zigbee.admin"/>
+				privilege="http://tizen.org/privilege/zigbee.admin"/>
 		<check receive_sender="org.tizen.zigbee.manager" receive_interface="org.tizen.zigbee.manager"
 				privilege="http://tizen.org/privilege/zigbee.admin"/>
 
 		<!-- Service -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="zb_hw_reset" privilege="http://tizen.org/privilege/zigbee.admin"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="form_network" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
 				send_member="coex_start" privilege="http://tizen.org/privilege/zigbee.admin"/>
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
 				send_member="coex_stop" privilege="http://tizen.org/privilege/zigbee.admin"/>
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="leave_network" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="get_network_info" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="permit_join" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="leave_request" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="get_device_list" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="get_mac" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="get_device_info" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="get_endpoint_list" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="get_cluster_list" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.service"
-				send_member="get_node_type" privilege="http://tizen.org/privilege/zigbee"/>
+				send_member="zb_hw_reset" privilege="http://tizen.org/privilege/zigbee.admin"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.service"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZDO Bind -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_bind"
-				send_member="bind_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_bind"
-				send_member="unbind_req" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zdo_bind"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZDO Dev Control -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="nwk_addr_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="matched_descriptor_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="ieee_addr_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="active_ep_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="node_desc_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="power_desc_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="complex_desc_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="user_desc_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="user_desc_set_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="device_announce" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="simple_desc_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="mgmt_lqi_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="mgmt_rtg_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="mgmt_bind_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="mgmt_permit_join_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="mgmt_nwk_update_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zdo_dev_control"
-				send_member="mgmt_nwk_disc_req" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zdo_dev_control"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Global Control -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="read_attributes_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="write_attributes_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="write_attributes_undivided_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="write_attributes_no_resp" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="write_attributes_structured" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="read_attributes_structured" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="configure_reporting_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="read_configure_reporting" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="discover_attributes" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="discover_attributes_extended" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="discover_commands_received" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_global_control"
-				send_member="discover_commands_generated" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_global_control"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Alarm -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_alarm"
-				send_member="read_attributes_req" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_alarm"
-				send_member="reset_alarm" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_alarm"
-				send_member="reset_all_alarm" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_alarm"
-				send_member="alarm" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_alarm"
-				send_member="reset_alarm_log" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_alarm"
-				send_member="get_alarm" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_alarm"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Basic -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_basic"
-				send_member="reset_factory_default" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_basic"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Color Control -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="move_to_hue" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="move_hue" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="step_hue" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="move_to_saturation" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="move_saturation" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="step_saturation" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="move_to_hue_and_saturation" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="move_to_color" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="move_color" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="step_color" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_color_control"
-				send_member="move_color_temperature" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_color_control"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL On Off -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_on_off"
-				send_member="set_on_off" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_on_off"
-				send_member="get_on_off_state" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_on_off"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Door Lock -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_door_lock"
-				send_member="subscribe_lock_event" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_door_lock"
-				send_member="set_door_lock_pin" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_door_lock"
-				send_member="set_door_lock" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_door_lock"
-				send_member="get_lock_state" privilege="http://tizen.org/privilege/zigbee"/>
+				 privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_door_lock"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Group -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_group"
-				send_member="add_group" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_group"
-				send_member="view_group" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_group"
-				send_member="get_group_membership" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_group"
-				send_member="remove_group" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_group"
-				send_member="remove_all_group" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_group"
-				send_member="add_group_if_identifying" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_group"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Fan Control -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_fan_control"
-				send_member="set_fan_mode" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_fan_control"
-				send_member="get_fan_mode" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_fan_control"
-				send_member="set_fan_mode_sequence" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_fan_control"
-				send_member="get_fan_mode_sequence" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_fan_control"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL IAS Zone -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_ias_zone"
-				send_member="enroll_response" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_ias_zone"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Identify -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_identify"
-				send_member="identify" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_identify"
-				send_member="query" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_identify"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Level Control -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_level_control"
-				send_member="move_to_level" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_level_control"
-				send_member="move" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_level_control"
-				send_member="step" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_level_control"
-				send_member="move_to_level_with_on_off" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_level_control"
-				send_member="move_with_on_off" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_level_control"
-				send_member="step_with_on_off" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_level_control"
-				send_member="stop" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_level_control"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Poll Control -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_poll_control"
-				send_member="check_in_response" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_poll_control"
-				send_member="fast_poll_stop" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_poll_control"
-				send_member="set_long_poll_interval" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_poll_control"
-				send_member="set_short_poll_interval" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_poll_control"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Scene -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_scene"
-				send_member="add_scene" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_scene"
-				send_member="view_scene" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_scene"
-				send_member="remove_scene" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_scene"
-				send_member="store_scene" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_scene"
-				send_member="recall_scene" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_scene"
-				send_member="remove_all_scene" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_scene"
-				send_member="get_scene_membership" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_scene"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- ZCL Thermostat -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_thermostat"
-				send_member="get_local_temp" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_thermostat"
-				send_member="get_weekly_schedule" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_thermostat"
-				send_member="set_weekly_schedule" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_thermostat"
-				send_member="clear_weekly_schedule" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.zcl_thermostat"
-				send_member="setpoint_raise_lower" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.zcl_thermostat"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- Custom -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.custom"
-				send_member="aps_send" privilege="http://tizen.org/privilege/zigbee.admin"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.custom"
-				send_member="zcl_send" privilege="http://tizen.org/privilege/zigbee.admin"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.custom"
-				send_member="send_to_local" privilege="http://tizen.org/privilege/zigbee.admin"/>
+				privilege="http://tizen.org/privilege/zigbee.admin"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.custom"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
 		<!-- Mfg lib Control -->
 		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="start" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="end" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="start_tone" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="stop_tone" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="start_stream" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="stop_stream" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="send_packet" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="set_channel" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="get_channel" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="set_power" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="get_power" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="set_synoffset" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="get_synoffset" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="rx_start" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="rx_stop" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="rx_verify" privilege="http://tizen.org/privilege/zigbee"/>
-		<check send_destination="org.tizen.zigbee" send_interface="org.tizen.zigbee.mfglib_control"
-				send_member="get_rssi" privilege="http://tizen.org/privilege/zigbee"/>
+				privilege="http://tizen.org/privilege/zigbee"/>
 		<check receive_sender="org.tizen.zigbee" receive_interface="org.tizen.zigbee.mfglib_control"
 				privilege="http://tizen.org/privilege/zigbee"/>
 
-- 
2.7.4