PIE-1606

PegaSysEng · May 16, 2019 · 2aa359d · 2aa359d
1 parent f1ead6a
commit 2aa359d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 17 deletions.
diff --git a/...theon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java b/...theon/tests/acceptance/dsl/condition/net/ExpectNetServicesReturnsAllServicesAsActive.java
@@ -37,17 +37,12 @@ public ExpectNetServicesReturnsAllServicesAsActive(final NetServicesTransaction
   public void verify(final Node node) {
     final Map<String, Map<String, String>> result = node.execute(transaction);
     assertThat(result.keySet())
-        .containsExactlyInAnyOrderElementsOf(Arrays.asList("p2p", "jsonrpc", "ws", "metrics"));
+        .containsExactlyInAnyOrderElementsOf(Arrays.asList("p2p", "jsonrpc", "ws"));
 
     assertThat(InetAddresses.isUriInetAddress(result.get("p2p").get("host"))).isTrue();
     final int p2pPort = Integer.valueOf(result.get("p2p").get("port"));
     assertThat(NetworkUtility.isValidPort(p2pPort)).isTrue();
 
-    assertThat(InetAddresses.isUriInetAddress(result.get("metrics").get("host"))).isTrue();
-    final int metricsPort = Integer.valueOf(result.get("metrics").get("port"));
-    // TODO: Port should not be 0-valued. Refer to PAN-2703
-    assertThat(NetworkUtility.isValidPort(p2pPort) || metricsPort == 0).isTrue();
-
     assertThat(InetAddresses.isUriInetAddress(result.get("ws").get("host"))).isTrue();
     final int wsPort = Integer.valueOf(result.get("ws").get("port"));
     // TODO: Port should not be 0-valued. Refer to PAN-2703

diff --git a/...est/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonNodeFactory.java b/...est/java/tech/pegasys/pantheon/tests/acceptance/dsl/node/factory/PantheonNodeFactory.java
@@ -26,7 +26,6 @@
 import tech.pegasys.pantheon.ethereum.jsonrpc.RpcApi;
 import tech.pegasys.pantheon.ethereum.jsonrpc.RpcApis;
 import tech.pegasys.pantheon.ethereum.jsonrpc.websocket.WebSocketConfiguration;
-import tech.pegasys.pantheon.metrics.prometheus.MetricsConfiguration;
 import tech.pegasys.pantheon.tests.acceptance.dsl.node.GenesisConfigProvider;
 import tech.pegasys.pantheon.tests.acceptance.dsl.node.Node;
 import tech.pegasys.pantheon.tests.acceptance.dsl.node.PantheonNode;
@@ -132,27 +131,24 @@ public PantheonNode createArchiveNodeWithDiscoveryDisabledAndAdmin(final String
   }
 
   public PantheonNode createArchiveNodeNetServicesEnabled(final String name) throws IOException {
-    final MetricsConfiguration metricsConfiguration = MetricsConfiguration.createDefault();
-    metricsConfiguration.setEnabled(true);
-    metricsConfiguration.setPort(0);
-    metricsConfiguration.setPushEnabled(false);
+    // TODO: Enable metrics coverage in the acceptance tests. See PIE-1606
+    // final MetricsConfiguration metricsConfiguration = MetricsConfiguration.createDefault();
+    // metricsConfiguration.setEnabled(true);
+    // metricsConfiguration.setPort(0);
     return create(
         new PantheonFactoryConfigurationBuilder()
             .setName(name)
-            .setMetricsConfiguration(metricsConfiguration)
+            // .setMetricsConfiguration(metricsConfiguration)
             .setJsonRpcConfiguration(jsonRpcConfigWithAdmin())
             .webSocketEnabled()
             .setP2pEnabled(true)
             .build());
   }
 
   public PantheonNode createArchiveNodeNetServicesDisabled(final String name) throws IOException {
-    final MetricsConfiguration metricsConfiguration = MetricsConfiguration.createDefault();
-    metricsConfiguration.setEnabled(false);
     return create(
         new PantheonFactoryConfigurationBuilder()
             .setName(name)
-            .setMetricsConfiguration(metricsConfiguration)
             .setJsonRpcConfiguration(jsonRpcConfigWithAdmin())
             .setP2pEnabled(false)
             .build());

diff --git a/...c/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java b/...c/test/java/tech/pegasys/pantheon/tests/acceptance/jsonrpc/NetServicesAcceptanceTest.java
@@ -30,7 +30,7 @@ public class NetServicesAcceptanceTest extends AcceptanceTestBase {
   @Test
   public void shouldIndicateNetServicesEnabled() throws Exception {
     final ClusterConfiguration clusterConfiguration =
-        new ClusterConfigurationBuilder().setAwaitPeerDiscovery(false).build();
+        new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
     noDiscoveryCluster = new Cluster(clusterConfiguration, net);
     nodeA = pantheon.createArchiveNodeNetServicesEnabled("nodeA");
     nodeB = pantheon.createArchiveNodeNetServicesEnabled("nodeB");
@@ -43,7 +43,7 @@ public void shouldIndicateNetServicesEnabled() throws Exception {
   @Test
   public void shouldNotDisplayDisabledServices() throws Exception {
     final ClusterConfiguration clusterConfiguration =
-        new ClusterConfigurationBuilder().setAwaitPeerDiscovery(false).build();
+        new ClusterConfigurationBuilder().awaitPeerDiscovery(false).build();
     noDiscoveryCluster = new Cluster(clusterConfiguration, net);
     nodeA = pantheon.createArchiveNodeNetServicesDisabled("nodeA");
     nodeB = pantheon.createArchiveNodeNetServicesDisabled("nodeB");