|
51 | 51 |
|
52 | 52 | import static org.opensearch.knn.TestUtils.KNN_BWC_PREFIX;
|
53 | 53 | import static org.opensearch.knn.TestUtils.OPENDISTRO_SECURITY;
|
| 54 | +import static org.opensearch.knn.TestUtils.ML_PLUGIN_SYSTEM_INDEX_PREFIX; |
54 | 55 | import static org.opensearch.knn.TestUtils.OPENSEARCH_SYSTEM_INDEX_PREFIX;
|
55 |
| -import static org.opensearch.knn.TestUtils.PLUGINS_ML_CONFIG_INDEX_NAME; |
56 | 56 | import static org.opensearch.knn.TestUtils.SECURITY_AUDITLOG_PREFIX;
|
57 | 57 | import static org.opensearch.knn.TestUtils.SKIP_DELETE_MODEL_INDEX;
|
58 | 58 | import static org.opensearch.knn.common.KNNConstants.MODELS;
|
|
63 | 63 | */
|
64 | 64 | public abstract class ODFERestTestCase extends OpenSearchRestTestCase {
|
65 | 65 |
|
66 |
| - private final Set<String> IMMUTABLE_INDEX_PREFIXES = Set.of(KNN_BWC_PREFIX, SECURITY_AUDITLOG_PREFIX, OPENSEARCH_SYSTEM_INDEX_PREFIX); |
| 66 | + private final Set<String> IMMUTABLE_INDEX_PREFIXES = Set.of( |
| 67 | + KNN_BWC_PREFIX, |
| 68 | + SECURITY_AUDITLOG_PREFIX, |
| 69 | + OPENSEARCH_SYSTEM_INDEX_PREFIX, |
| 70 | + ML_PLUGIN_SYSTEM_INDEX_PREFIX |
| 71 | + ); |
67 | 72 |
|
68 | 73 | protected boolean isHttps() {
|
69 | 74 | return Optional.ofNullable(System.getProperty("https")).map("true"::equalsIgnoreCase).orElse(false);
|
@@ -213,7 +218,6 @@ private boolean skipDeleteIndex(String indexName) {
|
213 | 218 | return indexName == null
|
214 | 219 | || OPENDISTRO_SECURITY.equals(indexName)
|
215 | 220 | || IMMUTABLE_INDEX_PREFIXES.stream().anyMatch(indexName::startsWith)
|
216 |
| - || MODEL_INDEX_NAME.equals(indexName) |
217 |
| - || PLUGINS_ML_CONFIG_INDEX_NAME.equals(indexName); |
| 221 | + || MODEL_INDEX_NAME.equals(indexName); |
218 | 222 | }
|
219 | 223 | }
|
0 commit comments