diff options
Diffstat (limited to 'node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses')
29 files changed, 34 insertions, 33 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/acl-config-server.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/acl-config-server.json index e3b487325f8..9ac7fcadefe 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/acl-config-server.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/acl-config-server.json @@ -81,7 +81,7 @@ { "hostname": "host13.yahoo.com", "type": "tenant", - "ipAddress": "127.0.13.1", + "ipAddress": "::13:1", "ports": [ 19070 ], @@ -90,7 +90,7 @@ { "hostname": "host13.yahoo.com", "type": "tenant", - "ipAddress": "::13:1", + "ipAddress": "127.0.13.1", "ports": [ 19070 ], diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json index 54a0e7e9757..4a55128e831 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg1.json @@ -114,8 +114,8 @@ } ], "ipAddresses": [ - "127.0.201.1", - "::201:1" + "::201:1", + "127.0.201.1" ], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444", diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json index 7f9830ac1e8..a45800771eb 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/cfg2.json @@ -114,8 +114,8 @@ } ], "ipAddresses": [ - "127.0.202.1", - "::202:1" + "::202:1", + "127.0.202.1" ], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json index 84b34a72e78..03fc9ddec8f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-os-upgrade-complete.json @@ -115,7 +115,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.100.1", "::100:1"], + "ipAddresses": ["::100:1", "127.0.100.1"], "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-2.json index bc1c11c8d06..36403ed66d5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-2.json @@ -124,7 +124,7 @@ "agent": "system" } ], - "ipAddresses": ["127.0.100.1", "::100:1"], + "ipAddresses": ["::100:1", "127.0.100.1"], "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "reports": { "actualCpuCores": { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-3.json index 3b7970a9ec0..7665188a6e7 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-3.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-3.json @@ -124,7 +124,7 @@ "agent": "system" } ], - "ipAddresses": ["127.0.100.1", "::100:1"], + "ipAddresses": ["::100:1", "127.0.100.1"], "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "reports": { "actualCpuCores": { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-4.json index d99e71bab49..411a55fe499 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-4.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports-4.json @@ -124,7 +124,7 @@ "agent": "system" } ], - "ipAddresses": ["127.0.100.1", "::100:1"], + "ipAddresses": ["::100:1", "127.0.100.1"], "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports.json index 88bfd9d9418..ffeda0c6113 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1-reports.json @@ -124,7 +124,7 @@ "agent": "system" } ], - "ipAddresses": ["127.0.100.1", "::100:1"], + "ipAddresses": ["::100:1", "127.0.100.1"], "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "reports": { "actualCpuCores": { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1.json index f70b2dc1b72..903ee9c23a1 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node1.json @@ -114,7 +114,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.100.1", "::100:1"], + "ipAddresses": ["::100:1", "127.0.100.1"], "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json index d3f1a8082ae..0ddacb1e381 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node2.json @@ -114,7 +114,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.101.1", "::101:1"], + "ipAddresses": ["::101:1", "127.0.101.1"], "additionalIpAddresses": ["::101:2", "::101:3", "::101:4"], "cloudAccount": "aws:777888999000", "wireguard": { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node3.json index c597b7afa14..5a1a6c79340 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node3.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node3.json @@ -114,7 +114,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.102.1", "::102:1"], + "ipAddresses": ["::102:1", "127.0.102.1"], "additionalIpAddresses": ["::102:2", "::102:3", "::102:4"], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node4.json index 8a85d55e0df..7166236dc01 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node4.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node4.json @@ -114,7 +114,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.103.1", "::103:1"], + "ipAddresses": ["::103:1", "127.0.103.1"], "additionalIpAddresses": ["::103:2", "::103:3", "::103:4"], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node5.json index 70b5e465de8..4feab74a85a 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node5.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-node5.json @@ -114,7 +114,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.104.1", "::104:1"], + "ipAddresses": ["::104:1", "127.0.104.1"], "additionalIpAddresses": ["::104:2", "::104:3", "::104:4"], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost1-with-firmware-data.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost1-with-firmware-data.json index 85b49dd5113..ad8021315ac 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost1-with-firmware-data.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost1-with-firmware-data.json @@ -126,7 +126,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.100.1", "::100:1"], + "ipAddresses": ["::100:1", "127.0.100.1"], "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node1.json index c39c5fca4ef..a6202f8f273 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node1.json @@ -112,7 +112,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.1.1", "::1:1"], + "ipAddresses": ["::1:1", "127.0.1.1"], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node10.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node10.json index 3f0ba1dcbec..3e5bc9ccc5c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node10.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node10.json @@ -115,7 +115,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.10.1", "::10:1"], + "ipAddresses": ["::10:1", "127.0.10.1"], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node13.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node13.json index a0b00877dca..e87924b9805 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node13.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node13.json @@ -74,8 +74,8 @@ } ], "ipAddresses": [ - "127.0.13.1", - "::13:1" + "::13:1", + "127.0.13.1" ], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node14.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node14.json index 6657f6ba609..7ceeeae7763 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node14.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node14.json @@ -74,8 +74,8 @@ } ], "ipAddresses": [ - "127.0.14.1", - "::14:1" + "::14:1", + "127.0.14.1" ], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node2.json index 342a5e861df..75e2b0b021d 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node2.json @@ -112,7 +112,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.2.1", "::2:1"], + "ipAddresses": ["::2:1", "127.0.2.1"], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json index d9cd6ef9f29..268f1074b6f 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node3.json @@ -62,7 +62,7 @@ "agent": "system" } ], - "ipAddresses": ["127.0.3.1", "::3:1"], + "ipAddresses": ["::3:1", "127.0.3.1"], "additionalIpAddresses": [], "cloudAccount": "aws:777888999000" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-wg.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-wg.json index 404cf9a9a80..20ed276a1c8 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-wg.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-wg.json @@ -115,7 +115,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.4.1", "::4:1"], + "ipAddresses": ["::4:1", "127.0.4.1"], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444", "wireguard": { diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-with-hostnames.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-with-hostnames.json index 8a8d45c7e65..608448907f4 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-with-hostnames.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-with-hostnames.json @@ -115,7 +115,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.4.1", "::4:1"], + "ipAddresses": ["::4:1", "127.0.4.1"], "additionalIpAddresses": [], "additionalHostnames": ["a", "b"], "cloudAccount": "aws:111222333444" diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4.json index 396ab1c5675..d40b5c70bed 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4.json @@ -115,7 +115,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.4.1", "::4:1"], + "ipAddresses": ["::4:1", "127.0.4.1"], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json index 015a52d3446..fafaf61ef78 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5-after-changes.json @@ -73,7 +73,7 @@ "agent": "system" } ], - "ipAddresses": ["127.0.5.1", "::5:1"], + "ipAddresses": ["::5:1", "127.0.5.1"], "additionalIpAddresses": [], "cloudAccount": "aws:777888999000" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json index 900f360bc9e..aae4fe84fb8 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node5.json @@ -75,7 +75,7 @@ "agent": "system" } ], - "ipAddresses": ["127.0.5.1", "::5:1"], + "ipAddresses": ["::5:1", "127.0.5.1"], "additionalIpAddresses": [], "cloudAccount": "aws:777888999000" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json index bbc51dc8e5e..7b0ca88a837 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node55.json @@ -57,7 +57,7 @@ "agent": "system" } ], - "ipAddresses": ["127.0.55.1", "::55:1"], + "ipAddresses": ["::55:1", "127.0.55.1"], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6.json index 69a5282e48a..946ef4277a5 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node6.json @@ -112,7 +112,7 @@ "agent": "application" } ], - "ipAddresses": ["127.0.6.1", "::6:1"], + "ipAddresses": ["::6:1", "127.0.6.1"], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node7.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node7.json index 2b05b21639d..a5d84ad6f8c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node7.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node7.json @@ -47,7 +47,7 @@ "agent": "system" } ], - "ipAddresses": ["127.0.7.1", "::7:1"], + "ipAddresses": ["::7:1", "127.0.7.1"], "additionalIpAddresses": [], "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json index 9979f5fc5c7..4bdd0d41999 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/parent2.json @@ -7,6 +7,7 @@ "flavor": "large-variant", "reservedTo": "myTenant", "exclusiveTo": "tenant1:app1:instance1", + "provisionedFor": "tenant1:app1:instance1", "cpuCores": 64.0, "resources": { "vcpu": 64.0, |