summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2017-12-11 13:13:18 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2017-12-11 13:13:18 +0100
commit2141b8d758e3b524bcf93aab742c508678d4a85c (patch)
treee144b3eb3505d758e39328d488bea2ad0c6f2d68 /controller-server
parent6b06b462bf35616ad55a77fa4d88a8ded70a995c (diff)
Changed to ZoneId in DnsMaintainerTest as well
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/DnsMaintainerTest.java5
1 files changed, 3 insertions, 2 deletions
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 17f9ab29628..8647b87133e 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
@@ -5,6 +5,7 @@ import com.yahoo.config.application.api.ValidationId;
import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.RegionName;
import com.yahoo.config.provision.Zone;
+import com.yahoo.config.provision.ZoneId;
import com.yahoo.vespa.hosted.controller.Application;
import com.yahoo.vespa.hosted.controller.api.integration.athenz.NToken;
import com.yahoo.vespa.hosted.controller.api.integration.dns.Record;
@@ -60,8 +61,8 @@ public class DnsMaintainerTest {
.build();
tester.notifyJobCompletion(component, application, true);
tester.deployAndNotify(application, applicationPackage, true, systemTest);
- tester.applications().deactivate(application, new Zone(Environment.test, RegionName.from("us-east-1")));
- tester.applications().deactivate(application, new Zone(Environment.staging, RegionName.from("us-east-3")));
+ tester.applications().deactivate(application, ZoneId.from(Environment.test, RegionName.from("us-east-1")));
+ tester.applications().deactivate(application, ZoneId.from(Environment.staging, RegionName.from("us-east-3")));
tester.applications().deleteApplication(application.id(), Optional.of(new NToken("ntoken")));
// DnsMaintainer removes record