summaryrefslogtreecommitdiffstats
path: root/node-maintainer
diff options
context:
space:
mode:
authorValerij Fredriksen <valerijf@oath.com>2018-01-17 13:30:58 +0100
committerValerij Fredriksen <valerijf@oath.com>2018-01-17 13:30:58 +0100
commit4538061c86cf10cce8d66b698821a0557cbd1ef7 (patch)
treeb8dd6291730e719f9a2b0ab1fae4e16dc648859e /node-maintainer
parent2852d4137b5a182e9cccc29435d133242b666c6f (diff)
Remove unused test resources
Diffstat (limited to 'node-maintainer')
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/hardware/resources/nodeRepoWithoutHardwareDivergence.json78
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskInfoTest2
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskTypeInvalid2
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskTypeNonFastDisk2
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json81
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/executeTestFile.txt4
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorExceptionTest3
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorTest1
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/invalidFilesize2
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoNotInterpretableHardwareDivergence.json81
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoTest.json49
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeRepo.json78
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeRepoVirtualMachine.json50
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/pingresponse-all-packets-lost1
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/reportJSON1
15 files changed, 0 insertions, 435 deletions
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/hardware/resources/nodeRepoWithoutHardwareDivergence.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/hardware/resources/nodeRepoWithoutHardwareDivergence.json
deleted file mode 100644
index ad2444c9076..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/hardware/resources/nodeRepoWithoutHardwareDivergence.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- "url": "https://example.com:4443/zone/v2/prod/us-west-1/nodes/v2/node/host.name",
- "state": "active",
- "type": "host",
- "hostname": "host.name",
- "openStackId": "653c39c1-bda4-47ee-a277-d5319eb57af7",
- "flavor": "C-77E/256/960",
- "canonicalFlavor": "C-77E/256/960",
- "minDiskAvailableGb": 1759.84,
- "minMainMemoryAvailableGb": 4.042128,
- "description": "BARE_METAL with 48.0 CPUs, 256.0 Gb memory and 1920.0 Gb ssd",
- "minCpuCores": 4.0,
- "cost": 150,
- "fastDisk": true,
- "environment": "BARE_METAL",
- "owner": {
- "tenant": "hosted-vespa",
- "application": "routing",
- "instance": "default"
- },
- "membership": {
- "clustertype": "container",
- "clusterid": "node-admin",
- "group": "0",
- "index": 77,
- "retired": false
- },
- "restartGeneration": 0,
- "currentRestartGeneration": 0,
- "wantedDockerImage": "docker-registry:4443/vespa/ci:6.128.19",
- "wantedVespaVersion": "6.128.19",
- "rebootGeneration": 3,
- "currentRebootGeneration": 3,
- "vespaVersion": "6.130.27",
- "currentDockerImage": "docker-registry:4443/vespa/ci:6.130.27",
- "hostedVersion": "6.130.27",
- "convergedStateVersion": "6.130.27",
- "failCount": 1,
- "hardwareFailure": false,
- "wantToRetire": false,
- "wantToDeprovision": false,
- "history": [
- {
- "event": "failed",
- "at": 1499293603487,
- "agent": "system"
- },
- {
- "event": "rebooted",
- "at": 1499351267086,
- "agent": "system"
- },
- {
- "event": "readied",
- "at": 1499351270674,
- "agent": "system"
- },
- {
- "event": "requested",
- "at": 1499350936347,
- "agent": "system"
- },
- {
- "event": "reserved",
- "at": 1499353058227,
- "agent": "application"
- },
- {
- "event": "activated",
- "at": 1499353080459,
- "agent": "application"
- }
- ],
- "ipAddresses": [
- ],
- "additionalIpAddresses": [
- ]
-} \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskInfoTest b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskInfoTest
deleted file mode 100644
index 80c8b713e84..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskInfoTest
+++ /dev/null
@@ -1,2 +0,0 @@
-NAME ROTA
-vda 1 \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskTypeInvalid b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskTypeInvalid
deleted file mode 100644
index bd0824b2eba..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskTypeInvalid
+++ /dev/null
@@ -1,2 +0,0 @@
-Name Rota
-sda z \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskTypeNonFastDisk b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskTypeNonFastDisk
deleted file mode 100644
index efe71b963c1..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/DiskTypeNonFastDisk
+++ /dev/null
@@ -1,2 +0,0 @@
-Name Rota
-sda 1 \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json
deleted file mode 100644
index a3bd4957467..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
- "url": "https://example.com:4443/zone/v2/prod/us-west-1/nodes/v2/node/host.name",
- "id": "host.name",
- "state": "active",
- "type": "host",
- "hostname": "host.name",
- "openStackId": "653c39c1-bda4-47ee-a277-d5319eb57af7",
- "flavor": "C-77E/256/960",
- "canonicalFlavor": "C-77E/256/960",
- "minDiskAvailableGb": 1920.0,
- "minMainMemoryAvailableGb": 256.0,
- "description": "BARE_METAL with 48.0 CPUs, 256.0 Gb memory and 1920.0 Gb ssd",
- "minCpuCores": 48.0,
- "cost": 150,
- "fastDisk": true,
- "environment": "BARE_METAL",
- "owner": {
- "tenant": "hosted-vespa",
- "application": "routing",
- "instance": "default"
- },
- "membership": {
- "clustertype": "container",
- "clusterid": "node-admin",
- "group": "0",
- "index": 77,
- "retired": false
- },
- "restartGeneration": 0,
- "currentRestartGeneration": 0,
- "wantedDockerImage": "docker-registry:4443/vespa/ci:6.132.102",
- "wantedVespaVersion": "6.132.102",
- "rebootGeneration": 3,
- "currentRebootGeneration": 3,
- "vespaVersion": "6.132.102",
- "currentDockerImage": "docker-registry:4443/vespa/ci:6.132.102",
- "hostedVersion": "6.132.102",
- "convergedStateVersion": "6.132.102",
- "failCount": 1,
- "hardwareFailure": false,
- "wantToRetire": false,
- "wantToDeprovision": false,
- "history": [
- {
- "event": "failed",
- "at": 1499293603487,
- "agent": "system"
- },
- {
- "event": "rebooted",
- "at": 1499351267086,
- "agent": "system"
- },
- {
- "event": "readied",
- "at": 1499351270674,
- "agent": "system"
- },
- {
- "event": "requested",
- "at": 1499350936347,
- "agent": "system"
- },
- {
- "event": "reserved",
- "at": 1499353058227,
- "agent": "application"
- },
- {
- "event": "activated",
- "at": 1499353080459,
- "agent": "application"
- }
- ],
- "ipAddresses": [
- "172.16.254.1",
- "2001:db8:0:1234:0:567:8:1"
- ],
- "additionalIpAddresses": [
- ]
-} \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/executeTestFile.txt b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/executeTestFile.txt
deleted file mode 100644
index 8d4cafee461..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/executeTestFile.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-This file test
-if executeCommand
-reads
-this file properly. \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorExceptionTest b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorExceptionTest
deleted file mode 100644
index e48aae651f9..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorExceptionTest
+++ /dev/null
@@ -1,3 +0,0 @@
-Not
-valid
-hostname \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorTest b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorTest
deleted file mode 100644
index 7e62b32ad26..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/hostURLGeneratorTest
+++ /dev/null
@@ -1 +0,0 @@
-expected.hostname \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/invalidFilesize b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/invalidFilesize
deleted file mode 100644
index 3a0c1be8ef7..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/invalidFilesize
+++ /dev/null
@@ -1,2 +0,0 @@
-This should
-not 123 work \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoNotInterpretableHardwareDivergence.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoNotInterpretableHardwareDivergence.json
deleted file mode 100644
index 1bfeab96b08..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoNotInterpretableHardwareDivergence.json
+++ /dev/null
@@ -1,81 +0,0 @@
-{
- "url": "https://api.vespayahoo.com",
- "id": "id.prod.yahoo.com",
- "state": "failed",
- "type": "host",
- "hostname": "hostname",
- "openStackId": "4a8689e1-3a8e-4f50-b99f-d33b245a9661",
- "flavor": "C-2T/24/500",
- "canonicalFlavor": "C-2B/24/500",
- "minDiskAvailableGb": 500.0,
- "minMainMemoryAvailableGb": 24.0,
- "description": "BARE_METAL with 24.0 CPUs, 24.0 Gb memory and 500.0 Gb disk",
- "minCpuCores": 24.0,
- "cost": 70,
- "fastDisk": false,
- "environment": "BARE_METAL",
- "owner": {
- "tenant": "hosted-vespa",
- "application": "routing",
- "instance": "default"
- },
- "membership": {
- "clustertype": "container",
- "clusterid": "node-admin",
- "group": "0",
- "index": 32,
- "retired": false
- },
- "restartGeneration": 0,
- "currentRestartGeneration": 0,
- "wantedDockerImage": "docker-registry.ops.yahoo.com:4443/vespa/ci:6.138.1",
- "wantedVespaVersion": "6.138.1",
- "rebootGeneration": 49,
- "currentRebootGeneration": 49,
- "vespaVersion": "6.138.18",
- "currentDockerImage": "docker-registry.ops.yahoo.com:4443/vespa/ci:6.138.18",
- "hostedVersion": "6.138.18",
- "convergedStateVersion": "6.138.18",
- "failCount": 44,
- "hardwareFailure": true,
- "hardwareFailureDescription": "disk_smart",
- "wantToRetire": false,
- "wantToDeprovision": false,
- "history": [
- {
- "event": "readied",
- "at": 1501070910372,
- "agent": "system"
- },
- {
- "event": "reserved",
- "at": 1501070952692,
- "agent": "application"
- },
- {
- "event": "activated",
- "at": 1501070958698,
- "agent": "application"
- },
- {
- "event": "rebooted",
- "at": 1501656469859,
- "agent": "system"
- },
- {
- "event": "down",
- "at": 1502809344596,
- "agent": "system"
- },
- {
- "event": "failed",
- "at": 1502812976621,
- "agent": "system"
- }
- ],
- "ipAddresses": [
- ],
- "additionalIpAddresses": [
- ],
- "hardwareDivergence": "{\"hardwareDivergence\": null - it will not manage to parse this}"
-} \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoTest.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoTest.json
deleted file mode 100644
index c557afb3256..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeInfoTest.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
- "url": "https://example.com:4443/zone/v2/prod/eu-west-1/nodes/v2/node/host.name",
- "id": "host.name",
- "state": "ready",
- "type": "tenant",
- "hostname": "",
- "openStackId": "77df66c5-3cbc-4905-b0e9-f790bddd13bf",
- "fastDisk": false,
- "flavor": "C-2B/24/500",
- "canonicalFlavor": "C-2B/24/500",
- "minDiskAvailableGb": 500.0,
- "minMainMemoryAvailableGb": 24.0,
- "description": "BARE_METAL with 24.0 CPUs, 24.0 Gb memory and 500.0 Gb disk",
- "minCpuCores": 24.0,
- "cost": 66,
- "environment": "BARE_METAL",
- "rebootGeneration": 10,
- "currentRebootGeneration": 10,
- "vespaVersion": "6.120.30",
- "currentDockerImage": "docker-registry:4443/vespa/ci:6.120.30",
- "hostedVersion": "6.120.30",
- "convergedStateVersion": "6.120.30",
- "failCount": 0,
- "hardwareFailure": false,
- "wantToRetire": false,
- "wantToDeprovision": false,
- "history": [
- {
- "event": "readied",
- "at": 1489609585827,
- "agent": "system"
- },
- {
- "event": "rebooted",
- "at": 1498309261481,
- "agent": "system"
- },
- {
- "event": "requested",
- "at": 1499332178235,
- "agent": "system"
- }
- ],
- "ipAddresses": [
- "10.200.66.16"
- ],
- "additionalIpAddresses": [],
- "hardwareDivergence": "{\"benchmarkReport\": {\"cpuCyclesPerSec\": 0.5}}"
-} \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeRepo.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeRepo.json
deleted file mode 100644
index ad2444c9076..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeRepo.json
+++ /dev/null
@@ -1,78 +0,0 @@
-{
- "url": "https://example.com:4443/zone/v2/prod/us-west-1/nodes/v2/node/host.name",
- "state": "active",
- "type": "host",
- "hostname": "host.name",
- "openStackId": "653c39c1-bda4-47ee-a277-d5319eb57af7",
- "flavor": "C-77E/256/960",
- "canonicalFlavor": "C-77E/256/960",
- "minDiskAvailableGb": 1759.84,
- "minMainMemoryAvailableGb": 4.042128,
- "description": "BARE_METAL with 48.0 CPUs, 256.0 Gb memory and 1920.0 Gb ssd",
- "minCpuCores": 4.0,
- "cost": 150,
- "fastDisk": true,
- "environment": "BARE_METAL",
- "owner": {
- "tenant": "hosted-vespa",
- "application": "routing",
- "instance": "default"
- },
- "membership": {
- "clustertype": "container",
- "clusterid": "node-admin",
- "group": "0",
- "index": 77,
- "retired": false
- },
- "restartGeneration": 0,
- "currentRestartGeneration": 0,
- "wantedDockerImage": "docker-registry:4443/vespa/ci:6.128.19",
- "wantedVespaVersion": "6.128.19",
- "rebootGeneration": 3,
- "currentRebootGeneration": 3,
- "vespaVersion": "6.130.27",
- "currentDockerImage": "docker-registry:4443/vespa/ci:6.130.27",
- "hostedVersion": "6.130.27",
- "convergedStateVersion": "6.130.27",
- "failCount": 1,
- "hardwareFailure": false,
- "wantToRetire": false,
- "wantToDeprovision": false,
- "history": [
- {
- "event": "failed",
- "at": 1499293603487,
- "agent": "system"
- },
- {
- "event": "rebooted",
- "at": 1499351267086,
- "agent": "system"
- },
- {
- "event": "readied",
- "at": 1499351270674,
- "agent": "system"
- },
- {
- "event": "requested",
- "at": 1499350936347,
- "agent": "system"
- },
- {
- "event": "reserved",
- "at": 1499353058227,
- "agent": "application"
- },
- {
- "event": "activated",
- "at": 1499353080459,
- "agent": "application"
- }
- ],
- "ipAddresses": [
- ],
- "additionalIpAddresses": [
- ]
-} \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeRepoVirtualMachine.json b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeRepoVirtualMachine.json
deleted file mode 100644
index 100e9337f9d..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/nodeRepoVirtualMachine.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
- "url": "https://example.com:4443/zone/v2/prod/eu-west-1/nodes/v2/node/host.name",
- "id": "host.name",
- "state": "ready",
- "type": "tenant",
- "hostname": "host.name",
- "parentHostname": "parent.name",
- "openStackId": "9171477a-35be-4a60-81b0-2b631a36c712",
- "flavor": "v-4-8-100",
- "canonicalFlavor": "v-4-8-100",
- "minDiskAvailableGb": 100.0,
- "minMainMemoryAvailableGb": 8.0,
- "description": "VIRTUAL_MACHINE with 4.0 CPUs, 8.0 Gb memory and 100.0 Gb disk",
- "minCpuCores": 4.0,
- "cost": 15,
- "fastDisk": false,
- "environment": "VIRTUAL_MACHINE",
- "rebootGeneration": 9,
- "currentRebootGeneration": 9,
- "vespaVersion": "6.132.102",
- "currentDockerImage": "docker-registry:4443/vespa/ci:6.132.102",
- "hostedVersion": "6.132.102",
- "convergedStateVersion": "6.132.102",
- "failCount": 2,
- "hardwareFailure": false,
- "wantToRetire": false,
- "wantToDeprovision": false,
- "history": [
- {
- "event": "readied",
- "at": 1488621028325,
- "agent": "system"
- },
- {
- "event": "rebooted",
- "at": 1500455903916,
- "agent": "system"
- },
- {
- "event": "requested",
- "at": 1501598263220,
- "agent": "system"
- }
- ],
- "ipAddresses": [
- "10.201.13.46"
- ],
- "additionalIpAddresses": [
- ]
-} \ No newline at end of file
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/pingresponse-all-packets-lost b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/pingresponse-all-packets-lost
deleted file mode 100644
index 29d6383b52c..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/pingresponse-all-packets-lost
+++ /dev/null
@@ -1 +0,0 @@
-100
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/reportJSON b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/reportJSON
deleted file mode 100644
index 839fb8224ab..00000000000
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/reportJSON
+++ /dev/null
@@ -1 +0,0 @@
-{"actualMemoryAvailable":123.0,"actualDiskType":"FAST","actualDiskSpaceAvailable":500.0,"actualInterfaceSpeed":100.0,"actualcpuCores":4,"faultyIpAddresses":["2001:db8:0:1234:0:567:8:1"]} \ No newline at end of file