summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorØyvind Grønnesby <oyving@verizonmedia.com>2021-09-13 15:17:01 +0200
committerØyvind Grønnesby <oyving@verizonmedia.com>2021-09-13 15:17:01 +0200
commit368188baa0301ccc2d049f37203bbf5e719887ce (patch)
tree7ad561f9d9298bb2e8154f315ef4e1c13432255a /controller-server
parentcc0852cec883e2512969befe88aeed2872b5de45 (diff)
endpoint -> name, dns -> dnsName
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java4
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/endpoint/endpoints.json4
2 files changed, 4 insertions, 4 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
index e01f2cc13c4..f16f30b1a6c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/routing/RoutingApiHandler.java
@@ -354,8 +354,8 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler {
}
private static void endpointToSlime(Cursor object, Endpoint endpoint) {
- object.setString("endpoint", endpoint.name());
- object.setString("dns", endpoint.dnsName());
+ object.setString("name", endpoint.name());
+ object.setString("dnsName", endpoint.dnsName());
object.setString("routingMethod", endpoint.routingMethod().name());
object.setString("cluster", endpoint.cluster().value());
object.setString("scope", endpoint.scope().name());
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/endpoint/endpoints.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/endpoint/endpoints.json
index 695e53f5611..f78f913cb7e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/endpoint/endpoints.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/routing/responses/endpoint/endpoints.json
@@ -1,8 +1,8 @@
{
"endpoints": [
{
- "endpoint": "default",
- "dns": "a1--t1.global.vespa.oath.cloud",
+ "name": "default",
+ "dnsName": "a1--t1.global.vespa.oath.cloud",
"routingMethod": "shared",
"cluster": "default",
"scope": "global",