aboutsummaryrefslogtreecommitdiffstats
path: root/node-maintainer
diff options
context:
space:
mode:
authorOla Aunrønning <olaa@yahoo-inc.com>2017-08-09 11:11:43 +0200
committerOla Aunrønning <olaa@yahoo-inc.com>2017-08-15 12:29:37 +0200
commit273275dc6ec9f0f9b4cd6b3d36716089dbb8afb4 (patch)
tree5831385e7315fa4ef9e5454ad174c67d7f0e19da /node-maintainer
parent99f9fb1c95eb494971f357287f81cdfd34f04a01 (diff)
Changed IP addresses in tests
Diffstat (limited to 'node-maintainer')
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifierTest.java8
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/report/SpecVerificationReportTest.java2
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/IPAddressVerifierTest.json37
-rw-r--r--node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/resources/reportJSON2
4 files changed, 9 insertions, 40 deletions
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifierTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifierTest.java
index 50f350aea63..7878bbeac5d 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifierTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/commons/noderepo/IPAddressVerifierTest.java
@@ -27,12 +27,12 @@ public class IPAddressVerifierTest {
@Before
public void setup() throws Exception {
- ipv4Address = "10.213.181.113";
- ipv6Address = "2001:4998:c:2940:0:0:0:111c";
+ ipv4Address = "172.16.254.1";
+ ipv6Address = "2001:db8:0:1234:0:567:8:1";
ArrayList<URL> nodeRepoUrl = new ArrayList<>(Arrays.asList(new URL(URL_RESOURCE_PATH)));
nodeRepoJsonModel = NodeRepoInfoRetriever.retrieve(nodeRepoUrl);
- ipv4LookupFormat = "113.181.213.10.in-addr.arpa";
- ipv6LookupFormat = "c.1.1.1.0.0.0.0.0.0.0.0.0.0.0.0.0.4.9.2.c.0.0.0.8.9.9.4.1.0.0.2.ip6.arpa";
+ ipv4LookupFormat = "1.254.16.172.in-addr.arpa";
+ ipv6LookupFormat = "1.0.0.0.8.0.0.0.7.6.5.0.0.0.0.0.4.3.2.1.0.0.0.0.8.b.d.0.1.0.0.2.ip6.arpa";
}
@Test
diff --git a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/report/SpecVerificationReportTest.java b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/report/SpecVerificationReportTest.java
index e5e7f2ca49a..3c562cbaeda 100644
--- a/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/report/SpecVerificationReportTest.java
+++ b/node-maintainer/src/test/java/com/yahoo/vespa/hosted/node/verification/spec/report/SpecVerificationReportTest.java
@@ -34,7 +34,7 @@ public class SpecVerificationReportTest {
specVerificationReport.setActualDiskType(HardwareInfo.DiskType.FAST);
specVerificationReport.setActualMemoryAvailable(123D);
specVerificationReport.setActualcpuCores(4);
- specVerificationReport.setFaultyIpAddresses(new String[]{"2001:4998:44:505d:0:0:0:2618"});
+ specVerificationReport.setFaultyIpAddresses(new String[]{"2001:db8:0:1234:0:567:8:1"});
String expectedJson = MockCommandExecutor.readFromFile(REPORT_PATH).get(0);
ObjectMapper om = new ObjectMapper();
String actualJson = om.writeValueAsString(specVerificationReport);
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
index f2f49ead171..4fcb5efed9e 100644
--- 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
@@ -73,41 +73,10 @@
}
],
"ipAddresses": [
- "10.213.181.113",
- "2001:4998:c:2940::111c"
+ "172.16.254.1",
+ "2001:db8:0:1234:0:567:8:1"
],
"additionalIpAddresses": [
- "2001:4998:c:2940::1138",
- "2001:4998:c:2940::1139",
- "2001:4998:c:2940::1136",
- "2001:4998:c:2940::1137",
- "2001:4998:c:2940::1130",
- "2001:4998:c:2940::1131",
- "2001:4998:c:2940::1134",
- "2001:4998:c:2940::1135",
- "2001:4998:c:2940::1132",
- "2001:4998:c:2940::1133",
- "2001:4998:c:2940::111f",
- "2001:4998:c:2940::111d",
- "2001:4998:c:2940::111e",
- "2001:4998:c:2940::113a",
- "2001:4998:c:2940::113b",
- "2001:4998:c:2940::113c",
- "2001:4998:c:2940::1127",
- "2001:4998:c:2940::1128",
- "2001:4998:c:2940::1125",
- "2001:4998:c:2940::1126",
- "2001:4998:c:2940::1129",
- "2001:4998:c:2940::1120",
- "2001:4998:c:2940::1123",
- "2001:4998:c:2940::1124",
- "2001:4998:c:2940::1121",
- "2001:4998:c:2940::1122",
- "2001:4998:c:2940::112e",
- "2001:4998:c:2940::112f",
- "2001:4998:c:2940::112c",
- "2001:4998:c:2940::112d",
- "2001:4998:c:2940::112a",
- "2001:4998:c:2940::112b"
+
]
} \ No newline at end of file
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
index 9b874f1be68..839fb8224ab 100644
--- 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
@@ -1 +1 @@
-{"actualMemoryAvailable":123.0,"actualDiskType":"FAST","actualDiskSpaceAvailable":500.0,"actualInterfaceSpeed":100.0,"actualcpuCores":4,"faultyIpAddresses":["2001:4998:44:505d:0:0:0:2618"]} \ No newline at end of file
+{"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