diff options
| author | toby <smorgrav@yahoo-inc.com> | 2016-06-17 12:23:40 +0200 |
|---|---|---|
| committer | toby <smorgrav@yahoo-inc.com> | 2016-06-17 12:25:49 +0200 |
| commit | cb54d6a816f6fc71307ce689fcb6b33dcff19720 (patch) | |
| tree | 8b3e8ea4d0406bb29cde4b8ba956c93d3f20c9cc /orchestrator/src/test/java/com | |
| parent | 9f07d67364961cb0e3c5cc9095fc3e1e081900ec (diff) | |
Be explicit and assert on ApplicationInstanceReference format in
conversion to ApplicationId.
Modified test data and tests to reflect this.
Diffstat (limited to 'orchestrator/src/test/java/com')
3 files changed, 8 insertions, 8 deletions
diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java index e1b73c1fe65..d48bc1f302b 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/DummyInstanceLookupService.java @@ -37,7 +37,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { static { apps.add(new ApplicationInstance<>( new TenantId("test-tenant-id"), - new ApplicationInstanceId("application:instance"), + new ApplicationInstanceId("application:prod:utopia-1:instance"), TestUtil.makeServiceClusterSet( new ServiceCluster<>( new ClusterId("test-cluster-id-1"), @@ -49,7 +49,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { ServiceMonitorStatus.UP), new ServiceInstance<>( new ConfigId("storage/storage/2"), - new HostName("test2.prod.utpoia-1.vespahosted.ut1.yahoo.com"), + new HostName("test2.prod.utopoia-1.vespahosted.ut1.yahoo.com"), ServiceMonitorStatus.UP))), new ServiceCluster<>( new ClusterId("clustercontroller"), @@ -65,7 +65,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { apps.add(new ApplicationInstance<>( new TenantId("mediasearch"), - new ApplicationInstanceId("imagesearch:default"), + new ApplicationInstanceId("imagesearch:prod:utopia-1:default"), TestUtil.makeServiceClusterSet( new ServiceCluster<>( new ClusterId("image"), @@ -93,7 +93,7 @@ public class DummyInstanceLookupService implements InstanceLookupService { apps.add(new ApplicationInstance<>( new TenantId("tenant-id-3"), - new ApplicationInstanceId("application-instance-3:default"), + new ApplicationInstanceId("application-instance-3:prod:utopia-1:default"), TestUtil.makeServiceClusterSet( new ServiceCluster<>( new ClusterId("cluster-id-3"), 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 7f414dbfbc2..3adb65b9654 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorImplTest.java @@ -216,7 +216,7 @@ public class OrchestratorImplTest { InstanceLookupService service = new DummyInstanceLookupService(); String applicationInstanceId = service.findInstanceByHost(DummyInstanceLookupService.TEST1_HOST_NAME).get() .reference().toString(); - assertEquals("test-tenant-id:application:instance", applicationInstanceId); + assertEquals("test-tenant-id:application:prod:utopia-1:instance", applicationInstanceId); } @Test diff --git a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorUtilTest.java b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorUtilTest.java index 178e39f6e5e..ba2a584c27c 100644 --- a/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorUtilTest.java +++ b/orchestrator/src/test/java/com/yahoo/vespa/orchestrator/OrchestratorUtilTest.java @@ -18,12 +18,12 @@ public class OrchestratorUtilTest { private static final ApplicationId APPID_1 = ApplicationId.from( TenantName.from("mediasearch"), - ApplicationName.from("tumblr-search"), + ApplicationName.from("imagesearch"), InstanceName.defaultName()); private static final ApplicationInstanceReference APPREF_1 = new ApplicationInstanceReference( - new TenantId("test-tenant"), - new ApplicationInstanceId("test-application:test-environment:test-region:test-instance-key")); + new TenantId("test-tenant-id"), + new ApplicationInstanceId("application:prod:utopia-1:instance")); /** * Here we don't care how the internal of the different application |