diff options
| author | Martin Polden <mpolden@mpolden.no> | 2018-10-25 11:27:21 +0200 |
|---|---|---|
| committer | Martin Polden <mpolden@mpolden.no> | 2018-10-25 11:27:21 +0200 |
| commit | 7be06f53885a0d57028e91abdc70712fb9829b93 (patch) | |
| tree | 3e7cf808161b191e297930c6f297cfa57e151adf /node-repository | |
| parent | 109c797d791525325a461aca2114353f0aee5da1 (diff) | |
Update REST API test
Diffstat (limited to 'node-repository')
2 files changed, 19 insertions, 42 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java index ebcc46d5661..2ff1e403e35 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/RestApiTest.java @@ -354,7 +354,7 @@ public class RestApiTest { @Test public void acl_request_by_docker_host() throws Exception { - assertFile(new Request("http://localhost:8080/nodes/v2/acl/dockerhost1.yahoo.com"), "acl-docker-host.json"); + assertFile(new Request("http://localhost:8080/nodes/v2/acl/dockerhost1.yahoo.com?children=true"), "acl-docker-host.json"); } @Test diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-docker-host.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-docker-host.json index 4d6607bd1b0..abf3c39001f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-docker-host.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/v2/responses/acl-docker-host.json @@ -4,85 +4,62 @@ "hostname": "cfg1.yahoo.com", "type": "config", "ipAddress": "127.0.1.1", - "trustedBy": "dockerhost1.yahoo.com" + "trustedBy": "host4.yahoo.com" }, { "hostname": "cfg2.yahoo.com", "type": "config", "ipAddress": "127.0.1.2", - "trustedBy": "dockerhost1.yahoo.com" + "trustedBy": "host4.yahoo.com" }, { "hostname": "dockerhost1.yahoo.com", "type": "host", "ipAddress": "::1", - "trustedBy": "dockerhost1.yahoo.com" + "trustedBy": "host4.yahoo.com" }, { "hostname": "dockerhost1.yahoo.com", "type": "host", "ipAddress": "127.0.0.1", - "trustedBy": "dockerhost1.yahoo.com" - }, - { - "hostname": "dockerhost2.yahoo.com", - "type": "host", - "ipAddress": "::1", - "trustedBy": "dockerhost1.yahoo.com" - }, - { - "hostname": "dockerhost2.yahoo.com", - "type": "host", - "ipAddress": "127.0.0.1", - "trustedBy": "dockerhost1.yahoo.com" + "trustedBy": "host4.yahoo.com" }, { "hostname": "dockerhost3.yahoo.com", "type": "host", "ipAddress": "::1", - "trustedBy": "dockerhost1.yahoo.com" + "trustedBy": "host4.yahoo.com" }, { "hostname": "dockerhost3.yahoo.com", "type": "host", "ipAddress": "127.0.0.1", - "trustedBy": "dockerhost1.yahoo.com" + "trustedBy": "host4.yahoo.com" }, { - "hostname": "dockerhost4.yahoo.com", - "type": "host", + "hostname": "host4.yahoo.com", + "type": "tenant", "ipAddress": "::1", - "trustedBy": "dockerhost1.yahoo.com" + "trustedBy": "host4.yahoo.com" }, { - "hostname": "dockerhost4.yahoo.com", - "type": "host", + "hostname": "host4.yahoo.com", + "type": "tenant", "ipAddress": "127.0.0.1", - "trustedBy": "dockerhost1.yahoo.com" + "trustedBy": "host4.yahoo.com" }, { - "hostname": "dockerhost5.yahoo.com", - "type": "host", - "ipAddress": "::1", - "trustedBy": "dockerhost1.yahoo.com" - }, - { - "hostname": "dockerhost5.yahoo.com", - "type": "host", - "ipAddress": "127.0.0.1", - "trustedBy": "dockerhost1.yahoo.com" - } - ], - "trustedNetworks": [ - { - "network": "172.17.0.0/16", - "trustedBy": "dockerhost1.yahoo.com" + "hostname": "test-container-1", + "type": "tenant", + "ipAddress": "::2", + "trustedBy": "host4.yahoo.com" } ], + "trustedNetworks": [], "trustedPorts": [ { "port": 22, - "trustedBy": "dockerhost1.yahoo.com" + "trustedBy": "host4.yahoo.com" } ] } |