Skip to content

Commit 59fdade

Browse files
committed
[API] Test Runner: deletes trained models on wipe cluster
1 parent 5b100a8 commit 59fdade

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

elasticsearch-api/api-spec-testing/wipe_cluster.rb

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,12 @@ def wipe_cluster(client)
7474
clear_ml_jobs(client)
7575
clear_datafeeds(client)
7676
delete_data_frame_analytics(client)
77-
delete_filters(client)
77+
clear_ml_filters(client)
78+
delete_trained_models(client)
7879
end
7980
delete_all_ilm_policies(client) if @has_ilm
8081
delete_all_follow_patterns(client) if @has_ccr
8182
delete_all_node_shutdown_metadata(client)
82-
# clear_ml_filters(client)
8383
# clear_tasks(client)
8484
# clear_transforms(client)
8585

@@ -383,7 +383,7 @@ def clear_ml_filters(client)
383383

384384
def delete_all_node_shutdown_metadata(client)
385385
nodes = client.shutdown.get_node
386-
return unless nodes
386+
return unless nodes['nodes']
387387

388388
nodes['nodes'].each do |node|
389389
client.shutdown.delete_node(node['node_id'])
@@ -392,16 +392,20 @@ def delete_all_node_shutdown_metadata(client)
392392

393393
def delete_data_frame_analytics(client)
394394
dfs = client.ml.get_data_frame_analytics
395+
return unless dfs['data_frame_analytics']
395396

396397
dfs['data_frame_analytics'].each do |df|
397398
client.ml.delete_data_frame_analytics(id: df['id'], force: true)
398399
end
399400
end
400401

401-
def delete_filters(client)
402-
filters = client.ml.get_filters
403-
filters['filters'].each do |filter|
404-
client.ml.delete_filter(filter_id: filter['filter_id'])
402+
def delete_trained_models(client)
403+
models = client.ml.get_trained_models
404+
return unless models['trained_model_configs']
405+
406+
models['trained_model_configs'].each do |model|
407+
response = client.ml.delete_trained_model(model_id: model['model_id'], ignore: 400)
408+
puts response
405409
end
406410
end
407411
end

0 commit comments

Comments
 (0)