diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-02-27 14:19:15 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-02-27 14:57:21 +0100 |
commit | a96289fb65f540a473f5ad6baa838df191fab8cb (patch) | |
tree | 6f63cd1f59bbd111070a28f78efad59c3affca8f | |
parent | c263660f41b0105805bc3961bf52ba34e8d88715 (diff) |
Rename method
12 files changed, 39 insertions, 43 deletions
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 854f72b27fb..914eadc90e9 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 @@ -342,7 +342,7 @@ public class ApplicationController { endpointCertificateMetadata = endpointCertificateManager.getEndpointCertificateMetadata(application.get().require(instance), zone); - endpoints = controller.routingController().registerEndpointsInDns(applicationPackage.deploymentSpec(), application.get().require(instanceId.instance()), zone); + endpoints = controller.routing().registerEndpointsInDns(applicationPackage.deploymentSpec(), application.get().require(instanceId.instance()), zone); } // Release application lock while doing the deployment, which is a lengthy task. // Carry out deployment without holding the application lock. @@ -398,7 +398,7 @@ public class ApplicationController { for (InstanceName instance : declaredInstances) if (applicationPackage.deploymentSpec().requireInstance(instance).concerns(Environment.prod)) - application = controller.routingController().assignRotations(application, instance); + application = controller.routing().assignRotations(application, instance); store(application); return application; @@ -444,7 +444,7 @@ public class ApplicationController { } finally { // Even if prepare fails, a load balancer may have been provisioned. Always refresh routing policies so that // any DNS updates can be propagated as early as possible. - controller.routingController().policies().refresh(application, applicationPackage.deploymentSpec(), zone); + controller.routing().policies().refresh(application, applicationPackage.deploymentSpec(), zone); } } @@ -516,7 +516,7 @@ public class ApplicationController { throw new IllegalArgumentException("Could not delete '" + application + "': It has active deployments: " + deployments); for (Instance instance : application.get().instances().values()) { - controller.routingController().removeEndpointsInDns(instance); + controller.routing().removeEndpointsInDns(instance); application = application.without(instance.name()); } @@ -551,7 +551,7 @@ public class ApplicationController { && application.get().deploymentSpec().instanceNames().contains(instanceId.instance())) throw new IllegalArgumentException("Can not delete '" + instanceId + "', which is specified in 'deployment.xml'; remove it there first"); - controller.routingController().removeEndpointsInDns(application.get().require(instanceId.instance())); + controller.routing().removeEndpointsInDns(application.get().require(instanceId.instance())); curator.writeApplication(application.without(instanceId.instance()).get()); controller.jobController().collectGarbage(); log.info("Deleted " + instanceId); @@ -633,7 +633,7 @@ public class ApplicationController { } catch (NotFoundException ignored) { // ok; already gone } finally { - controller.routingController().policies().refresh(application.get().id().instance(instanceName), application.get().deploymentSpec(), zone); + controller.routing().policies().refresh(application.get().id().instance(instanceName), application.get().deploymentSpec(), zone); } return application.with(instanceName, instance -> instance.withoutDeploymentIn(zone)); } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java index 3d492bc00d4..5189721df5d 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/Controller.java @@ -124,7 +124,7 @@ public class Controller extends AbstractComponent implements ApplicationIdSource public JobController jobController() { return jobController; } /** Returns the instance controlling routing */ - public RoutingController routingController() { + public RoutingController routing() { return routingController; } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java index cd1d7796098..951ad12abfe 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java @@ -450,7 +450,7 @@ public class InternalStepRunner implements StepRunner { /** Returns true iff all containers in the deployment give 100 consecutive 200 OK responses on /status.html. */ private boolean containersAreUp(ApplicationId id, ZoneId zoneId, DualLogger logger) { - var endpoints = controller.routingController().zoneEndpointsOf(Set.of(new DeploymentId(id, zoneId))); + var endpoints = controller.routing().zoneEndpointsOf(Set.of(new DeploymentId(id, zoneId))); if ( ! endpoints.containsKey(zoneId)) return false; @@ -477,7 +477,7 @@ public class InternalStepRunner implements StepRunner { } private boolean endpointsAvailable(ApplicationId id, ZoneId zone, DualLogger logger) { - var endpoints = controller.routingController().zoneEndpointsOf(Set.of(new DeploymentId(id, zone))); + var endpoints = controller.routing().zoneEndpointsOf(Set.of(new DeploymentId(id, zone))); if ( ! endpoints.containsKey(zone)) { logger.log("Endpoints not yet ready."); return false; @@ -550,7 +550,7 @@ public class InternalStepRunner implements StepRunner { deployments.add(new DeploymentId(id.application(), zoneId)); logger.log("Attempting to find endpoints ..."); - var endpoints = controller.routingController().zoneEndpointsOf(deployments); + var endpoints = controller.routing().zoneEndpointsOf(deployments); if ( ! endpoints.containsKey(zoneId)) { logger.log(WARNING, "Endpoints for the deployment to test vanished again, while it was still active!"); return Optional.of(error); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java index 6904bff8548..3346ec407d4 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/JobController.java @@ -26,7 +26,6 @@ import com.yahoo.vespa.hosted.controller.application.Deployment; import com.yahoo.vespa.hosted.controller.application.TenantAndApplicationId; import com.yahoo.vespa.hosted.controller.persistence.BufferedLogStore; import com.yahoo.vespa.hosted.controller.persistence.CuratorDb; -import com.yahoo.vespa.hosted.controller.tenant.Tenant; import java.net.URI; import java.security.cert.X509Certificate; @@ -504,7 +503,7 @@ public class JobController { } finally { // Passing an empty DeploymentSpec here is fine as it's used for registering global endpoint names, and // tester instances have none. - controller.routingController().policies().refresh(id.id(), DeploymentSpec.empty, zone); + controller.routing().policies().refresh(id.id(), DeploymentSpec.empty, zone); } } @@ -535,7 +534,7 @@ public class JobController { /** Returns the tester endpoint URL, if any */ Optional<URI> testerEndpoint(RunId id) { var testerId = new DeploymentId(id.tester().id(), id.type().zone(controller.system())); - return controller.routingController().zoneEndpointsOf(testerId).values().stream().findFirst(); + return controller.routing().zoneEndpointsOf(testerId).values().stream().findFirst(); } private void prunePackages(TenantAndApplicationId id) { diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporter.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporter.java index d88469645b4..a4ace4cf518 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporter.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/MetricsReporter.java @@ -64,8 +64,8 @@ public class MetricsReporter extends Maintainer { } private void reportRemainingRotations() { - try (RotationLock lock = controller().routingController().rotations().lock()) { - int availableRotations = controller().routingController().rotations().availableRotations(lock).size(); + try (RotationLock lock = controller().routing().rotations().lock()) { + int availableRotations = controller().routing().rotations().availableRotations(lock).size(); metric.set(REMAINING_ROTATIONS, availableRotations, metric.createContext(Map.of())); } } diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java index bdfaa9c098f..1d1d5e93dd8 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/RotationStatusUpdater.java @@ -82,7 +82,7 @@ public class RotationStatusUpdater extends Maintainer { private RotationStatus getStatus(Instance instance) { var statusMap = new LinkedHashMap<RotationId, RotationStatus.Targets>(); for (var assignedRotation : instance.rotations()) { - var rotation = controller().routingController().rotations().getRotation(assignedRotation.rotationId()); + var rotation = controller().routing().rotations().getRotation(assignedRotation.rotationId()); if (rotation.isEmpty()) continue; var targets = service.getHealthStatus(rotation.get().name()).entrySet().stream() .collect(Collectors.toMap(Map.Entry::getKey, (kv) -> from(kv.getValue()))); diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java index 5e234d31322..745b246da26 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java @@ -29,10 +29,7 @@ import com.yahoo.slime.Cursor; import com.yahoo.slime.Inspector; import com.yahoo.slime.Slime; import com.yahoo.slime.SlimeUtils; -import com.yahoo.vespa.athenz.api.AthenzIdentity; import com.yahoo.vespa.athenz.api.AthenzPrincipal; -import com.yahoo.vespa.athenz.api.AthenzUser; -import com.yahoo.vespa.hosted.controller.AlreadyExistsException; import com.yahoo.vespa.hosted.controller.Application; import com.yahoo.vespa.hosted.controller.Controller; import com.yahoo.vespa.hosted.controller.Instance; @@ -866,7 +863,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { .forEach(globalEndpointUrls::add); // Per-cluster endpoints. These are backed by load balancers. - var routingPolicies = controller.routingController().policies().get(instance.id()).values(); + var routingPolicies = controller.routing().policies().get(instance.id()).values(); for (var policy : routingPolicies) { policy.globalEndpointsIn(controller.system()).asList().stream() .map(Endpoint::url) @@ -1056,10 +1053,10 @@ public class ApplicationApiHandler extends LoggingRequestHandler { // Add zone endpoints defined by routing policies var endpointArray = response.setArray("endpoints"); - for (var policy : controller.routingController().policies().get(deploymentId).values()) { + for (var policy : controller.routing().policies().get(deploymentId).values()) { // TODO(mpolden): Always add endpoints from all policies, independent of routing method. This allows removal // of RoutingGenerator and eliminates the external call to the routing layer below. - if (!controller.routingController().supportsRoutingMethod(RoutingMethod.exclusive, deployment.zone())) continue; + if (!controller.routing().supportsRoutingMethod(RoutingMethod.exclusive, deployment.zone())) continue; if (!policy.status().isActive()) continue; { var endpointObject = endpointArray.addObject(); @@ -1081,7 +1078,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { } } // Add zone endpoints served by shared routing layer - for (var clusterAndUrl : controller.routingController().legacyZoneEndpointsOf(deploymentId).entrySet()) { + for (var clusterAndUrl : controller.routing().legacyZoneEndpointsOf(deploymentId).entrySet()) { var endpointObject = endpointArray.addObject(); endpointObject.setString("cluster", clusterAndUrl.getKey().value()); endpointObject.setBool("tls", true); @@ -1114,7 +1111,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { // endpoints, we can't generate these URLs on-the-fly and we have to query the routing layer. // TODO(mpolden): Remove this once all clients stop reading this. Cursor serviceUrlArray = response.setArray("serviceUrls"); - controller.routingController().legacyEndpointsOf(deploymentId) + controller.routing().legacyEndpointsOf(deploymentId) .forEach(endpoint -> serviceUrlArray.addString(endpoint.toString())); response.setString("nodes", withPath("/zone/v2/" + deploymentId.zoneId().environment() + "/" + deploymentId.zoneId().region() + "/nodes/v2/node/?&recursive=true&application=" + deploymentId.applicationId().tenant() + "." + deploymentId.applicationId().application() + "." + deploymentId.applicationId().instance(), request.getUri()).toString()); @@ -1257,7 +1254,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { private void setGlobalEndpointStatus(DeploymentId deployment, boolean inService, HttpRequest request) { var agent = isOperator(request) ? GlobalRouting.Agent.operator : GlobalRouting.Agent.tenant; var status = inService ? GlobalRouting.Status.in : GlobalRouting.Status.out; - controller.routingController().policies().setGlobalRoutingStatus(deployment, status, agent); + controller.routing().policies().setGlobalRoutingStatus(deployment, status, agent); } /** Set the global rotation status for given deployment. This only applies to global endpoints backed by a rotation */ @@ -1268,7 +1265,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { long timestamp = controller.clock().instant().getEpochSecond(); var status = inService ? EndpointStatus.Status.in : EndpointStatus.Status.out; var endpointStatus = new EndpointStatus(status, reason, agent.name(), timestamp); - controller.routingController().setGlobalRotationStatus(deployment, endpointStatus); + controller.routing().setGlobalRotationStatus(deployment, endpointStatus); } private HttpResponse getGlobalRotationOverride(String tenantName, String applicationName, String instanceName, String environment, String region) { @@ -1276,7 +1273,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { ZoneId.from(environment, region)); Slime slime = new Slime(); Cursor array = slime.setObject().setArray("globalrotationoverride"); - controller.routingController().globalRotationStatus(deploymentId) + controller.routing().globalRotationStatus(deploymentId) .forEach((endpoint, status) -> { array.addString(endpoint.upstreamName()); Cursor statusObject = array.addObject(); @@ -1722,7 +1719,7 @@ public class ApplicationApiHandler extends LoggingRequestHandler { return new SlimeJsonResponse(testConfigSerializer.configSlime(id, type, false, - controller.routingController().zoneEndpointsOf(deployments), + controller.routing().zoneEndpointsOf(deployments), controller.applications().contentClustersByZone(deployments))); } 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 26ccecee3e6..55ce8fd561c 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 @@ -170,7 +170,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { var zone = zoneFrom(path); if (controller.zoneRegistry().zones().directlyRouted().ids().contains(zone)) { var status = in ? GlobalRouting.Status.in : GlobalRouting.Status.out; - controller.routingController().policies().setGlobalRoutingStatus(zone, status); + controller.routing().policies().setGlobalRoutingStatus(zone, status); } else { controller.serviceRegistry().configServer().setGlobalRotationStatus(zone, in); } @@ -188,7 +188,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { private void toSlime(ZoneId zone, Cursor zoneObject) { if (controller.zoneRegistry().zones().directlyRouted().ids().contains(zone)) { - var zonePolicy = controller.routingController().policies().get(zone); + var zonePolicy = controller.routing().policies().get(zone); zoneStatusToSlime(zoneObject, zonePolicy.zone(), zonePolicy.globalRouting(), RoutingMethod.exclusive); } else { // Rotation status per zone only exposes in/out status, no agent or time of change. @@ -210,11 +210,11 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { var endpointStatus = new EndpointStatus(in ? EndpointStatus.Status.in : EndpointStatus.Status.out, "", agent.name(), controller.clock().instant().getEpochSecond()); - controller.routingController().setGlobalRotationStatus(deployment, endpointStatus); + controller.routing().setGlobalRotationStatus(deployment, endpointStatus); } // Set policy status - controller.routingController().policies().setGlobalRoutingStatus(deployment, status, agent); + controller.routing().policies().setGlobalRoutingStatus(deployment, status, agent); return new MessageResponse("Set global routing status for " + deployment + " to " + (in ? "IN" : "OUT")); } @@ -242,7 +242,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { var deploymentId = new DeploymentId(instance.id(), zone); // Include status from rotation if (rotationCanRouteTo(zone, instance)) { - var rotationStatus = controller.routingController().globalRotationStatus(deploymentId); + var rotationStatus = controller.routing().globalRotationStatus(deploymentId); // Status is equal across all global endpoints, as the status is per deployment, not per endpoint. var endpointStatus = rotationStatus.values().stream().findFirst(); if (endpointStatus.isPresent()) { @@ -263,7 +263,7 @@ public class RoutingApiHandler extends AuditLoggingRequestHandler { } // Include status from routing policies - var routingPolicies = controller.routingController().policies().get(deploymentId); + var routingPolicies = controller.routing().policies().get(deploymentId); for (var policy : routingPolicies.values()) { deploymentStatusToSlime(deploymentsArray.addObject(), policy); } 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 b082f66b70a..57c4b723099 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 @@ -190,7 +190,7 @@ public class ControllerTest { new RoutingEndpoint("http://alias-endpoint.vespa.yahooapis.com:4080", "host1", true, "upstream1") )); - Supplier<Map<RoutingEndpoint, EndpointStatus>> globalRotationStatus = () -> tester.controller().routingController().globalRotationStatus(deployment); + Supplier<Map<RoutingEndpoint, EndpointStatus>> globalRotationStatus = () -> tester.controller().routing().globalRotationStatus(deployment); Supplier<List<EndpointStatus>> upstreamOneEndpoints = () -> { return globalRotationStatus.get() .entrySet().stream() @@ -206,7 +206,7 @@ public class ControllerTest { // Set the global rotations out of service EndpointStatus status = new EndpointStatus(EndpointStatus.Status.out, "unit-test", "Test", tester.clock().instant().getEpochSecond()); - tester.controller().routingController().setGlobalRotationStatus(deployment, status); + tester.controller().routing().setGlobalRotationStatus(deployment, status); assertEquals(2, upstreamOneEndpoints.get().size()); assertTrue("All upstreams are out", upstreamOneEndpoints.get().stream().allMatch(es -> es.getStatus() == EndpointStatus.Status.out)); assertTrue("Reason is set", upstreamOneEndpoints.get().stream().allMatch(es -> es.getReason().equals("unit-test"))); @@ -517,9 +517,9 @@ public class ControllerTest { context.submit(applicationPackage); tester.applications().deleteApplication(context.application().id(), tester.controllerTester().credentialsFor(context.application().id().tenant())); - try (RotationLock lock = tester.controller().routingController().rotations().lock()) { + try (RotationLock lock = tester.controller().routing().rotations().lock()) { assertTrue("Rotation is unassigned", - tester.controller().routingController().rotations().availableRotations(lock) + tester.controller().routing().rotations().availableRotations(lock) .containsKey(new RotationId("rotation-id-01"))); } context.flushDnsUpdates(); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java index 019231321d6..3ff1e52201e 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java @@ -1643,7 +1643,7 @@ public class ApplicationApiTest extends ControllerContainerTest { private void assertGlobalRouting(DeploymentId deployment, GlobalRouting.Status status, GlobalRouting.Agent agent) { var changedAt = tester.controller().clock().instant(); - var westPolicies = tester.controller().routingController().policies().get(deployment); + var westPolicies = tester.controller().routing().policies().get(deployment); assertEquals(1, westPolicies.size()); var westPolicy = westPolicies.values().iterator().next(); assertEquals(status, westPolicy.status().globalRouting().status()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepositoryTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepositoryTest.java index 1bb531edbc5..603a9c90b67 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepositoryTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/rotation/RotationRepositoryTest.java @@ -55,7 +55,7 @@ public class RotationRepositoryTest { @Before public void before() { tester = new DeploymentTester(new ControllerTester(rotationsConfig)); - repository = tester.controller().routingController().rotations(); + repository = tester.controller().routing().rotations(); application = tester.newDeploymentContext("tenant1", "app1", "default"); } @@ -83,7 +83,7 @@ public class RotationRepositoryTest { @Test public void strips_whitespace_in_rotation_fqdn() { tester = new DeploymentTester(new ControllerTester(rotationsConfigWhitespaces)); - RotationRepository repository = tester.controller().routingController().rotations(); + RotationRepository repository = tester.controller().routing().rotations(); var application2 = tester.newDeploymentContext("tenant1", "app2", "default"); application2.submit(applicationPackage); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java index a27b2e1084a..967e6154c91 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java @@ -260,7 +260,7 @@ public class RoutingPoliciesTest { URI.create("https://c1.app1.tenant1.us-west-1.vespa.oath.cloud/"), ClusterSpec.Id.from("c2"), URI.create("https://c2.app1.tenant1.us-west-1.vespa.oath.cloud/")), - tester.controllerTester().controller().routingController().zoneEndpointsOf(context.deploymentIdIn(zone1))); + tester.controllerTester().controller().routing().zoneEndpointsOf(context.deploymentIdIn(zone1))); } @Test @@ -618,7 +618,7 @@ public class RoutingPoliciesTest { } public RoutingPolicies routingPolicies() { - return tester.controllerTester().controller().routingController().policies(); + return tester.controllerTester().controller().routing().policies(); } public DeploymentContext newDeploymentContext(String tenant, String application, String instance) { |