Merge branch 'main' of github.com:hal/manatoko

hal · Sep 12, 2023 · 0647a58 · 0647a58
2 parents 723ac34 + 9afc420
commit 0647a58
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/...test/java/org/jboss/hal/testsuite/test/configuration/modcluster/CustomLoadMetricTest.java b/...test/java/org/jboss/hal/testsuite/test/configuration/modcluster/CustomLoadMetricTest.java
@@ -36,8 +36,8 @@
 import org.wildfly.extras.creaper.core.online.operations.Values;
 
 import static org.jboss.hal.dmr.ModelDescriptionConstants.CLASS;
-import static org.jboss.hal.dmr.ModelDescriptionConstants.CONNECTOR;
 import static org.jboss.hal.dmr.ModelDescriptionConstants.DEFAULT;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.LISTENER;
 import static org.jboss.hal.dmr.ModelDescriptionConstants.NAME;
 import static org.jboss.hal.testsuite.container.WildFlyConfiguration.HA;
 import static org.jboss.hal.testsuite.fixtures.ModclusterFixtures.CLASS_NAME;
@@ -61,11 +61,13 @@ static void setupModel() throws Exception {
         OnlineManagementClient client = wildFly.managementClient();
         Operations operations = new Operations(client);
         Batch proxyAdd = new Batch();
-        proxyAdd.add(proxyAddress(PROXY_UPDATE), Values.of(CONNECTOR, DEFAULT));
+        proxyAdd.add(proxyAddress(PROXY_UPDATE), Values.of(LISTENER, DEFAULT));
         proxyAdd.add(loadProviderDynamicAddress(PROXY_UPDATE));
-        operations.batch(proxyAdd);
-        operations.add(customLoadMetricAddress(PROXY_UPDATE, CUSTOM_LOAD_METRIC_DELETE), Values.of(CLASS, CLASS_NAME));
-        operations.add(customLoadMetricAddress(PROXY_UPDATE, CUSTOM_LOAD_METRIC_UPDATE), Values.of(CLASS, CLASS_NAME));
+        operations.batch(proxyAdd).assertSuccess();
+        operations.add(customLoadMetricAddress(PROXY_UPDATE, CUSTOM_LOAD_METRIC_DELETE), Values.of(CLASS, CLASS_NAME))
+                .assertSuccess();
+        operations.add(customLoadMetricAddress(PROXY_UPDATE, CUSTOM_LOAD_METRIC_UPDATE), Values.of(CLASS, CLASS_NAME))
+                .assertSuccess();
     }
 
     @Inject Console console;

diff --git a/...r/src/test/java/org/jboss/hal/testsuite/test/configuration/modcluster/LoadMetricTest.java b/...r/src/test/java/org/jboss/hal/testsuite/test/configuration/modcluster/LoadMetricTest.java
@@ -35,8 +35,8 @@
 import org.wildfly.extras.creaper.core.online.operations.Operations;
 import org.wildfly.extras.creaper.core.online.operations.Values;
 
-import static org.jboss.hal.dmr.ModelDescriptionConstants.CONNECTOR;
 import static org.jboss.hal.dmr.ModelDescriptionConstants.DEFAULT;
+import static org.jboss.hal.dmr.ModelDescriptionConstants.LISTENER;
 import static org.jboss.hal.dmr.ModelDescriptionConstants.NAME;
 import static org.jboss.hal.dmr.ModelDescriptionConstants.TYPE;
 import static org.jboss.hal.testsuite.container.WildFlyConfiguration.HA;
@@ -61,11 +61,11 @@ static void setupModel() throws Exception {
         OnlineManagementClient client = wildFly.managementClient();
         Operations operations = new Operations(client);
         Batch proxyAdd = new Batch();
-        proxyAdd.add(proxyAddress(PROXY_UPDATE), Values.of(CONNECTOR, DEFAULT));
+        proxyAdd.add(proxyAddress(PROXY_UPDATE), Values.of(LISTENER, DEFAULT));
         proxyAdd.add(loadProviderDynamicAddress(PROXY_UPDATE));
-        operations.batch(proxyAdd);
-        operations.add(loadMetricAddress(PROXY_UPDATE, LOAD_METRIC_DELETE), Values.of(TYPE, "mem"));
-        operations.add(loadMetricAddress(PROXY_UPDATE, LOAD_METRIC_UPDATE), Values.of(TYPE, "mem"));
+        operations.batch(proxyAdd).assertSuccess();
+        operations.add(loadMetricAddress(PROXY_UPDATE, LOAD_METRIC_DELETE), Values.of(TYPE, "heap")).assertSuccess();
+        operations.add(loadMetricAddress(PROXY_UPDATE, LOAD_METRIC_UPDATE), Values.of(TYPE, "heap")).assertSuccess();
     }
 
     @Inject Console console;