diff options
author | Harald Musum <musum@yahooinc.com> | 2023-11-10 10:56:47 +0100 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-11-10 10:56:47 +0100 |
commit | 632c64038099e2c6de3e8aa633e9c3f5433bedb5 (patch) | |
tree | 8e26cbb382f70e6ad95040fd3b806e33c7f062c7 /config-model/src/test/java/com/yahoo/vespa/model/container | |
parent | e36fa5e9d39a94008196eb321bd39957eceaf180 (diff) |
Remove unnecessary code for producing filedistributorrpc config
Config value is always the same for a node, make it simple
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/container')
-rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java index e7ef1a65312..e704da08d18 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java @@ -36,7 +36,6 @@ import com.yahoo.container.handler.metrics.MetricsV2Handler; import com.yahoo.container.handler.observability.ApplicationStatusHandler; import com.yahoo.container.jdisc.JdiscBindingsConfig; import com.yahoo.container.usability.BindingsOverviewHandler; -import com.yahoo.net.HostName; import com.yahoo.prelude.cluster.QrMonitorConfig; import com.yahoo.search.config.QrStartConfig; import com.yahoo.vespa.model.AbstractService; @@ -648,14 +647,13 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { @Test void qrconfig_is_produced() throws IOException, SAXException { QrConfig qr = getQrConfig(new TestProperties()); - String hostname = HostName.getLocalhost(); // Using the same way of getting hostname as filedistribution model assertEquals("default.container.0", qr.discriminator()); assertEquals(19102, qr.rpc().port()); assertEquals("vespa/service/default/container.0", qr.rpc().slobrokId()); assertTrue(qr.rpc().enabled()); assertEquals("", qr.rpc().host()); assertFalse(qr.restartOnDeploy()); - assertEquals("filedistribution/" + hostname, qr.filedistributor().configid()); + assertEquals("", qr.filedistributor().configid()); // Not used, will be removed in Vespa 9 assertEquals(50.0, qr.shutdown().timeout(), 0.00000000000001); assertFalse(qr.shutdown().dumpHeapOnTimeout()); } |