diff options
5 files changed, 9 insertions, 9 deletions
diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java index 9f4af82c5b0..ec9cf0b3436 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/MemoryNameService.java @@ -39,7 +39,7 @@ public class MemoryNameService implements NameService { public Optional<Record> findRecord(Record.Type type, RecordData data) { return records.values() .stream() - .filter(record -> record.type() == type && record.value().equals(data)) + .filter(record -> record.type() == type && record.data().equals(data)) .findFirst(); } diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java index 293749be32d..b51202e8261 100644 --- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java +++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/dns/Record.java @@ -32,8 +32,8 @@ public class Record { return type; } - /** Value for this, e.g. IP address for "A" record */ - public RecordData value() { + /** Data in this, e.g. IP address for "A" record */ + public RecordData data() { return data; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java index dd803cda18b..9bff6ce9fb1 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/ApplicationController.java @@ -458,7 +458,7 @@ public class ApplicationController { RecordData rotationName = RecordData.fqdn(rotation.name()); if (record.isPresent()) { // Ensure that the existing record points to the correct rotation - if (!record.get().value().equals(rotationName)) { + if (!record.get().data().equals(rotationName)) { nameService.updateRecord(record.get().id(), rotationName); log.info("Updated mapping for record ID " + record.get().id().asString() + ": " + dnsName + " -> " + rotation.name()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index e174dd4de6f..02974765be8 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -614,7 +614,7 @@ public class ControllerTest { ); assertTrue(record.isPresent()); assertEquals("app1.tenant1.global.vespa.yahooapis.com", record.get().name().asString()); - assertEquals("rotation-fqdn-01.", record.get().value().asString()); + assertEquals("rotation-fqdn-01.", record.get().data().asString()); } @Test @@ -638,7 +638,7 @@ public class ControllerTest { ); assertTrue(record.isPresent()); assertEquals("app1.tenant1.global.vespa.yahooapis.com", record.get().name().asString()); - assertEquals("rotation-fqdn-01.", record.get().value().asString()); + assertEquals("rotation-fqdn-01.", record.get().data().asString()); // Application is deleted and rotation is unassigned applicationPackage = new ApplicationPackageBuilder() @@ -679,7 +679,7 @@ public class ControllerTest { ); assertTrue(record.isPresent()); assertEquals("app2.tenant2.global.vespa.yahooapis.com", record.get().name().asString()); - assertEquals("rotation-fqdn-01.", record.get().value().asString()); + assertEquals("rotation-fqdn-01.", record.get().data().asString()); } // Application 1 is recreated, deployed and assigned a new rotation @@ -701,7 +701,7 @@ public class ControllerTest { Record.Type.CNAME, RecordName.from("app1.tenant1.global.vespa.yahooapis.com") ); assertTrue(record.isPresent()); - assertEquals("rotation-fqdn-02.", record.get().value().asString()); + assertEquals("rotation-fqdn-02.", record.get().data().asString()); } } diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DnsMaintainerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DnsMaintainerTest.java index 405f29c1a82..17f9ab29628 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DnsMaintainerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DnsMaintainerTest.java @@ -51,7 +51,7 @@ public class DnsMaintainerTest { ); assertTrue(record.isPresent()); assertEquals("app1.tenant1.global.vespa.yahooapis.com", record.get().name().asString()); - assertEquals("rotation-fqdn-01.", record.get().value().asString()); + assertEquals("rotation-fqdn-01.", record.get().data().asString()); // Remove application applicationPackage = new ApplicationPackageBuilder() |