diff --git a/tests/ft/http_api/test_http_api.py b/tests/ft/http_api/test_http_api.py index b3f48371..d88b97c0 100644 --- a/tests/ft/http_api/test_http_api.py +++ b/tests/ft/http_api/test_http_api.py @@ -210,37 +210,6 @@ class TestHttp: response = api.get_version() assert 200 == response.status_code - @description(given="running neuron", when="test ndriver", then="failed because it is not supported yet") - def test_ndriver(self): - api.add_node_check(node='modbus', plugin=config.PLUGIN_MODBUS_TCP) - api.add_group_check(node='modbus', group='group') - api.add_tags_check(node='modbus', group='group', tags=hold_int16) - response = api.subscribe_group(app='mqtt', driver='modbus', group='group') - assert 200 == response.status_code - assert error.NEU_ERR_SUCCESS == response.json()['error'] - - response = api.post_ndriver_map(ndriver='mqtt', driver='modbus', group='group') - assert 400 == response.status_code - - response = api.get_ndriver_map(ndriver='mqtt') - assert 400 == response.status_code - - ndriver_tag_param = {"ndriver": "mqtt", "driver": "modbus", "group": "group", "tags": [ - {"name": "hold_int16", "params": {"address": "1!400002"}}]} - response = api.put_ndriver_tag_param(json=ndriver_tag_param) - assert 200 == response.status_code - - ndriver_tag_info = {"ndriver": "mqtt", "driver": "modbus", "group": "group", "tags": [ - {"name": "hold_int16", "address": "1!400002"}]} - response = api.put_ndriver_tag_info(json=ndriver_tag_info) - assert 200 == response.status_code - - response = api.get_ndriver_tag(ndriver='mqtt', driver='modbus', group='group') - assert 200 == response.status_code - - response = api.delete_ndriver_map(ndriver='mqtt', driver='modbus', group='group') - assert 200 == response.status_code - @description(given="running neuron", when="test jwt error", then="failed") def test_jwt_err(self): response = api.change_password(new_password='123456', jwt='invalid') diff --git a/tests/ft/neuron/api.py b/tests/ft/neuron/api.py index cfdfd106..fe7b02e7 100644 --- a/tests/ft/neuron/api.py +++ b/tests/ft/neuron/api.py @@ -326,23 +326,6 @@ def get_plugin(): def get_version(): return requests.get(url=config.BASE_URL + "/api/v2/version", headers={"Authorization": config.default_jwt}) -def post_ndriver_map(ndriver, driver, group): - return requests.post(url=config.BASE_URL + "/api/v2/ndriver/map", headers={"Authorization": config.default_jwt}, json={"ndriver": ndriver, "driver": driver, "group":group}) - -def delete_ndriver_map(ndriver, driver, group): - return requests.delete(url=config.BASE_URL + "/api/v2/ndriver/map", headers={"Authorization": config.default_jwt}, json={"ndriver": ndriver, "driver": driver, "group":group}) - -def get_ndriver_map(ndriver): - return requests.get(url=config.BASE_URL + "/api/v2/ndriver/map?ndriver=" + ndriver, headers={"Authorization": config.default_jwt}) - -def put_ndriver_tag_param(json): - return requests.put(url=config.BASE_URL + "/api/v2/ndriver/tag/param", headers={"Authorization": config.default_jwt}, json=json) - -def put_ndriver_tag_info(json): - return requests.put(url=config.BASE_URL + "/api/v2/ndriver/tag/info", headers={"Authorization": config.default_jwt}, json=json) - -def get_ndriver_tag(ndriver, driver, group): - return requests.get(url=config.BASE_URL + "/api/v2/ndriver/tag?ndriver=" + ndriver + "&driver=" + driver + "&group=" + group, headers={"Authorization": config.default_jwt}) # plugin setting