diff --git a/include/neuron/adapter_msg.h b/include/neuron/adapter_msg.h index 5b3e8af5..2e22f94c 100644 --- a/include/neuron/adapter_msg.h +++ b/include/neuron/adapter_msg.h @@ -52,8 +52,6 @@ typedef enum neu_reqresp_type { NEU_REQRESP_TRANS_DATA, NEU_REQRESP_ADD_NODE, NEU_REQRESP_DEL_NODE, - NEU_REQRESP_GET_NODE_BY_ID, - NEU_REQRESP_NODE_INFO, NEU_REQRESP_GET_NODES, NEU_REQRESP_NODES, NEU_REQRESP_ADD_GRP_CONFIG, @@ -70,13 +68,6 @@ typedef enum neu_reqresp_type { NEU_REQRESP_UPDATE_PLUGIN_LIB, NEU_REQRESP_GET_PLUGIN_LIBS, NEU_REQRESP_PLUGIN_LIBS, - NEU_REQRESP_GET_DATATAGS, - NEU_REQRESP_DATATAGS, - NEU_REQRESP_SELF_NODE_ID, - NEU_REQRESP_NODE_ID, - NEU_REQRESP_SELF_NODE_NAME, - NEU_REQRESP_NODE_NAME, - NEU_REQRESP_GET_NODE_ID_BY_NAME, NEU_REQRESP_SET_NODE_SETTING, NEU_REQRESP_GET_NODE_SETTING, NEU_REQRESP_GET_NODE_SETTING_RESP, @@ -85,7 +76,6 @@ typedef enum neu_reqresp_type { NEU_REQRESP_NODE_CTL, NEU_REQRESP_GET_SUB_GRP_CONFIGS, NEU_REQRESP_SUB_GRP_CONFIGS_RESP, - NEU_REQRESP_VALIDATE_TAG, NEU_REQRESP_UPDATE_LICENSE, } neu_reqresp_type_e; @@ -217,17 +207,6 @@ typedef struct neu_cmd_del_node { char *name; } neu_cmd_del_node_t; -/* NEU_REQRESP_GET_NODE_BY_ID */ -typedef struct neu_cmd_get_node_by_id { - neu_node_id_t node_id; -} neu_cmd_get_node_by_id_t; - -/* NEU_REQRESP_NODE_INFO */ -typedef struct { - int32_t result; - neu_node_info_t node_info; -} neu_reqresp_node_info_t; - /* NEU_REQRESP_GET_NODES */ typedef struct neu_cmd_get_nodes { neu_node_type_e node_type; @@ -290,36 +269,6 @@ typedef struct neu_reqresp_plugin_libs { UT_array *plugin_libs; } neu_reqresp_plugin_libs_t; -/* NEU_REQRESP_GET_DATATAGS */ -typedef struct neu_cmd_get_datatags { - neu_node_id_t node_id; // get datatag table of this node -} neu_cmd_get_datatags_t; - -/* NEU_REQRESP_SELF_NODE_ID */ -typedef struct neu_cmd_self_node_id { - uint32_t reserved; -} neu_cmd_self_node_id_t; - -/* NEU_REQRESP_GET_NODE_ID_BY_NAME */ -typedef struct neu_cmd_get_node_id_by_name { - const char *name; -} neu_cmd_get_node_id_by_name_t; - -/* NEU_REQRESP_NODE_ID */ -typedef struct neu_represp_node_id { - neu_node_id_t node_id; -} neu_reqresp_node_id_t; - -/* NEU_REQRESP_SELF_NODE_NAME */ -typedef struct neu_cmd_self_node_name { - uint32_t reserved; -} neu_cmd_self_node_name_t; - -/* NEU_REQRESP_NODE_NAME */ -typedef struct neu_represp_node_name { - const char *node_name; -} neu_reqresp_node_name_t; - /* NEU_REQRESP_SET_NODE_SETTING */ typedef struct neu_cmd_set_node_setting { char *node_name; @@ -368,12 +317,6 @@ typedef struct neu_cmd_node_ctl { neu_adapter_ctl_e ctl; } neu_cmd_node_ctl_t; -/* NEU_REQRESP_VALIDATE_TAG */ -typedef struct neu_cmd_validate_tag { - char * node_name; - neu_datatag_t *tag; -} neu_cmd_validate_tag_t; - /** * definition enum and structure for neuron event */ diff --git a/include/neuron/errcodes.h b/include/neuron/errcodes.h index 905db27e..47dca921 100644 --- a/include/neuron/errcodes.h +++ b/include/neuron/errcodes.h @@ -84,16 +84,12 @@ typedef enum { NEU_ERR_NODE_NOT_RUNNING = 2008, NEU_ERR_NODE_IS_STOPED = 2009, - NEU_ERR_GRP_CONFIG_NOT_EXIST = 2101, - NEU_ERR_GRP_CONFIG_IN_USE = 2102, - NEU_ERR_GRP_CONFIG_CONFLICT = 2103, - - NEU_ERR_GROUP_ALREADY_SUBSCRIBED = 2105, - NEU_ERR_GROUP_NOT_SUBSCRIBE = 2016, - NEU_ERR_GROUP_NOT_ALLOW = 2017, - NEU_ERR_GROUP_EXIST = 2018, - NEU_ERR_GROUP_PARAMETER_INVALID = 2019, - NEU_ERR_GROUP_NOT_EXIST = 2020, + NEU_ERR_GROUP_ALREADY_SUBSCRIBED = 2101, + NEU_ERR_GROUP_NOT_SUBSCRIBE = 2102, + NEU_ERR_GROUP_NOT_ALLOW = 2103, + NEU_ERR_GROUP_EXIST = 2104, + NEU_ERR_GROUP_PARAMETER_INVALID = 2105, + NEU_ERR_GROUP_NOT_EXIST = 2106, NEU_ERR_TAG_NOT_EXIST = 2201, NEU_ERR_TAG_NAME_CONFLICT = 2202, diff --git a/include/neuron/plugin.h b/include/neuron/plugin.h index 3342ce5b..5d58591e 100644 --- a/include/neuron/plugin.h +++ b/include/neuron/plugin.h @@ -126,9 +126,6 @@ void neu_plugin_send_write_cmd(neu_plugin_t *plugin, const char *node_name, const char *group_name, const char *tag, neu_dvalue_t value, void *ctx); -neu_node_id_t neu_plugin_get_node_id_by_node_name(neu_plugin_t *plugin, - const char * node_name); - intptr_t neu_system_add_plugin(neu_plugin_t *plugin, const char * plugin_lib_name); intptr_t neu_system_del_plugin(neu_plugin_t *plugin, const char *name); diff --git a/package/create_neuron_sdk_deb.py b/package/create_neuron_sdk_deb.py index f2bef87f..1add9983 100755 --- a/package/create_neuron_sdk_deb.py +++ b/package/create_neuron_sdk_deb.py @@ -64,37 +64,23 @@ rules.append(mkdeb.FileMap("../include/neuron/adapter_msg.h", "/usr/local/include/neuron/")) rules.append(mkdeb.FileMap("../include/neuron/utils/base64.h", "/usr/local/include/neuron/utils/")) -rules.append(mkdeb.FileMap("../include/neuron/utils/atomic_data.h", - "/usr/local/include/neuron/")) -rules.append(mkdeb.FileMap("../include/neuron/data_expr.h", - "/usr/local/include/neuron/")) rules.append(mkdeb.FileMap("../include/neuron/errcodes.h", "/usr/local/include/neuron/")) rules.append(mkdeb.FileMap("../include/neuron/file.h", "/usr/local/include/neuron/")) rules.append(mkdeb.FileMap("../include/neuron/license.h", "/usr/local/include/neuron/")) -rules.append(mkdeb.FileMap("../include/neuron/list.h", - "/usr/local/include/neuron/")) rules.append(mkdeb.FileMap("../include/neuron/log.h", "/usr/local/include/neuron/")) rules.append(mkdeb.FileMap("../include/neuron/plugin_info.h", "/usr/local/include/neuron/")) -rules.append(mkdeb.FileMap("../include/neuron/types.h", - "/usr/local/include/neuron/")) rules.append(mkdeb.FileMap("../include/neuron/plugin.h", "/usr/local/include/neuron/")) -rules.append(mkdeb.FileMap("../include/neuron/neu_tag.h", - "/usr/local/include/neuron/")) rules.append(mkdeb.FileMap("../include/neuron/tag_sort.h", "/usr/local/include/neuron/")) -rules.append(mkdeb.FileMap("../include/neuron/neu_vector.h", - "/usr/local/include/neuron/")) rules.append(mkdeb.FileMap("../include/neuron/neuron.h", "/usr/local/include/neuron/")) -rules.append(mkdeb.FileMap("../include/neuron/vector.h", - "/usr/local/include/neuron/")) mkdeb.create_deb_file(rules) mkdeb.create_control("neuron-sdk", sys.argv[1], sys.argv[2], "neuron-sdk", "") diff --git a/plugins/restful/http.c b/plugins/restful/http.c index 04a487dd..a3f0e4eb 100644 --- a/plugins/restful/http.c +++ b/plugins/restful/http.c @@ -328,7 +328,6 @@ int http_response(nng_aio *aio, neu_err_code_e code, char *content) break; case NEU_ERR_LIBRARY_NOT_FOUND: case NEU_ERR_NODE_NOT_EXIST: - case NEU_ERR_GRP_CONFIG_NOT_EXIST: case NEU_ERR_TAG_NOT_EXIST: case NEU_ERR_LICENSE_NOT_FOUND: case NEU_ERR_GROUP_NOT_EXIST: @@ -341,7 +340,6 @@ int http_response(nng_aio *aio, neu_err_code_e code, char *content) case NEU_ERR_NODE_NOT_RUNNING: case NEU_ERR_NODE_IS_STOPED: case NEU_ERR_TAG_NAME_CONFLICT: - case NEU_ERR_GRP_CONFIG_CONFLICT: case NEU_ERR_LIBRARY_NAME_CONFLICT: case NEU_ERR_GROUP_EXIST: case NEU_ERR_GROUP_NOT_ALLOW: @@ -352,9 +350,6 @@ int http_response(nng_aio *aio, neu_err_code_e code, char *content) case NEU_ERR_TAG_ADDRESS_FORMAT_INVALID: status = NNG_HTTP_STATUS_PARTIAL_CONTENT; break; - case NEU_ERR_GRP_CONFIG_IN_USE: - status = NNG_HTTP_STATUS_PRECONDITION_FAILED; - break; default: if (code >= NEU_ERR_PLUGIN_ERROR_START && code <= NEU_ERR_PLUGIN_ERROR_END) { diff --git a/src/base/neu_plugin_common.c b/src/base/neu_plugin_common.c index 6c833232..0d065042 100644 --- a/src/base/neu_plugin_common.c +++ b/src/base/neu_plugin_common.c @@ -337,18 +337,6 @@ int neu_plugin_notify_event_update_license(neu_plugin_t *plugin, plugin_common->adapter, &event); } -neu_node_id_t neu_plugin_get_node_id_by_node_name(neu_plugin_t *plugin, - const char * node_name) -{ - neu_cmd_get_node_id_by_name_t get_id = { .name = node_name }; - neu_node_id_t node_id = { 0 }; - - PLUGIN_CALL_CMD(plugin, NEU_REQRESP_GET_NODE_ID_BY_NAME, get_id, - neu_reqresp_node_id_t, { node_id = resp->node_id; }) - - return node_id; -} - intptr_t neu_system_add_plugin(neu_plugin_t *plugin, const char * plugin_lib_name) {