USe correct zone in test and implement getApplication(ApplicationId)

2 files changed, 17 insertions, 1 deletions

diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyServiceMonitor.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyServiceMonitor.java
index 689bc32ca6a..3c272204185 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyServiceMonitor.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyServiceMonitor.java
@@ -2,6 +2,7 @@
 package com.yahoo.vespa.orchestrator;
 
 
+import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.vespa.applicationmodel.ApplicationInstance;
 import com.yahoo.vespa.applicationmodel.ApplicationInstanceId;
 import com.yahoo.vespa.applicationmodel.ApplicationInstanceReference;
@@ -25,6 +26,8 @@ import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
 
+import static com.yahoo.vespa.orchestrator.OrchestratorUtil.toApplicationInstanceReference;
+
 /**
  * A hardcoded set of applications with one storage cluster with two nodes each.
  *
@@ -141,6 +144,19 @@ public class DummyServiceMonitor implements ServiceMonitor, AntiServiceMonitor {
     }
 
     @Override
+    public Optional<ApplicationInstance> getApplication(ApplicationId applicationId) {
+        return apps.stream()
+                .filter(instance -> {
+                    try {
+                        return instance.reference().equals(toApplicationInstanceReference(applicationId, this));
+                    } catch (ApplicationIdNotFoundException e) {
+                        throw new RuntimeException(e);
+                    }
+                })
+                .findFirst();
+    }
+
+    @Override
     public Optional<ApplicationInstance> getApplication(HostName hostname) {
         for (ApplicationInstance app : apps) {
             for (ServiceCluster cluster : app.serviceClusters()) {
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
index b82ea245261..d27e0bae88a 100644
--- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
+++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java
@@ -413,7 +413,7 @@ public class OrchestratorImplTest {
         HostName hostName = new HostName("my.host");
         HostName ccHost = new HostName("cc.host");
         TenantId tenantId = new TenantId("tenant");
-        ApplicationInstanceId applicationInstanceId = new ApplicationInstanceId("app:env:region:instance");
+        ApplicationInstanceId applicationInstanceId = new ApplicationInstanceId("app:prod:default:instance");
         ApplicationInstanceReference reference = new ApplicationInstanceReference(tenantId, applicationInstanceId);
         ApplicationId id = ApplicationId.from("tenant", "app", "instance");