diff options
author | HÃ¥kon Hallingstad <hakon.hallingstad@gmail.com> | 2023-06-01 12:51:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-01 12:51:49 +0200 |
commit | dcdf623371e754bcc7ac2f014e11a37fcccd22e2 (patch) | |
tree | 31b99c67387c053fa02ade95e0c32e716ea806eb /node-repository | |
parent | 836ef7c6cbbcd9bbea321f459ea26954b3dd9c9c (diff) | |
parent | 4cc024427cbde5db3fcc93718fd71e76278465bd (diff) |
Merge pull request #27251 from vespa-engine/freva/serialize-cloud-account
Update CloudAccount serialization
Diffstat (limited to 'node-repository')
32 files changed, 767 insertions, 293 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/archives.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/archives.json index 738d8ee1bb3..51fd7201295 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/archives.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/archives.json @@ -9,7 +9,7 @@ "uri": "ftp://host/dir/" }, { - "account": "777888999000", + "account": "aws:777888999000", "uri": "s3://acc-bucket/" } ] diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json index 42ca28a09d5..a314afebd06 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/controller1.json @@ -6,8 +6,24 @@ "hostname": "controller1.yahoo.com", "flavor": "default", "cpuCores": 2.0, - "resources":{"vcpu":2.0,"memoryGb":16.0,"diskGb":400.0,"bandwidthGbps":10.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":2.0,"memoryGb":16.0,"diskGb":400.0,"bandwidthGbps":10.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 2.0, + "memoryGb": 16.0, + "diskGb": 400.0, + "bandwidthGbps": 10.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 2.0, + "memoryGb": 16.0, + "diskGb": 400.0, + "bandwidthGbps": 10.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -31,9 +47,7 @@ "agent": "operator" } ], - "ipAddresses": [ - "127.0.0.1" - ], + "ipAddresses": ["127.0.0.1"], "additionalIpAddresses": [], - "cloudAccount":"111222333444" + "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json index b2212179647..a1d38ed0e22 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/docker-container1.json @@ -6,8 +6,24 @@ "hostname": "test-node-pool-102-2", "parentHostname": "dockerhost3.yahoo.com", "flavor": "[vcpu: 1.0, memory: 4.0 Gb, disk: 100.0 Gb, bandwidth: 1.0 Gbps, storage type: remote, architecture: x86_64]", - "resources":{"vcpu":1.0,"memoryGb":4.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":1.0,"memoryGb":4.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant3", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":1.0, "memoryGb":4.0, "diskGb":100.0, "bandwidthGbps":1.0,"diskSpeed":"fast", "storageType":"any","architecture":"any" }, + "requestedResources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "failCount": 0, @@ -63,9 +87,7 @@ "agent": "application" } ], - "ipAddresses": [ - "::102:2" - ], + "ipAddresses": ["::102:2"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "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 b5e8a040c30..cc38ae425b1 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost1.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":4.0, "memoryGb":32.0, "diskGb":1600.0, "bandwidthGbps":20.0, "diskSpeed": "fast", "storageType":"remote","architecture":"x86_64" }, + "requestedResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "currentOsVersion": "7.5.2", @@ -90,14 +114,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.100.1", - "::100:1" - ], - "additionalIpAddresses": [ - "::100:2", - "::100:3", - "::100:4" - ], - "cloudAccount": "111222333444" + "ipAddresses": ["127.0.100.1", "::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 afed3b4e17e..9094844126c 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost1.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -32,7 +48,7 @@ "bandwidthGbps": 20.0, "diskSpeed": "fast", "storageType": "remote", - "architecture":"x86_64" + "architecture": "x86_64" }, "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -107,15 +123,8 @@ "agent": "system" } ], - "ipAddresses": [ - "127.0.100.1", - "::100:1" - ], - "additionalIpAddresses": [ - "::100:2", - "::100:3", - "::100:4" - ], + "ipAddresses": ["127.0.100.1", "::100:1"], + "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "reports": { "actualCpuCores": { "createdMillis": 3 @@ -126,12 +135,9 @@ "type": "HARD_FAIL", "details": { "inGib": 3, - "disks": [ - "/dev/sda1", - "/dev/sdb3" - ] + "disks": ["/dev/sda1", "/dev/sdb3"] } } }, - "cloudAccount": "111222333444" + "cloudAccount": "aws:111222333444" } 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 1c366d634cc..158c5388c72 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost1.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -32,7 +48,7 @@ "bandwidthGbps": 20.0, "diskSpeed": "fast", "storageType": "remote", - "architecture":"x86_64" + "architecture": "x86_64" }, "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -107,19 +123,12 @@ "agent": "system" } ], - "ipAddresses": [ - "127.0.100.1", - "::100:1" - ], - "additionalIpAddresses": [ - "::100:2", - "::100:3", - "::100:4" - ], + "ipAddresses": ["127.0.100.1", "::100:1"], + "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "reports": { "actualCpuCores": { "createdMillis": 3 } }, - "cloudAccount": "111222333444" + "cloudAccount": "aws:111222333444" } 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 98e3920b910..0984a08ad9f 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost1.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -32,7 +48,7 @@ "bandwidthGbps": 20.0, "diskSpeed": "fast", "storageType": "remote", - "architecture":"x86_64" + "architecture": "x86_64" }, "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -107,14 +123,7 @@ "agent": "system" } ], - "ipAddresses": [ - "127.0.100.1", - "::100:1" - ], - "additionalIpAddresses": [ - "::100:2", - "::100:3", - "::100:4" - ], - "cloudAccount": "111222333444" + "ipAddresses": ["127.0.100.1", "::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 dbe0222a848..5a6e8f943cd 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost1.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -32,7 +48,7 @@ "bandwidthGbps": 20.0, "diskSpeed": "fast", "storageType": "remote", - "architecture":"x86_64" + "architecture": "x86_64" }, "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -107,15 +123,8 @@ "agent": "system" } ], - "ipAddresses": [ - "127.0.100.1", - "::100:1" - ], - "additionalIpAddresses": [ - "::100:2", - "::100:3", - "::100:4" - ], + "ipAddresses": ["127.0.100.1", "::100:1"], + "additionalIpAddresses": ["::100:2", "::100:3", "::100:4"], "reports": { "actualCpuCores": { "createdMillis": 1, @@ -129,12 +138,9 @@ "type": "HARD_FAIL", "details": { "inGib": 3, - "disks": [ - "/dev/sda1", - "/dev/sdb3" - ] + "disks": ["/dev/sda1", "/dev/sdb3"] } } }, - "cloudAccount": "111222333444" + "cloudAccount": "aws:111222333444" } 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 b5c61780c51..7327d003329 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost1.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":4.0, "memoryGb":32.0, "diskGb":1600.0, "bandwidthGbps":20.0, "diskSpeed":"fast", "storageType":"remote","architecture":"x86_64" }, + "requestedResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "deferOsUpgrade": true, @@ -89,14 +113,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.100.1", - "::100:1" - ], - "additionalIpAddresses": [ - "::100:2", - "::100:3", - "::100:4" - ], - "cloudAccount": "111222333444" + "ipAddresses": ["127.0.100.1", "::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 f7e02261065..61b664aeba4 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost2.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":4.0, "memoryGb":32.0, "diskGb":1600.0, "bandwidthGbps":20.0, "diskSpeed":"fast", "storageType":"remote","architecture":"x86_64" }, + "requestedResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "deferOsUpgrade": true, @@ -89,15 +113,8 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.101.1", - "::101:1" - ], - "additionalIpAddresses": [ - "::101:2", - "::101:3", - "::101:4" - ], - "cloudAccount": "777888999000", - "wireguardPubkey":"000011112222333344445555666677778888999900c=" + "ipAddresses": ["127.0.101.1", "::101:1"], + "additionalIpAddresses": ["::101:2", "::101:3", "::101:4"], + "cloudAccount": "aws:777888999000", + "wireguardPubkey": "000011112222333344445555666677778888999900c=" } 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 480e8f7f910..af523551bfa 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost3.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":4.0, "memoryGb":32.0, "diskGb":1600.0, "bandwidthGbps":20.0, "diskSpeed":"fast", "storageType":"remote","architecture":"x86_64" }, + "requestedResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "deferOsUpgrade": true, @@ -89,14 +113,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.102.1", - "::102:1" - ], - "additionalIpAddresses": [ - "::102:2", - "::102:3", - "::102:4" - ], - "cloudAccount": "111222333444" + "ipAddresses": ["127.0.102.1", "::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 163a3d7c244..826ee793b22 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost4.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":4.0, "memoryGb":32.0, "diskGb":1600.0, "bandwidthGbps":20.0, "diskSpeed":"fast", "storageType":"remote","architecture":"x86_64" }, + "requestedResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "deferOsUpgrade": true, @@ -89,14 +113,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.103.1", - "::103:1" - ], - "additionalIpAddresses": [ - "::103:2", - "::103:3", - "::103:4" - ], - "cloudAccount": "111222333444" + "ipAddresses": ["127.0.103.1", "::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 c160c5dcdfe..459d51ce5bc 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost5.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":4.0, "memoryGb":32.0, "diskGb":1600.0, "bandwidthGbps":20.0, "diskSpeed":"fast", "storageType":"remote","architecture":"x86_64" }, + "requestedResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "deferOsUpgrade": true, @@ -89,14 +113,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.104.1", - "::104:1" - ], - "additionalIpAddresses": [ - "::104:2", - "::104:3", - "::104:4" - ], - "cloudAccount": "111222333444" + "ipAddresses": ["127.0.104.1", "::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 6d62c31ce56..8bdcd8c44c5 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 @@ -6,8 +6,24 @@ "hostname": "dockerhost1.yahoo.com", "flavor": "large", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "owner": { "tenant": "zoneapp", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":4.0, "memoryGb":32.0, "diskGb":1600.0, "bandwidthGbps":20.0, "diskSpeed":"fast", "storageType":"remote","architecture":"x86_64" }, + "requestedResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "deferOsUpgrade": true, @@ -101,14 +125,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.100.1", - "::100:1" - ], - "additionalIpAddresses": [ - "::100:2", - "::100:3", - "::100:4" - ], - "cloudAccount": "111222333444" + "ipAddresses": ["127.0.100.1", "::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/dockerhost6.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost6.json index add2fcf87a8..b4be3fe418c 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost6.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/dockerhost6.json @@ -6,8 +6,24 @@ "hostname": "dockerhost6.yahoo.com", "flavor": "arm64", "cpuCores": 4.0, - "resources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"arm64"}, - "realResources":{"vcpu":4.0,"memoryGb":32.0,"diskGb":1600.0,"bandwidthGbps":20.0,"diskSpeed":"fast","storageType":"remote","architecture":"arm64"}, + "resources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "arm64" + }, + "realResources": { + "vcpu": 4.0, + "memoryGb": 32.0, + "diskGb": 1600.0, + "bandwidthGbps": 20.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "arm64" + }, "environment": "BARE_METAL", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -69,5 +85,5 @@ ], "ipAddresses": [], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "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 0cd34f3551e..cddf865361a 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 @@ -5,8 +5,24 @@ "type": "tenant", "hostname": "host1.yahoo.com", "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk: 50.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant1", @@ -24,7 +40,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":2.0, "memoryGb":8.0, "diskGb":50.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any","architecture":"any" }, + "requestedResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "failCount": 0, @@ -52,7 +76,8 @@ { "event": "activated", "at": 123, - "agent": "application"} + "agent": "application" + } ], "log": [ { @@ -86,10 +111,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.1.1", - "::1:1" - ], + "ipAddresses": ["127.0.1.1", "::1:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "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 4125f6e4913..7ccc0660548 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 @@ -6,8 +6,24 @@ "hostname": "host10.yahoo.com", "parentHostname": "parent1.yahoo.com", "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk: 50.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant1", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":2.0, "memoryGb":8.0, "diskGb":50.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any","architecture":"any" }, + "requestedResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "vespaVersion": "5.104.142", @@ -90,10 +114,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.10.1", - "::10:1" - ], + "ipAddresses": ["127.0.10.1", "::10:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json index 892bb412edf..60c55713b03 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node11.json @@ -6,8 +6,24 @@ "hostname": "host11.yahoo.com", "parentHostname": "parent.host.yahoo.com", "flavor": "[vcpu: 1.0, memory: 1.0 Gb, disk: 100.0 Gb, bandwidth: 0.3 Gbps, architecture: any]", - "resources":{"vcpu":1.0,"memoryGb":1.0,"diskGb":100.0,"bandwidthGbps":0.3,"diskSpeed":"fast","storageType":"any","architecture":"any"}, - "realResources":{"vcpu":1.0,"memoryGb":1.0,"diskGb":100.0,"bandwidthGbps":0.3,"diskSpeed":"fast","storageType":"any","architecture":"any"}, + "resources": { + "vcpu": 1.0, + "memoryGb": 1.0, + "diskGb": 100.0, + "bandwidthGbps": 0.3, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, + "realResources": { + "vcpu": 1.0, + "memoryGb": 1.0, + "diskGb": 100.0, + "bandwidthGbps": 0.3, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "environment": "DOCKER_CONTAINER", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -31,10 +47,7 @@ "agent": "operator" } ], - "ipAddresses": [ - "::11" - ], - "additionalIpAddresses": [ - ], - "cloudAccount":"111222333444" + "ipAddresses": ["::11"], + "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 815a9a3d2d2..7266343069e 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 @@ -5,8 +5,24 @@ "type": "tenant", "hostname": "host2.yahoo.com", "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk: 50.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant2", @@ -24,7 +40,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":2.0, "memoryGb":8.0, "diskGb":50.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any","architecture":"any" }, + "requestedResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "failCount": 0, @@ -87,10 +111,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.2.1", - "::2:1" - ], + "ipAddresses": ["127.0.2.1", "::2:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "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 23f3594bba4..1c7162f64d4 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 @@ -5,8 +5,24 @@ "type": "tenant", "hostname": "host3.yahoo.com", "flavor": "[vcpu: 0.5, memory: 48.0 Gb, disk: 500.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":0.5,"memoryGb":48.0,"diskGb":500.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":0.5,"memoryGb":48.0,"diskGb":500.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 0.5, + "memoryGb": 48.0, + "diskGb": 500.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 0.5, + "memoryGb": 48.0, + "diskGb": 500.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -45,10 +61,7 @@ "agent": "system" } ], - "ipAddresses": [ - "127.0.3.1", - "::3:1" - ], + "ipAddresses": ["127.0.3.1", "::3:1"], "additionalIpAddresses": [], - "cloudAccount": "777888999000" + "cloudAccount": "aws:777888999000" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json index 03621c40f67..950a69958d0 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node4-after-changes.json @@ -7,8 +7,24 @@ "parentHostname": "parent.yahoo.com", "flavor": "d-2-8-100", "cpuCores": 2.0, - "resources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant3", @@ -26,7 +42,15 @@ "currentRestartGeneration": 1, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":1.0, "memoryGb":4.0, "diskGb":100.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any","architecture":"any" }, + "requestedResources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "orchestratorStatus": "ALLOWED_TO_BE_DOWN", "suspendedSinceMillis": 0, "rebootGeneration": 2, @@ -133,10 +157,7 @@ "agent": "operator" } ], - "ipAddresses": [ - "127.0.0.1", - "::1" - ], + "ipAddresses": ["127.0.0.1", "::1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "cloudAccount": "aws:111222333444" } 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 0993c3fbcc2..7961fb08719 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 @@ -6,8 +6,24 @@ "hostname": "host4.yahoo.com", "parentHostname": "dockerhost1.yahoo.com", "flavor": "[vcpu: 1.0, memory: 4.0 Gb, disk: 100.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":1.0,"memoryGb":4.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":1.0,"memoryGb":4.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant3", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":1.0, "memoryGb":4.0, "diskGb":100.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any","architecture":"any" }, + "requestedResources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "vespaVersion": "6.41.0", @@ -90,11 +114,8 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.4.1", - "::4:1" - ], + "ipAddresses": ["127.0.4.1", "::4:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444", + "cloudAccount": "aws:111222333444", "wireguardPubkey": "lololololololololololololololololololololoo=" } 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 8232e6c7085..ca9cf44df80 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 @@ -6,8 +6,24 @@ "hostname": "host4.yahoo.com", "parentHostname": "dockerhost1.yahoo.com", "flavor": "[vcpu: 1.0, memory: 4.0 Gb, disk: 100.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":1.0,"memoryGb":4.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":1.0,"memoryGb":4.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant3", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":1.0, "memoryGb":4.0, "diskGb":100.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any","architecture":"any" }, + "requestedResources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "vespaVersion": "6.41.0", @@ -90,11 +114,8 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.4.1", - "::4:1" - ], + "ipAddresses": ["127.0.4.1", "::4:1"], "additionalIpAddresses": [], - "additionalHostnames": ["a","b"], - "cloudAccount": "111222333444" + "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 5f25bac926b..626765239e6 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 @@ -6,8 +6,24 @@ "hostname": "host4.yahoo.com", "parentHostname": "dockerhost1.yahoo.com", "flavor": "[vcpu: 1.0, memory: 4.0 Gb, disk: 100.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":1.0,"memoryGb":4.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":1.0,"memoryGb":4.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant3", @@ -25,7 +41,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":1.0, "memoryGb":4.0, "diskGb":100.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any","architecture":"any" }, + "requestedResources": { + "vcpu": 1.0, + "memoryGb": 4.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "vespaVersion": "6.41.0", @@ -90,10 +114,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.4.1", - "::4:1" - ], + "ipAddresses": ["127.0.4.1", "::4:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "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 18829647a2a..bf2f37d7c50 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 @@ -6,8 +6,24 @@ "hostname": "host5.yahoo.com", "parentHostname": "dockerhost2.yahoo.com", "flavor": "[vcpu: 1.0, memory: 8.0 Gb, disk: 100.0 Gb, bandwidth: 1.0 Gbps, disk speed: slow, storage type: remote, architecture: x86_64]", - "resources":{"vcpu":1.0,"memoryGb":8.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"slow","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":1.0,"memoryGb":8.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"slow","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 1.0, + "memoryGb": 8.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "slow", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 1.0, + "memoryGb": 8.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "slow", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -56,10 +72,7 @@ "agent": "system" } ], - "ipAddresses": [ - "127.0.5.1", - "::5:1" - ], + "ipAddresses": ["127.0.5.1", "::5:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "cloudAccount": "aws:111222333444" } 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 a2633c5d71c..2d74768e53c 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 @@ -6,8 +6,24 @@ "hostname": "host5.yahoo.com", "parentHostname": "dockerhost2.yahoo.com", "flavor": "[vcpu: 1.0, memory: 8.0 Gb, disk: 100.0 Gb, bandwidth: 1.0 Gbps, disk speed: slow, storage type: remote, architecture: x86_64]", - "resources":{"vcpu":1.0,"memoryGb":8.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"slow","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":1.0,"memoryGb":8.0,"diskGb":100.0,"bandwidthGbps":1.0,"diskSpeed":"slow","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 1.0, + "memoryGb": 8.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "slow", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 1.0, + "memoryGb": 8.0, + "diskGb": 100.0, + "bandwidthGbps": 1.0, + "diskSpeed": "slow", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -58,10 +74,7 @@ "agent": "system" } ], - "ipAddresses": [ - "127.0.5.1", - "::5:1" - ], + "ipAddresses": ["127.0.5.1", "::5:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "cloudAccount": "aws:111222333444" } 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 be0efad7f82..2961434af8f 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 @@ -5,8 +5,24 @@ "type": "tenant", "hostname": "host55.yahoo.com", "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk: 50.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -40,10 +56,7 @@ "agent": "system" } ], - "ipAddresses": [ - "127.0.55.1", - "::55:1" - ], + "ipAddresses": ["127.0.55.1", "::55:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "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 b16b9dfe3cd..a304de951ed 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 @@ -5,8 +5,24 @@ "type": "tenant", "hostname": "host6.yahoo.com", "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk: 50.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "owner": { "tenant": "tenant2", @@ -24,7 +40,15 @@ "currentRestartGeneration": 0, "wantedDockerImage": "docker-registry.domain.tld:8080/dist/vespa:6.42.0", "wantedVespaVersion": "6.42.0", - "requestedResources": { "vcpu":2.0, "memoryGb":8.0, "diskGb":50.0, "bandwidthGbps":1.0, "diskSpeed":"fast", "storageType":"any","architecture":"any" }, + "requestedResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "any", + "architecture": "any" + }, "rebootGeneration": 0, "currentRebootGeneration": 0, "failCount": 0, @@ -87,10 +111,7 @@ "agent": "application" } ], - "ipAddresses": [ - "127.0.6.1", - "::6:1" - ], + "ipAddresses": ["127.0.6.1", "::6:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "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 806e1ddc705..9c77c7778e0 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 @@ -5,8 +5,24 @@ "type": "tenant", "hostname": "host7.yahoo.com", "flavor": "[vcpu: 2.0, memory: 8.0 Gb, disk: 50.0 Gb, bandwidth: 1.0 Gbps, storage type: local, architecture: x86_64]", - "resources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, - "realResources":{"vcpu":2.0,"memoryGb":8.0,"diskGb":50.0,"bandwidthGbps":1.0,"diskSpeed":"fast","storageType":"local","architecture":"x86_64"}, + "resources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 2.0, + "memoryGb": 8.0, + "diskGb": 50.0, + "bandwidthGbps": 1.0, + "diskSpeed": "fast", + "storageType": "local", + "architecture": "x86_64" + }, "environment": "DOCKER_CONTAINER", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -30,10 +46,7 @@ "agent": "system" } ], - "ipAddresses": [ - "127.0.7.1", - "::7:1" - ], + "ipAddresses": ["127.0.7.1", "::7:1"], "additionalIpAddresses": [], - "cloudAccount": "111222333444" + "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json index bbef88ca1b0..08c5c0a13c6 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node8.json @@ -50,5 +50,5 @@ ], "ipAddresses": ["127.0.8.1"], "additionalIpAddresses": ["127.0.8.2"], - "cloudAccount":"111222333444" + "cloudAccount": "aws:111222333444" } diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json index e9199905b21..0285975f9af 100644 --- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json +++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/restapi/responses/node9.json @@ -6,8 +6,24 @@ "hostname": "host9.yahoo.com", "flavor": "large-variant", "cpuCores": 64.0, - "resources":{"vcpu":64.0,"memoryGb":128.0,"diskGb":2000.0,"bandwidthGbps":15.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources":{"vcpu":64.0,"memoryGb":128.0,"diskGb":2000.0,"bandwidthGbps":15.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 64.0, + "memoryGb": 128.0, + "diskGb": 2000.0, + "bandwidthGbps": 15.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 64.0, + "memoryGb": 128.0, + "diskGb": 2000.0, + "bandwidthGbps": 15.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -32,11 +48,8 @@ "agent": "operator" } ], - "ipAddresses": [ - "127.0.9.1", - "::9:1" - ], + "ipAddresses": ["127.0.9.1", "::9:1"], "additionalIpAddresses": [], "additionalHostnames": ["node9-1.yahoo.com"], - "cloudAccount":"111222333444" + "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 cfcc59a3454..a8759423ecd 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 @@ -8,8 +8,24 @@ "reservedTo": "myTenant", "exclusiveTo": "tenant1:app1:instance1", "cpuCores": 64.0, - "resources": {"vcpu":64.0,"memoryGb":128.0,"diskGb":2000.0,"bandwidthGbps":15.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, - "realResources": {"vcpu":64.0,"memoryGb":128.0,"diskGb":2000.0,"bandwidthGbps":15.0,"diskSpeed":"fast","storageType":"remote","architecture":"x86_64"}, + "resources": { + "vcpu": 64.0, + "memoryGb": 128.0, + "diskGb": 2000.0, + "bandwidthGbps": 15.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, + "realResources": { + "vcpu": 64.0, + "memoryGb": 128.0, + "diskGb": 2000.0, + "bandwidthGbps": 15.0, + "diskSpeed": "fast", + "storageType": "remote", + "architecture": "x86_64" + }, "environment": "BARE_METAL", "rebootGeneration": 0, "currentRebootGeneration": 0, @@ -34,10 +50,7 @@ "agent": "operator" } ], - "ipAddresses": [ - "127.0.127.1", - "::127:1" - ], + "ipAddresses": ["127.0.127.1", "::127:1"], "additionalIpAddresses": [], - "cloudAccount":"111222333444" + "cloudAccount": "aws:111222333444" } |