Merge pull request #9406 from vespa-engine/hmusum/add-from-method-without-cloud-to-ZoneId

Add method for creating ZoneId with environment, region and system

2 files changed, 10 insertions, 0 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java
index be967c0cbfa..b48deb19f12 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/zone/ZoneId.java
@@ -40,6 +40,10 @@ public class ZoneId {
         return new ZoneId(environment, region);
     }
 
+    public static ZoneId from(Environment environment, RegionName region, SystemName system) {
+        return new ZoneId(environment, region, CloudName.defaultName(), system);
+    }
+
     public static ZoneId from(Environment environment, RegionName region, CloudName cloud, SystemName system) {
         return new ZoneId(environment, region, cloud, system);
     }
diff --git a/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java b/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java
index a546d429291..a96ebf7dd5b 100644
--- a/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java
+++ b/config-provisioning/src/test/java/com/yahoo/config/provision/ZoneIdTest.java
@@ -29,6 +29,12 @@ public class ZoneIdTest {
         assertEquals(CloudName.defaultName(), zoneId.cloud());
         assertEquals(SystemName.defaultSystem(), zoneId.system());
 
+        ZoneId zoneIdWithSystem = ZoneId.from(environment, region, system);
+        assertEquals(region, zoneIdWithSystem.region());
+        assertEquals(environment, zoneIdWithSystem.environment());
+        assertEquals(CloudName.defaultName(), zoneIdWithSystem.cloud());
+        assertEquals(system, zoneIdWithSystem.system());
+
         ZoneId zoneIdWithCloudAndSystem = ZoneId.from(environment, region, cloud, system);
         assertEquals(region, zoneIdWithCloudAndSystem.region());
         assertEquals(environment, zoneIdWithCloudAndSystem.environment());