diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-17 11:19:51 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2020-03-17 11:22:39 +0100 |
| commit | bcb71f4e17a72113d6270cd796218766a7d97f7a (patch) | |
| tree | 5d70dac3cb2102341ca76341d31566a31fb56eb3 /config-model/src/test | |
| parent | ca1eae82829cd9f2d270b2b788432a4461c1dc3e (diff) | |
Remove support for overriding application id in access-control
Diffstat (limited to 'config-model/src/test')
| -rw-r--r-- | config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java | 5 | ||||
| -rw-r--r-- | config-model/src/test/schema-test-files/services.xml | 1 |
2 files changed, 1 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java index ffcafecda52..b1e63628852 100644 --- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java +++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/AccessControlTest.java @@ -64,9 +64,7 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { Element clusterElem = DomBuilderTest.parse( " <http>", " <filtering>", - " <access-control domain='my-domain'>", - " <application>my-app</application>", - " </access-control>", + " <access-control domain='my-domain'/>", " </filtering>", " </http>"); @@ -75,7 +73,6 @@ public class AccessControlTest extends ContainerModelBuilderTestBase { AccessControl accessControl = http.getAccessControl().get(); assertEquals("Wrong domain.", "my-domain", accessControl.domain); - assertEquals("Wrong application.", "my-app", accessControl.applicationId); } @Test diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml index 253af585c73..e7ea2683e3f 100644 --- a/config-model/src/test/schema-test-files/services.xml +++ b/config-model/src/test/schema-test-files/services.xml @@ -90,7 +90,6 @@ <exclude> <binding>http//*/foo/*</binding> </exclude> - <application>my-app</application> <vespa-domain>vespa.vespa.cd</vespa-domain> </access-control> |