aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
diff options
context:
space:
mode:
authorValerij Fredriksen <freva@users.noreply.github.com>2023-09-03 18:55:09 +0200
committerGitHub <noreply@github.com>2023-09-03 18:55:09 +0200
commitd8dbd9ceb4aabf9b6bd2e548bec1f911b9a94002 (patch)
treeb2db496cf7a96a1a88213e205f356e8fcd54820e /config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
parent2d17d98b9be592444cd93d214a3049cc6c3fd7c6 (diff)
parentb89b0f7c8150258ce5b177989bdd522e1c1f284e (diff)
Merge pull request #28366 from vespa-engine/revert-28353-mortent/override-port-filtersv8.220.105
Revert "Override filter port bindings" MERGEOK
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java21
1 files changed, 1 insertions, 20 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
index 70a859af010..787a8255628 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/http/FilterBindingsTest.java
@@ -14,8 +14,6 @@ import com.yahoo.vespa.model.container.xml.ContainerModelBuilder.Networking;
import org.junit.jupiter.api.Test;
import org.w3c.dom.Element;
-import java.util.Set;
-
import static com.yahoo.collections.CollectionUtil.first;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -28,7 +26,7 @@ public class FilterBindingsTest extends DomBuilderTest {
private static final BindingPattern MY_CHAIN_BINDING = UserBindingPattern.fromHttpPath("/my-chain-binding");
private Http buildHttp(Element xml) {
- Http http = new HttpBuilder(Set.of()).build(root.getDeployState(), root, xml);
+ Http http = new HttpBuilder().build(root.getDeployState(), root, xml);
root.freezeModelTopology();
http.validate();
return http;
@@ -110,21 +108,4 @@ public class FilterBindingsTest extends DomBuilderTest {
}
}
- @Test
- void filter_binding_ports_are_overriden() {
- Element xml = parse(
- "<http>",
- " <filtering>",
- " <request-chain id='my-request-chain'>",
- " <binding>http://*/my-binding</binding>",
- " </request-chain>",
- " </filtering>",
- "</http>");
- Http http = new HttpBuilder(Set.of(4443)).build(root.getDeployState(), root, xml);
- root.freezeModelTopology();
- http.validate();
- FilterBinding binding = first(http.getBindings());
- assertEquals("my-request-chain", binding.chainId().getName());
- assertEquals("http://*:4443/my-binding", binding.binding().patternString());
- }
}