From 585b050e47f1bb89c827950a9afd2518ea5252a5 Mon Sep 17 00:00:00 2001
From: Valerij Fredriksen <valerijf@verizonmedia.com>
Date: Wed, 14 Aug 2019 12:46:05 +0200
Subject: Add cloud region name to ZoneApi

---
 .../java/com/yahoo/config/provision/zone/ZoneApi.java  |  2 ++
 .../hosted/controller/integration/ZoneApiMock.java     | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneApi.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneApi.java
index fd76dc10bdb..a5c2cbb6210 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneApi.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneApi.java
@@ -17,4 +17,6 @@ public interface ZoneApi {
     default RegionName getRegionName() { return getId().region(); }
 
     CloudName getCloudName();
+
+    String getCloudNativeRegionName();
 }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneApiMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneApiMock.java
index 4705982e1f2..269bdcc5dca 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneApiMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ZoneApiMock.java
@@ -1,15 +1,12 @@
 // Copyright 2019 Oath Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.integration;
 
-import com.yahoo.cloud.config.SentinelConfig;
-import com.yahoo.config.model.graph.ModelGraphBuilder;
 import com.yahoo.config.provision.CloudName;
 import com.yahoo.config.provision.Environment;
 import com.yahoo.config.provision.RegionName;
 import com.yahoo.config.provision.SystemName;
 import com.yahoo.config.provision.zone.ZoneApi;
 import com.yahoo.config.provision.zone.ZoneId;
-import com.yahoo.messagebus.MessagebusConfig;
 
 /**
  * @author hakonhall
@@ -18,13 +15,15 @@ public class ZoneApiMock implements ZoneApi {
     private final SystemName systemName;
     private final ZoneId id;
     private final CloudName cloudName;
+    private final String cloudNativeRegionName;
 
     public static Builder newBuilder() { return new Builder(); }
 
-    private ZoneApiMock(SystemName systemName, ZoneId id, CloudName cloudName) {
+    private ZoneApiMock(SystemName systemName, ZoneId id, CloudName cloudName, String cloudNativeRegionName) {
         this.systemName = systemName;
         this.id = id;
         this.cloudName = cloudName;
+        this.cloudNativeRegionName = cloudNativeRegionName;
     }
 
     public static ZoneApiMock fromId(String id) {
@@ -44,10 +43,14 @@ public class ZoneApiMock implements ZoneApi {
     @Override
     public CloudName getCloudName() { return cloudName; }
 
+    @Override
+    public String getCloudNativeRegionName() { return cloudNativeRegionName; }
+
     public static class Builder {
         private SystemName systemName = SystemName.defaultSystem();
         private ZoneId id = ZoneId.defaultId();
         private CloudName cloudName = CloudName.defaultName();
+        private String cloudNativeRegionName = id.region().value();
 
         public Builder with(ZoneId id) {
             this.id = id;
@@ -63,8 +66,13 @@ public class ZoneApiMock implements ZoneApi {
 
         public Builder withCloud(String cloud) { return with(CloudName.from(cloud)); }
 
+        public Builder withCloudNativeRegionName(String cloudRegionName) {
+            this.cloudNativeRegionName = cloudRegionName;
+            return this;
+        }
+
         public ZoneApiMock build() {
-            return new ZoneApiMock(systemName, id, cloudName);
+            return new ZoneApiMock(systemName, id, cloudName, cloudNativeRegionName);
         }
     }
 }
-- 
cgit v1.2.3