GithubStar/neuron
1
0
Fork 0
mirror of https://github.com/emqx/neuron.git synced 2026-10-27 12:28:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #510 from eeff/eeff/dev

Browse Source 
Update get nodes api with `name_contains` param
This commit is contained in:
fengzeroz
2022-05-26 13:36:10 +08:00
committed by GitHub
parent ecf23e7116 4cf8dd6b78
commit cf73290a6f
2 changed files with 92 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ft/node_api_test.robot
+61 -7
View File
@@ -43,8 +43,11 @@ Create an existing node, it should return failure
Get node with wrong parameters, it will return failure
Skip If Not Http API
GET /api/v2/node?tt=${NODE_DRIVER}
GET /api/v2/node?tt=${NODE_DRIVER}
Integer response status 400
Integer response body error ${ERR_REQUEST_PARAM_INVALID}
GET /api/v2/node?name_contains=test-node
Integer response status 400
Integer response body error ${ERR_REQUEST_PARAM_INVALID}
@@ -71,11 +74,20 @@ Get DRIVER node by id, it should return the DRIVER node
Integer response body nodes 0 id ${id}
String response body nodes 0 name test-node
Get DRIVER node by id with correct type, it should return the DRIVER node
Get DRIVER node by name substring, it should return the DRIVER node
Skip If Not Http API
${id} = Get Node ID ${NODE_DRIVER} test-node
GET /api/v2/node?type=${NODE_DRIVER}&id=${id}
GET /api/v2/node?type=${NODE_DRIVER}&name_contains=test-node
Integer response status 200
Integer response body nodes 0 id ${id}
String response body nodes 0 name test-node
Get DRIVER node by id with correct type and name substring, it should return the DRIVER node
Skip If Not Http API
${id} = Get Node ID ${NODE_DRIVER} test-node
GET /api/v2/node?type=${NODE_DRIVER}&id=${id}&name_contains=test-node
Integer response status 200
Integer response body nodes 0 id ${id}
String response body nodes 0 name test-node
@@ -88,6 +100,14 @@ Get DRIVER node by id with wrong type, it should return failure
Integer response status 404
Integer response body error ${ERR_NODE_NOT_EXIST}
Get DRIVER node by id with wrong name substring, it should return failure
Skip If Not Http API
${id} = Get Node ID ${NODE_DRIVER} test-node
GET /api/v2/node?id=${id}&name_contains=xxx
Integer response status 404
Integer response body error ${ERR_NODE_NOT_EXIST}
Get WEB node, it should return all WEB node
${res} = Get Nodes ${NODE_WEB}
@@ -103,11 +123,20 @@ Get WEB node by id, it should return the WEB node
Integer response body nodes 0 id ${id}
String response body nodes 0 name default-dashboard-adapter
Get WEB node by id with correct type, it should return the WEB node
Get WEB node by name substring, it should return the WEB node
Skip If Not Http API
${id} = Get Node ID ${NODE_WEB} default-dashboard-adapter
GET /api/v2/node?type=${NODE_WEB}&id=${id}
GET /api/v2/node?type=${NODE_WEB}&name_contains=dashboard
Integer response status 200
Integer response body nodes 0 id ${id}
String response body nodes 0 name default-dashboard-adapter
Get WEB node by id with correct type and name substring, it should return the WEB node
Skip If Not Http API
${id} = Get Node ID ${NODE_WEB} default-dashboard-adapter
GET /api/v2/node?type=${NODE_WEB}&id=${id}&name_contains=dashboard
Integer response status 200
Integer response body nodes 0 id ${id}
String response body nodes 0 name default-dashboard-adapter
@@ -120,6 +149,14 @@ Get WEB node by id with wrong type, it should return failure
Integer response status 404
Integer response body error ${ERR_NODE_NOT_EXIST}
Get WEB node by id with wrong name substring, it should return failure
Skip If Not Http API
${id} = Get Node ID ${NODE_WEB} default-dashboard-adapter
GET /api/v2/node?id=${id}&name_contains=xxx
Integer response status 404
Integer response body error ${ERR_NODE_NOT_EXIST}
Get MQTT node, it should return all mqtt node
${res} = Add Node type=${${NODE_MQTT}} name=mqtt-adapter plugin_name=mqtt
${res} = Get Nodes ${NODE_MQTT}
@@ -136,11 +173,20 @@ Get MQTT node by id, it should return the MQTT node
Integer response body nodes 0 id ${id}
String response body nodes 0 name mqtt-adapter
Get MQTT node by id with correct type, it should return the MQTT node
Get MQTT node by name substring, it should return the MQTT node
Skip If Not Http API
${id} = Get Node ID ${NODE_MQTT} mqtt-adapter
GET /api/v2/node?type=${NODE_MQTT}&id=${id}
GET /api/v2/node?type=${NODE_MQTT}&name_contains=mqtt
Integer response status 200
Integer response body nodes 0 id ${id}
String response body nodes 0 name mqtt-adapter
Get MQTT node by id with correct type and name substring, it should return the MQTT node
Skip If Not Http API
${id} = Get Node ID ${NODE_MQTT} mqtt-adapter
GET /api/v2/node?type=${NODE_MQTT}&id=${id}&name_contains=mqtt
Integer response status 200
Integer response body nodes 0 id ${id}
String response body nodes 0 name mqtt-adapter
@@ -153,6 +199,14 @@ Get MQTT node by id with wrong type, it should return failure
Integer response status 404
Integer response body error ${ERR_NODE_NOT_EXIST}
Get MQTT node by id with wrong name substring, it should return failure
Skip If Not Http API
${id} = Get Node ID ${NODE_MQTT} mqtt-adapter
GET /api/v2/node?id=${id}&name_contains=xxx
Integer response status 404
Integer response body error ${ERR_NODE_NOT_EXIST}
Get UNKNOWN type node, it should return empty node
${res} = Get Nodes ${NODE_UNKNOWN}
plugins/restful/adapter_handle.c
+31 -9
View File
@@ -18,6 +18,7 @@
**/
#include <stdlib.h>
#include <string.h>
#include "vector.h"
@@ -64,8 +65,9 @@ void handle_del_adapter(nng_aio *aio)
})
}
static void handle_get_adapter_by_id(nng_aio *aio, neu_node_type_e node_type,
neu_node_id_t node_id)
static void handle_get_adapter_by_id(nng_aio *aio, neu_node_id_t node_id,
neu_node_type_e node_type,
const char * node_name_substr)
{
int rv = 0;
neu_plugin_t * plugin = neu_rest_get_plugin();
@@ -78,7 +80,10 @@ static void handle_get_adapter_by_id(nng_aio *aio, neu_node_type_e node_type,
return;
}
if (NEU_NODE_TYPE_MAX != node_type && node_type != node_info.node_type) {
if ((NEU_NODE_TYPE_MAX != node_type && node_type != node_info.node_type) ||
(NULL != node_name_substr &&
NULL == strstr(node_info.node_name, node_name_substr))) {
// `type` or `name_contains` param must comply when present
NEU_JSON_RESPONSE_ERROR(NEU_ERR_NODE_NOT_EXIST, {
http_response(aio, error_code.error, result_error);
})
@@ -114,14 +119,20 @@ static void handle_get_adapter_by_id(nng_aio *aio, neu_node_type_e node_type,
void handle_get_adapter(nng_aio *aio)
{
neu_plugin_t * plugin = neu_rest_get_plugin();
char * result = NULL;
neu_node_type_e node_type = NEU_NODE_TYPE_MAX;
neu_node_id_t node_id = 0;
neu_plugin_t * plugin = neu_rest_get_plugin();
char * result = NULL;
neu_node_type_e node_type = NEU_NODE_TYPE_MAX;
neu_node_id_t node_id = 0;
char name_substr[64] = {};
ssize_t name_substr_len = 0;
VALIDATE_JWT(aio);
if (NEU_ERR_EINVAL == http_get_param_node_type(aio, "type", &node_type) ||
name_substr_len = http_get_param_str(aio, "name_contains", name_substr,
sizeof(name_substr));
if (-1 == name_substr_len || sizeof(name_substr) == name_substr_len ||
NEU_ERR_EINVAL == http_get_param_node_type(aio, "type", &node_type) ||
NEU_ERR_EINVAL == http_get_param_node_id(aio, "id", &node_id)) {
NEU_JSON_RESPONSE_ERROR(NEU_ERR_PARAM_IS_WRONG, {
http_response(aio, error_code.error, result_error);
@@ -130,10 +141,14 @@ void handle_get_adapter(nng_aio *aio)
}
if (0 != node_id) {
return handle_get_adapter_by_id(aio, node_type, node_id);
// `id` param presents, then filter by id
return handle_get_adapter_by_id(aio, node_id, node_type,
(-2 != name_substr_len) ? name_substr
: NULL);
}
if (NEU_NODE_TYPE_MAX == node_type) {
// `type` query param is required if `id` param not present
NEU_JSON_RESPONSE_ERROR(NEU_ERR_PARAM_IS_WRONG, {
http_response(aio, error_code.error, result_error);
})
@@ -152,11 +167,18 @@ void handle_get_adapter(nng_aio *aio)
{
neu_node_info_t *info = (neu_node_info_t *) iterator_get(&iter);
if (-2 != name_substr_len &&
NULL == strstr(info->node_name, name_substr)) {
// `name_contains` param presents, then filter by name sub string
continue;
}
nodes_res.nodes[index].id = info->node_id;
nodes_res.nodes[index].name = info->node_name;
nodes_res.nodes[index].plugin_id = info->plugin_id.id_val;
index += 1;
}
nodes_res.n_node = index;
neu_json_encode_by_fn(&nodes_res, neu_json_encode_get_nodes_resp, &result);