update tests to use LocationRegistry spec methods the CatalogYamlLocationTest.testLocationPartOfBlueprintDoesntLeak recently introduced to highlight the failure is now fixed, although there are still port-manager-related failures
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/3f1e4c61 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/3f1e4c61 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/3f1e4c61 Branch: refs/heads/master Commit: 3f1e4c61780e67c972ad6ba4785ed5537bbe9108 Parents: f755c25 Author: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Authored: Wed Mar 16 20:44:31 2016 +0000 Committer: Alex Heneveld <alex.henev...@cloudsoftcorp.com> Committed: Thu Mar 17 12:03:38 2016 +0000 ---------------------------------------------------------------------- .../camp/brooklyn/ByonLocationsYamlTest.java | 2 +- .../ExternalConfigBrooklynPropertiesTest.java | 2 +- .../camp/brooklyn/LocationsYamlTest.java | 2 +- .../catalog/CatalogYamlLocationTest.java | 2 +- .../core/entity/EntityFunctionsTest.java | 2 +- .../core/entity/EntityPredicatesTest.java | 2 +- .../core/entity/EntitySuppliersTest.java | 2 +- .../core/location/LocationManagementTest.java | 8 ++--- .../core/location/LocationPredicatesTest.java | 2 +- .../core/location/LocationRegistryTest.java | 37 ++++++++++---------- .../access/BrooklynAccessUtilsTest.java | 2 +- .../PortForwardManagerLocationResolverTest.java | 2 +- .../access/PortForwardManagerRebindTest.java | 2 +- .../location/access/PortForwardManagerTest.java | 4 +-- .../internal/LocalManagementContextTest.java | 8 ++--- .../core/mgmt/rebind/RebindPolicyTest.java | 2 +- .../core/test/entity/TestApplication.java | 7 ++-- .../core/test/entity/TestApplicationImpl.java | 2 +- .../location/byon/ByonLocationResolverTest.java | 17 ++++----- .../location/byon/HostLocationResolverTest.java | 2 +- .../byon/SingleMachineLocationResolverTest.java | 2 +- .../SingleMachineProvisioningLocationTest.java | 2 +- .../LocalhostLocationResolverTest.java | 20 +++++------ ...ocalhostMachineProvisioningLocationTest.java | 2 +- .../LocalhostProvisioningAndAccessTest.java | 2 +- .../multi/MultiLocationResolverTest.java | 11 +++--- .../ssh/SshMachineLocationIntegrationTest.java | 28 +++++++++------ .../ssh/SshMachineLocationSshToolTest.java | 4 +-- .../mgmt/persist/jclouds/BlobStoreCleaner.java | 2 +- .../persist/jclouds/BlobStoreExpiryTest.java | 2 +- .../mgmt/persist/jclouds/BlobStoreTest.java | 2 +- .../jclouds/JcloudsExpect100ContinueTest.java | 2 +- .../jclouds/AbstractJcloudsStubbedLiveTest.java | 2 +- .../jclouds/JcloudsAddressesLiveTest.java | 4 +-- .../JcloudsByonLocationResolverAwsLiveTest.java | 4 +-- ...dsByonLocationResolverSoftlayerLiveTest.java | 4 +-- .../JcloudsByonLocationResolverTest.java | 2 +- .../jclouds/JcloudsByonRebindLiveTest.java | 4 +-- .../jclouds/JcloudsLocationMetadataTest.java | 4 +-- .../JcloudsLocationRegisterMachineLiveTest.java | 6 ++-- ...cloudsLocationReleasePortForwardingTest.java | 4 +-- .../jclouds/JcloudsLocationResolverTest.java | 4 +-- ...udsLocationSuspendResumeMachineLiveTest.java | 2 +- ...ationTemplateOptionsCustomisersLiveTest.java | 2 +- .../location/jclouds/JcloudsLoginLiveTest.java | 26 +++++++------- .../location/jclouds/JcloudsRebindLiveTest.java | 2 +- .../location/jclouds/JcloudsRebindStubTest.java | 2 +- .../location/jclouds/JcloudsSshingLiveTest.java | 2 +- .../location/jclouds/JcloudsSuseLiveTest.java | 4 +-- .../jclouds/RebindJcloudsLocationLiveTest.java | 2 +- .../jclouds/RebindJcloudsLocationTest.java | 2 +- ...loudsLocationUserLoginAndConfigLiveTest.java | 2 +- ...hineProvisioningLocationJcloudsLiveTest.java | 2 +- .../provider/AbstractJcloudsLocationTest.java | 8 ++--- .../provider/AwsEc2LocationWindowsLiveTest.java | 2 +- .../provider/CarrenzaLocationLiveTest.java | 2 +- .../provider/RackspaceLocationLiveTest.java | 2 +- .../zone/AwsAvailabilityZoneExtensionTest.java | 2 +- .../jclouds/os/CreateUserPolicyLiveTest.java | 13 ++++--- .../rest/resources/LocationResourceTest.java | 4 +-- .../SensorResourceIntegrationTest.java | 2 +- .../rest/util/EntityLocationUtilsTest.java | 2 +- .../rest/resources/LocationResourceTest.java | 4 +-- .../SensorResourceIntegrationTest.java | 2 +- .../rest/util/EntityLocationUtilsTest.java | 2 +- .../brooklyn/entity/AbstractEc2LiveTest.java | 2 +- .../entity/AbstractGoogleComputeLiveTest.java | 2 +- .../entity/AbstractSoftlayerLiveTest.java | 2 +- .../entity/chef/ChefLiveTestSupport.java | 19 +++++----- .../entity/machine/MachineEntityRebindTest.java | 2 +- .../machine/SetHostnameCustomizerLiveTest.java | 2 +- .../entity/machine/pool/ServerPoolLiveTest.java | 2 +- .../pool/ServerPoolLocationResolverTest.java | 2 +- .../software/base/AbstractDockerLiveTest.java | 2 +- ...twareProcessOpenIptablesStreamsLiveTest.java | 2 +- .../base/SoftwareProcessSubclassTest.java | 2 +- ...ftwareProcessAndChildrenIntegrationTest.java | 2 +- .../VanillaSoftwareProcessIntegrationTest.java | 2 +- ...laSoftwareProcessStreamsIntegrationTest.java | 2 +- .../AutoScalerPolicyNoMoreMachinesTest.java | 2 +- .../base/test/location/WindowsTestFixture.java | 4 +-- .../PortAttributeSensorAndConfigKeyTest.java | 4 +-- .../SystemServiceEnricherTest.java | 2 +- .../WindowsPerformanceCounterFeedLiveTest.java | 2 +- .../winrm/ByonLocationResolverTest.java | 18 ++-------- .../brooklyn/util/collections/MutableMap.java | 2 +- 86 files changed, 197 insertions(+), 201 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java index 31faa35..30112f2 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ByonLocationsYamlTest.java @@ -200,7 +200,7 @@ public class ByonLocationsYamlTest extends AbstractYamlTest { Entity app = createStartWaitAndLogApplication(new StringReader(yaml)); FixedListMachineProvisioningLocation<MachineLocation> loc = (FixedListMachineProvisioningLocation<MachineLocation>) Iterables.get(app.getLocations(), 0); - PortForwardManager pfm = (PortForwardManager) mgmt().getLocationRegistry().resolve("portForwardManager(scope=global)"); + PortForwardManager pfm = (PortForwardManager) mgmt().getLocationRegistry().getLocationManaged("portForwardManager(scope=global)"); Set<MachineLocation> machines = loc.getAvailable(); assertEquals(machines.size(), 2, "machines="+machines); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigBrooklynPropertiesTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigBrooklynPropertiesTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigBrooklynPropertiesTest.java index 39b444d..afa3b36 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigBrooklynPropertiesTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/ExternalConfigBrooklynPropertiesTest.java @@ -85,7 +85,7 @@ public class ExternalConfigBrooklynPropertiesTest extends AbstractYamlTest { props.put("brooklyn.location.jclouds.aws-ec2.identity", "$brooklyn:external(\"myprovider\", \"mykey\")"); props.put("brooklyn.location.jclouds.aws-ec2.credential", "$brooklyn:external(\"myprovider\", \"mykey2\")"); - JcloudsLocation loc = (JcloudsLocation) mgmt().getLocationRegistry().resolve("jclouds:aws-ec2:us-east-1"); + JcloudsLocation loc = (JcloudsLocation) mgmt().getLocationRegistry().getLocationManaged("jclouds:aws-ec2:us-east-1"); assertEquals(loc.getIdentity(), "myval"); assertEquals(loc.getCredential(), "myval2"); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java index f1efd33..5566e1d 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/LocationsYamlTest.java @@ -263,7 +263,7 @@ public class LocationsYamlTest extends AbstractYamlTest { Entity app = createStartWaitAndLogApplication(new StringReader(yaml)); Entity child = Iterables.getOnlyElement(app.getChildren()); MultiLocation<?> loc = (MultiLocation<?>) Iterables.getOnlyElement(Entities.getAllInheritedLocations(child)); - Assert.assertEquals(loc.getSubLocations().size(), 2); + Assert.assertEquals(loc.getSubLocationsAsLocations().size(), 2); assertUserAddress((SshMachineLocation)loc.obtain(), "root", "127.0.0.1"); assertUserAddress((SshMachineLocation)loc.obtain(), "root", "127.0.0.2"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java ---------------------------------------------------------------------- diff --git a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java index cd1e917..dda13ea 100644 --- a/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java +++ b/camp/camp-brooklyn/src/test/java/org/apache/brooklyn/camp/brooklyn/catalog/CatalogYamlLocationTest.java @@ -266,7 +266,7 @@ public class CatalogYamlLocationTest extends AbstractYamlTest { assertCatalogCount(1); assertLocationManagerInstancesCount(0); - Location loc = mgmt().getLocationRegistry().resolve("lh1"); + Location loc = mgmt().getLocationRegistry().getLocationManaged("lh1"); assertLocationRegistryCount(1); assertCatalogCount(1); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/entity/EntityFunctionsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityFunctionsTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityFunctionsTest.java index 3b68738..6bb9e35 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityFunctionsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityFunctionsTest.java @@ -42,7 +42,7 @@ public class EntityFunctionsTest extends BrooklynAppUnitTestSupport { public void setUp() throws Exception { super.setUp(); entity = app.createAndManageChild(EntitySpec.create(TestEntity.class).displayName("mydisplayname")); - loc = app.getManagementContext().getLocationRegistry().resolve("localhost"); + loc = app.getManagementContext().getLocationRegistry().getLocationManaged("localhost"); } @Test http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/entity/EntityPredicatesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntityPredicatesTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntityPredicatesTest.java index 6db1a55..1b75876 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntityPredicatesTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntityPredicatesTest.java @@ -47,7 +47,7 @@ public class EntityPredicatesTest extends BrooklynAppUnitTestSupport { super.setUp(); entity = app.createAndManageChild(EntitySpec.create(TestEntity.class).displayName("mydisplayname")); group = app.createAndManageChild(EntitySpec.create(BasicGroup.class)); - loc = app.getManagementContext().getLocationRegistry().resolve("localhost"); + loc = app.getManagementContext().getLocationRegistry().getLocationManaged("localhost"); } @Test http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/entity/EntitySuppliersTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySuppliersTest.java b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySuppliersTest.java index 1ed5b26..3c654be 100644 --- a/core/src/test/java/org/apache/brooklyn/core/entity/EntitySuppliersTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/entity/EntitySuppliersTest.java @@ -47,7 +47,7 @@ public class EntitySuppliersTest extends BrooklynAppUnitTestSupport { public void setUp() throws Exception { super.setUp(); entity = app.createAndManageChild(EntitySpec.create(TestEntity.class).displayName("mydisplayname")); - loc = app.getManagementContext().getLocationRegistry().resolve("localhost"); + loc = app.getManagementContext().getLocationRegistry().getLocationManaged("localhost"); machine = ((MachineProvisioningLocation<SshMachineLocation>)loc).obtain(ImmutableMap.of()); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/location/LocationManagementTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/LocationManagementTest.java b/core/src/test/java/org/apache/brooklyn/core/location/LocationManagementTest.java index 91b8da4..3a7d957 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/LocationManagementTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/LocationManagementTest.java @@ -62,7 +62,7 @@ public class LocationManagementTest extends BrooklynAppUnitTestSupport { public void testCreateLocationUsingResolver() { String spec = "byon:(hosts=\"1.1.1.1\")"; @SuppressWarnings("unchecked") - FixedListMachineProvisioningLocation<SshMachineLocation> loc = (FixedListMachineProvisioningLocation<SshMachineLocation>) mgmt.getLocationRegistry().resolve(spec); + FixedListMachineProvisioningLocation<SshMachineLocation> loc = (FixedListMachineProvisioningLocation<SshMachineLocation>) mgmt.getLocationRegistry().getLocationManaged(spec); SshMachineLocation machine = Iterables.getOnlyElement(loc.getAllMachines()); assertSame(locationManager.getLocation(loc.getId()), loc); @@ -73,7 +73,7 @@ public class LocationManagementTest extends BrooklynAppUnitTestSupport { public void testChildrenOfManagedLocationAutoManaged() { String spec = "byon:(hosts=\"1.1.1.1\")"; @SuppressWarnings("unchecked") - FixedListMachineProvisioningLocation<SshMachineLocation> loc = (FixedListMachineProvisioningLocation<SshMachineLocation>) mgmt.getLocationRegistry().resolve(spec); + FixedListMachineProvisioningLocation<SshMachineLocation> loc = (FixedListMachineProvisioningLocation<SshMachineLocation>) mgmt.getLocationRegistry().getLocationManaged(spec); SshMachineLocation machine = new SshMachineLocation(ImmutableMap.of("address", "1.2.3.4")); loc.addChild(machine); @@ -88,7 +88,7 @@ public class LocationManagementTest extends BrooklynAppUnitTestSupport { @Test public void testManagedLocationsSimpleCreateAndCleanup() { Asserts.assertThat(locationManager.getLocations(), CollectionFunctionals.sizeEquals(0)); - Location loc = mgmt.getLocationRegistry().resolve("localhost"); + Location loc = mgmt.getLocationRegistry().getLocationManaged("localhost"); Asserts.assertThat(locationManager.getLocations(), CollectionFunctionals.sizeEquals(1)); mgmt.getLocationManager().unmanage(loc); Asserts.assertThat(locationManager.getLocations(), CollectionFunctionals.sizeEquals(0)); @@ -107,7 +107,7 @@ public class LocationManagementTest extends BrooklynAppUnitTestSupport { // currently such defined locations do NOT appear in catalog -- see CatalogYamlLocationTest Asserts.assertThat(mgmt.getCatalog().getCatalogItems(), CollectionFunctionals.sizeEquals(0)); - Location loc = mgmt.getLocationRegistry().resolve("lh1"); + Location loc = mgmt.getLocationRegistry().getLocationManaged("lh1"); Asserts.assertThat(mgmt.getLocationRegistry().getDefinedLocations().keySet(), CollectionFunctionals.sizeEquals(1)); Asserts.assertThat(locationManager.getLocations(), CollectionFunctionals.sizeEquals(1)); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/location/LocationPredicatesTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/LocationPredicatesTest.java b/core/src/test/java/org/apache/brooklyn/core/location/LocationPredicatesTest.java index 9991931..8437526 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/LocationPredicatesTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/LocationPredicatesTest.java @@ -45,7 +45,7 @@ public class LocationPredicatesTest { @BeforeMethod(alwaysRun=true) public void setUp() throws Exception { managementContext = LocalManagementContextForTests.newInstance(); - loc = (LocalhostMachineProvisioningLocation) managementContext.getLocationRegistry().resolve("localhost:(name=mydisplayname)"); + loc = (LocalhostMachineProvisioningLocation) managementContext.getLocationRegistry().getLocationManaged("localhost:(name=mydisplayname)"); childLoc = loc.obtain(); grandchildLoc = managementContext.getLocationManager().createLocation(LocationSpec.create(SimulatedLocation.class).parent(childLoc)); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/location/LocationRegistryTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/LocationRegistryTest.java b/core/src/test/java/org/apache/brooklyn/core/location/LocationRegistryTest.java index 59ba4b4..bd27f81 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/LocationRegistryTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/LocationRegistryTest.java @@ -23,8 +23,6 @@ import org.apache.brooklyn.api.location.LocationDefinition; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.internal.BrooklynProperties; -import org.apache.brooklyn.core.location.BasicLocationRegistry; -import org.apache.brooklyn.core.location.LocationConfigKeys; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.location.byon.FixedListMachineProvisioningLocation; @@ -71,19 +69,23 @@ public class LocationRegistryTest { locdef = mgmt.getLocationRegistry().getDefinedLocationByName("foo"); log.info("testResovlesBy has defined locations: "+mgmt.getLocationRegistry().getDefinedLocations()); - Location l = mgmt.getLocationRegistry().resolve("named:foo"); + LocationSpec<?> ls = mgmt.getLocationRegistry().getLocationSpec("named:foo").get(); + Location l = mgmt.getLocationManager().createLocation(ls); Assert.assertNotNull(l); Assert.assertEquals(l.getConfig(LocationConfigKeys.PRIVATE_KEY_FILE), "~/.ssh/foo.id_rsa"); - l = mgmt.getLocationRegistry().resolve("foo"); + ls = mgmt.getLocationRegistry().getLocationSpec("foo").get(); + l = mgmt.getLocationManager().createLocation(ls); Assert.assertNotNull(l); Assert.assertEquals(l.getConfig(LocationConfigKeys.PRIVATE_KEY_FILE), "~/.ssh/foo.id_rsa"); - l = mgmt.getLocationRegistry().resolve("id:"+locdef.getId()); + ls = mgmt.getLocationRegistry().getLocationSpec("id:"+locdef.getId()).get(); + l = mgmt.getLocationManager().createLocation(ls); Assert.assertNotNull(l); Assert.assertEquals(l.getConfig(LocationConfigKeys.PRIVATE_KEY_FILE), "~/.ssh/foo.id_rsa"); - l = mgmt.getLocationRegistry().resolve(locdef.getId()); + ls = mgmt.getLocationRegistry().getLocationSpec(locdef.getId()).get(); + l = mgmt.getLocationManager().createLocation(ls); Assert.assertNotNull(l); Assert.assertEquals(l.getConfig(LocationConfigKeys.PRIVATE_KEY_FILE), "~/.ssh/foo.id_rsa"); } @@ -94,7 +96,8 @@ public class LocationRegistryTest { properties.put("brooklyn.location.named.foo", "byon:(hosts=\"root@192.168.1.{1,2,3,4}\")"); properties.put("brooklyn.location.named.foo.displayName", "My Foo"); mgmt = LocalManagementContextForTests.newInstance(properties); - Location l = mgmt.getLocationRegistry().resolve("foo"); + LocationSpec<?> ls = mgmt.getLocationRegistry().getLocationSpec("foo").get(); + Location l = mgmt.getLocationManager().createLocation(ls); Assert.assertEquals(l.getDisplayName(), "My Foo"); } @@ -103,7 +106,8 @@ public class LocationRegistryTest { BrooklynProperties properties = BrooklynProperties.Factory.newEmpty(); properties.put("brooklyn.location.named.foo", "byon:(hosts=\"root@192.168.1.{1,2,3,4}\")"); mgmt = LocalManagementContextForTests.newInstance(properties); - Location l = mgmt.getLocationRegistry().resolve("foo"); + LocationSpec<? extends Location> ls = mgmt.getLocationRegistry().getLocationSpec("foo").get(); + Location l = mgmt.getLocationManager().createLocation(ls); Assert.assertNotNull(l.getDisplayName()); Assert.assertTrue(l.getDisplayName().startsWith(FixedListMachineProvisioningLocation.class.getSimpleName()), "name="+l.getDisplayName()); // TODO currently it gives default name; it would be nice to use 'foo', @@ -124,17 +128,12 @@ public class LocationRegistryTest { properties.put("brooklyn.location.named.bar", "named:bar"); mgmt = LocalManagementContextForTests.newInstance(properties); log.info("bar properties gave defined locations: "+mgmt.getLocationRegistry().getDefinedLocations()); - boolean resolved = false; try { - mgmt.getLocationRegistry().resolve("bar"); - resolved = true; + mgmt.getLocationRegistry().getLocationSpec("bar").get(); + Asserts.shouldHaveFailedPreviously("Circular reference gave a location"); } catch (IllegalStateException e) { - //expected - log.info("bar properties correctly caught circular reference: "+e); + Asserts.expectedFailureContainsIgnoreCase(e, "bar"); } - if (resolved) - // probably won't happen, if test fails will loop endlessly above - Assert.fail("Circular reference resolved location"); } protected boolean findLocationMatching(String regex) { @@ -172,7 +171,7 @@ public class LocationRegistryTest { mgmt = LocalManagementContextForTests.newInstance(properties); Assert.assertTrue( findLocationMatching("localhost_allowed") ); - Maybe<Location> l = mgmt.getLocationRegistry().resolve("localhost_allowed", false, null); + Maybe<LocationSpec<?>> l = mgmt.getLocationRegistry().getLocationSpec("localhost_allowed"); Assert.assertTrue( l.isPresent(), "Should have resolved: "+l ); l.get(); } @@ -185,7 +184,7 @@ public class LocationRegistryTest { mgmt = LocalManagementContextForTests.newInstance(properties); Assert.assertTrue( findLocationMatching("bogus_will_fail_eventually") ); - Maybe<Location> l = mgmt.getLocationRegistry().resolve("bogus_will_fail_eventually", false, null); + Maybe<LocationSpec<?>> l = mgmt.getLocationRegistry().getLocationSpec("bogus_will_fail_eventually"); Assert.assertTrue( l.isAbsent(), "Should not have resolved: "+l ); try { l.get(); @@ -203,7 +202,7 @@ public class LocationRegistryTest { mgmt = LocalManagementContextForTests.newInstance(properties); Assert.assertTrue( findLocationMatching("local_host_not_allowed") ); - Maybe<Location> l = mgmt.getLocationRegistry().resolve("local_host_not_allowed", false, null); + Maybe<LocationSpec<?>> l = mgmt.getLocationRegistry().getLocationSpec("local_host_not_allowed"); Assert.assertTrue( l.isAbsent(), "Should not have resolved: "+l ); try { l.get(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtilsTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtilsTest.java b/core/src/test/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtilsTest.java index afca28d..592e281 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtilsTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/access/BrooklynAccessUtilsTest.java @@ -52,7 +52,7 @@ public class BrooklynAccessUtilsTest extends BrooklynAppUnitTestSupport { public void setUp() throws Exception { super.setUp(); - pfm = (PortForwardManager) mgmt.getLocationRegistry().resolve("portForwardManager(scope=global)"); + pfm = (PortForwardManager) mgmt.getLocationRegistry().getLocationManaged("portForwardManager(scope=global)"); } @Test http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolverTest.java index c911236..eb518f7 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerLocationResolverTest.java @@ -61,7 +61,7 @@ public class PortForwardManagerLocationResolverTest { } private Location resolve(String val) { - Location l = managementContext.getLocationRegistry().resolve(val); + Location l = managementContext.getLocationRegistry().getLocationManaged(val); Assert.assertNotNull(l); return l; } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java index 3ce1177..3693162 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerRebindTest.java @@ -186,7 +186,7 @@ public class PortForwardManagerRebindTest extends RebindTestFixtureWithApp { super.init(); if (getConfig(PORT_FORWARD_MANAGER) == null) { - PortForwardManager pfm = (PortForwardManager) getManagementContext().getLocationRegistry().resolve("portForwardManager(scope=global)"); + PortForwardManager pfm = (PortForwardManager) getManagementContext().getLocationRegistry().getLocationManaged("portForwardManager(scope=global)"); sensors().set(PORT_FORWARD_MANAGER_LIVE, pfm); config().set(PORT_FORWARD_MANAGER, pfm); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java index f3a8693..11ef2f9 100644 --- a/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/location/access/PortForwardManagerTest.java @@ -55,7 +55,7 @@ public class PortForwardManagerTest extends BrooklynAppUnitTestSupport { public void setUp() throws Exception { super.setUp(); - pfm = (PortForwardManager) mgmt.getLocationRegistry().resolve("portForwardManager(scope=global)"); + pfm = (PortForwardManager) mgmt.getLocationRegistry().getLocationManaged("portForwardManager(scope=global)"); machine1 = mgmt.getLocationManager().createLocation(LocationSpec.create(SshMachineLocation.class) .configure("address", Networking.getInetAddressWithFixedName("1.2.3.4")) @@ -104,7 +104,7 @@ public class PortForwardManagerTest extends BrooklynAppUnitTestSupport { props.put(PortForwardManager.PORT_FORWARD_MANAGER_STARTING_PORT, 1234); LocalManagementContextForTests mgmt2 = new LocalManagementContextForTests(props); try { - PortForwardManager pfm2 = (PortForwardManager) mgmt2.getLocationRegistry().resolve("portForwardManager(scope=global)"); + PortForwardManager pfm2 = (PortForwardManager) mgmt2.getLocationRegistry().getLocationManaged("portForwardManager(scope=global)"); int port = pfm2.acquirePublicPort("myipid"); assertEquals(port, 1234); } finally { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java index d17035c..98f5823 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/internal/LocalManagementContextTest.java @@ -64,12 +64,12 @@ public class LocalManagementContextTest { .globalPropertiesFile(globalPropertiesFile.getAbsolutePath()); // no builder support in LocalManagementContextForTests (we are testing that the builder's files are reloaded so we need it here) context = new LocalManagementContext(propsBuilder); - Location location = context.getLocationRegistry().resolve("localhost"); + Location location = context.getLocationRegistry().getLocationManaged("localhost"); assertEquals(location.getDisplayName(), "myname"); String newGlobalPropertiesContents = "brooklyn.location.localhost.displayName=myname2"; Files.write(newGlobalPropertiesContents, globalPropertiesFile, Charsets.UTF_8); context.reloadBrooklynProperties(); - Location location2 = context.getLocationRegistry().resolve("localhost"); + Location location2 = context.getLocationRegistry().getLocationManaged("localhost"); assertEquals(location.getDisplayName(), "myname"); assertEquals(location2.getDisplayName(), "myname2"); } @@ -82,12 +82,12 @@ public class LocalManagementContextTest { .globalPropertiesFile(globalPropertiesFile.getAbsolutePath()) .build(); context = LocalManagementContextForTests.builder(true).useProperties(brooklynProperties).build(); - Location location = context.getLocationRegistry().resolve("localhost"); + Location location = context.getLocationRegistry().getLocationManaged("localhost"); assertEquals(location.getDisplayName(), "myname"); String newGlobalPropertiesContents = "brooklyn.location.localhost.displayName=myname2"; Files.write(newGlobalPropertiesContents, globalPropertiesFile, Charsets.UTF_8); context.reloadBrooklynProperties(); - Location location2 = context.getLocationRegistry().resolve("localhost"); + Location location2 = context.getLocationRegistry().getLocationManaged("localhost"); assertEquals(location.getDisplayName(), "myname"); assertEquals(location2.getDisplayName(), "myname"); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java index fb6446b..4ce7efe 100644 --- a/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java +++ b/core/src/test/java/org/apache/brooklyn/core/mgmt/rebind/RebindPolicyTest.java @@ -128,7 +128,7 @@ public class RebindPolicyTest extends RebindTestFixtureWithApp { @Test public void testExpungesOnEntityUnmanaged() throws Exception { - Location loc = origManagementContext.getLocationRegistry().resolve("localhost"); + Location loc = origManagementContext.getLocationRegistry().getLocationManaged("localhost"); TestEntity entity = origApp.createAndManageChild(EntitySpec.create(TestEntity.class)); MyPolicy policy = entity.policies().add(PolicySpec.create(MyPolicy.class)); MyEnricher enricher = entity.enrichers().add(EnricherSpec.create(MyEnricher.class)); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java index 358b6d4..d5ad915 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplication.java @@ -47,10 +47,11 @@ public interface TestApplication extends StartableApplication, EntityInternal { public <T extends Entity> T createAndManageChild(EntitySpec<T> spec); - /** @deprecated since 0.9.0 give the location spec spec to the entity spec instead, - * using {@link #LOCALHOST_PROVISIONER_SPEC} or {@link #LOCALHOST_MACHINE_SPEC} */ @Deprecated + /** Create a managed location instance for use in tests. + * Note that it is typically preferred to pass a location spec to the entity spec instead, + * e.g. using {@link #LOCALHOST_PROVISIONER_SPEC} or {@link #LOCALHOST_MACHINE_SPEC}; + * however in many tests this is simpler. */ public LocalhostMachineProvisioningLocation newLocalhostProvisioningLocation(); - // items below it would be nice to update; there are fewer of them but they are more involved public SimulatedLocation newSimulatedLocation(); public LocalhostMachineProvisioningLocation newLocalhostProvisioningLocation(Map<?,?> flags); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java index ae3cc5f..f087a32 100644 --- a/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java +++ b/core/src/test/java/org/apache/brooklyn/core/test/entity/TestApplicationImpl.java @@ -78,7 +78,7 @@ public class TestApplicationImpl extends AbstractApplication implements TestAppl @Override public LocalhostMachineProvisioningLocation newLocalhostProvisioningLocation() { - return (LocalhostMachineProvisioningLocation) getManagementContext().getLocationRegistry().resolve("localhost"); + return (LocalhostMachineProvisioningLocation) getManagementContext().getLocationRegistry().getLocationManaged("localhost"); } @Override http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/byon/ByonLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/byon/ByonLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/byon/ByonLocationResolverTest.java index 675125f..c03e9b2 100644 --- a/core/src/test/java/org/apache/brooklyn/location/byon/ByonLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/byon/ByonLocationResolverTest.java @@ -30,6 +30,8 @@ import java.util.Set; import javax.annotation.Nullable; +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; @@ -54,7 +56,6 @@ import org.slf4j.LoggerFactory; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import com.google.common.base.Function; @@ -158,7 +159,7 @@ public class ByonLocationResolverTest { public void testRegistryCommaResolutionInListNotAllowed() throws NoMachinesAvailableException { // disallowed since 0.7.0 // fails because it interprets the entire string as a single byon spec, which does not parse - managementContext.getLocationRegistry().resolve(ImmutableList.of("byon(hosts=\"192.168.0.1\",user=bob),byon(hosts=\"192.168.0.2\",user=bob2)")); + managementContext.getLocationRegistry().getListOfLocationsManaged(ImmutableList.of("byon(hosts=\"192.168.0.1\",user=bob),byon(hosts=\"192.168.0.2\",user=bob2)")); } @Test @@ -248,8 +249,8 @@ public class ByonLocationResolverTest { "brooklyn.location.named.foo.user", "bob")); ((BasicLocationRegistry)managementContext.getLocationRegistry()).updateDefinedLocations(); - MachineProvisioningLocation<SshMachineLocation> ll = (MachineProvisioningLocation<SshMachineLocation>) - new NamedLocationResolver().newLocationFromString(MutableMap.of(), "named:foo", managementContext.getLocationRegistry()); + LocationSpec<? extends Location> lspec = new NamedLocationResolver().newLocationSpecFromString("named:foo", MutableMap.of(), managementContext.getLocationRegistry()); + MachineProvisioningLocation<SshMachineLocation> ll = (MachineProvisioningLocation<SshMachineLocation>) managementContext.getLocationManager().createLocation(lspec); SshMachineLocation l = ll.obtain(MutableMap.of()); Assert.assertEquals("bob", l.getUser()); } @@ -273,8 +274,8 @@ public class ByonLocationResolverTest { "brooklyn.location.named.foo.privateKeyFile", "/tmp/x")); ((BasicLocationRegistry)managementContext.getLocationRegistry()).updateDefinedLocations(); - MachineProvisioningLocation<SshMachineLocation> ll = (MachineProvisioningLocation<SshMachineLocation>) - new NamedLocationResolver().newLocationFromString(MutableMap.of(), "named:foo", managementContext.getLocationRegistry()); + LocationSpec<? extends Location> lspec = new NamedLocationResolver().newLocationSpecFromString("named:foo", MutableMap.of(), managementContext.getLocationRegistry()); + MachineProvisioningLocation<SshMachineLocation> ll = (MachineProvisioningLocation<SshMachineLocation>) managementContext.getLocationManager().createLocation(lspec); Assert.assertEquals("/tmp/x", ll.getConfig(LocationConfigKeys.PRIVATE_KEY_FILE)); Assert.assertTrue(((LocationInternal)ll).config().getLocalRaw(LocationConfigKeys.PRIVATE_KEY_FILE).isPresent()); @@ -401,11 +402,11 @@ public class ByonLocationResolverTest { @SuppressWarnings("unchecked") private FixedListMachineProvisioningLocation<MachineLocation> resolve(String val) { - return (FixedListMachineProvisioningLocation<MachineLocation>) managementContext.getLocationRegistry().resolve(val); + return (FixedListMachineProvisioningLocation<MachineLocation>) managementContext.getLocationRegistry().getLocationManaged(val); } @SuppressWarnings("unchecked") private FixedListMachineProvisioningLocation<MachineLocation> resolve(String val, Map<?, ?> locationFlags) { - return (FixedListMachineProvisioningLocation<MachineLocation>) managementContext.getLocationRegistry().resolve(val, locationFlags); + return (FixedListMachineProvisioningLocation<MachineLocation>) managementContext.getLocationRegistry().getLocationManaged(val, locationFlags); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/byon/HostLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/byon/HostLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/byon/HostLocationResolverTest.java index 2c3b1b0..77f9b2d 100644 --- a/core/src/test/java/org/apache/brooklyn/location/byon/HostLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/byon/HostLocationResolverTest.java @@ -121,6 +121,6 @@ public class HostLocationResolverTest { @SuppressWarnings("unchecked") private MachineProvisioningLocation<SshMachineLocation> resolve(String val) { - return (MachineProvisioningLocation<SshMachineLocation>) managementContext.getLocationRegistry().resolve(val); + return (MachineProvisioningLocation<SshMachineLocation>) managementContext.getLocationRegistry().getLocationManaged(val); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineLocationResolverTest.java index ae39e91..ddb8611 100644 --- a/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineLocationResolverTest.java @@ -126,7 +126,7 @@ public class SingleMachineLocationResolverTest { @SuppressWarnings("unchecked") private SingleMachineProvisioningLocation<SshMachineLocation> resolve(String val) { - return (SingleMachineProvisioningLocation<SshMachineLocation>) managementContext.getLocationRegistry().resolve(val); + return (SingleMachineProvisioningLocation<SshMachineLocation>) managementContext.getLocationRegistry().getLocationManaged(val); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocationTest.java index 27dee20..67329c8 100644 --- a/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/byon/SingleMachineProvisioningLocationTest.java @@ -50,7 +50,7 @@ public class SingleMachineProvisioningLocationTest { @Test public void testLocalhostSingle() throws Exception { SingleMachineProvisioningLocation<SshMachineLocation> l = (SingleMachineProvisioningLocation<SshMachineLocation>) - managementContext.getLocationRegistry().resolve("single:(target='localhost')"); + managementContext.getLocationRegistry().getLocationManaged("single:(target='localhost')"); l.setManagementContext(managementContext); SshMachineLocation m1 = l.obtain(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostLocationResolverTest.java index cbc003f..3e17883 100644 --- a/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostLocationResolverTest.java @@ -150,7 +150,7 @@ public class LocalhostLocationResolverTest { @Test public void testAcceptsList() { - List<Location> l = getLocationResolver().resolve(ImmutableList.of("localhost")); + List<Location> l = getLocationResolver().getListOfLocationsManaged(ImmutableList.of("localhost")); assertEquals(l.size(), 1, "l="+l); assertTrue(l.get(0) instanceof LocalhostMachineProvisioningLocation, "l="+l); } @@ -159,14 +159,14 @@ public class LocalhostLocationResolverTest { @Test public void testRegistryCommaResolution() throws NoMachinesAvailableException { List<Location> l; - l = getLocationResolver().resolve(JavaStringEscapes.unwrapJsonishListIfPossible("localhost,localhost,localhost")); + l = getLocationResolver().getListOfLocationsManaged(JavaStringEscapes.unwrapJsonishListIfPossible("localhost,localhost,localhost")); assertEquals(l.size(), 3, "l="+l); assertTrue(l.get(0) instanceof LocalhostMachineProvisioningLocation, "l="+l); assertTrue(l.get(1) instanceof LocalhostMachineProvisioningLocation, "l="+l); assertTrue(l.get(2) instanceof LocalhostMachineProvisioningLocation, "l="+l); // And check works if comma in brackets - l = getLocationResolver().resolve(JavaStringEscapes.unwrapJsonishListIfPossible( + l = getLocationResolver().getListOfLocationsManaged(JavaStringEscapes.unwrapJsonishListIfPossible( "[ \"byon:(hosts=\\\"192.168.0.1\\\",user=bob)\", \"byon:(hosts=\\\"192.168.0.2\\\",user=bob2)\" ]")); assertEquals(l.size(), 2, "l="+l); assertTrue(l.get(0) instanceof FixedListMachineProvisioningLocation, "l="+l); @@ -178,26 +178,26 @@ public class LocalhostLocationResolverTest { @Test(expectedExceptions={NoSuchElementException.class}) public void testRegistryCommaResolutionInListNotAllowed1() throws NoMachinesAvailableException { // disallowed since 0.7.0 - getLocationResolver().resolve(ImmutableList.of("localhost,localhost,localhost")); + getLocationResolver().getListOfLocationsManaged(ImmutableList.of("localhost,localhost,localhost")); } @Test(expectedExceptions={IllegalArgumentException.class}) public void testRegistryCommaResolutionInListNotAllowed2() throws NoMachinesAvailableException { // disallowed since 0.7.0 // fails because it interprets the entire string as a single spec, which does not parse - getLocationResolver().resolve(ImmutableList.of("localhost(),localhost()")); + getLocationResolver().getListOfLocationsManaged(ImmutableList.of("localhost(),localhost()")); } @Test(expectedExceptions={IllegalArgumentException.class}) public void testRegistryCommaResolutionInListNotAllowed3() throws NoMachinesAvailableException { // disallowed since 0.7.0 // fails because it interprets the entire string as a single spec, which does not parse - getLocationResolver().resolve(ImmutableList.of("localhost(name=a),localhost(name=b)")); + getLocationResolver().getListOfLocationsManaged(ImmutableList.of("localhost(name=a),localhost(name=b)")); } @Test(expectedExceptions={IllegalArgumentException.class}) public void testDoesNotAcceptsListOLists() { - ((BasicLocationRegistry)managementContext.getLocationRegistry()).resolve(ImmutableList.of(ImmutableList.of("localhost"))); + ((BasicLocationRegistry)managementContext.getLocationRegistry()).getListOfLocationsManaged(ImmutableList.of(ImmutableList.of("localhost"))); } @Test @@ -238,7 +238,7 @@ public class LocalhostLocationResolverTest { } private LocationInternal resolve(String val) { - Location l = managementContext.getLocationRegistry().resolve(val); + Location l = managementContext.getLocationRegistry().getLocationManaged(val); Assert.assertNotNull(l); return (LocationInternal) l; } @@ -252,7 +252,7 @@ public class LocalhostLocationResolverTest { } // and check the long form returns an Absent (not throwing) - Assert.assertTrue(managementContext.getLocationRegistry().resolve(val, false, null).isAbsent()); + Assert.assertTrue(managementContext.getLocationRegistry().getLocationSpec(val).isAbsent()); } private void assertThrowsIllegalArgument(String val) { @@ -264,6 +264,6 @@ public class LocalhostLocationResolverTest { } // and check the long form returns an Absent (not throwing) - Assert.assertTrue(managementContext.getLocationRegistry().resolve(val, false, null).isAbsent()); + Assert.assertTrue(managementContext.getLocationRegistry().getLocationSpec(val).isAbsent()); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocationTest.java index c924cd6..3a2b860 100644 --- a/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostMachineProvisioningLocationTest.java @@ -204,7 +204,7 @@ public class LocalhostMachineProvisioningLocationTest { // bogus location so very little chance of it being what maxmind returns! mgmt.getBrooklynProperties().put("brooklyn.location.named.lhx.latitude", 42d); mgmt.getBrooklynProperties().put("brooklyn.location.named.lhx.longitude", -20d); - MachineProvisioningLocation<?> p = (MachineProvisioningLocation<?>) mgmt.getLocationRegistry().resolve("named:lhx"); + MachineProvisioningLocation<?> p = (MachineProvisioningLocation<?>) mgmt.getLocationRegistry().getLocationManaged("named:lhx"); SshMachineLocation m = (SshMachineLocation) p.obtain(MutableMap.of()); HostGeoInfo geo = HostGeoInfo.fromLocation(m); log.info("Geo info for "+m+" is: "+geo); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostProvisioningAndAccessTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostProvisioningAndAccessTest.java b/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostProvisioningAndAccessTest.java index 58d6709..a33f509 100644 --- a/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostProvisioningAndAccessTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/localhost/LocalhostProvisioningAndAccessTest.java @@ -49,7 +49,7 @@ public class LocalhostProvisioningAndAccessTest { @Test(groups="Integration") public void testProvisionAndConnect() throws Exception { - Location location = mgmt.getLocationRegistry().resolve("localhost"); + Location location = mgmt.getLocationRegistry().getLocationManaged("localhost"); assertTrue(location instanceof LocalhostMachineProvisioningLocation); SshMachineLocation m = ((LocalhostMachineProvisioningLocation)location).obtain(); int result = m.execCommands("test", Arrays.asList("echo hello world")); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationResolverTest.java b/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationResolverTest.java index a9f11a8..ef13015b 100644 --- a/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationResolverTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationResolverTest.java @@ -43,7 +43,6 @@ import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.location.byon.FixedListMachineProvisioningLocation; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; -import org.apache.brooklyn.location.multi.MultiLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableList; import org.apache.brooklyn.util.collections.MutableMap; @@ -98,6 +97,7 @@ public class MultiLocationResolverTest { } + @SuppressWarnings("rawtypes") @Test public void testResolvesSubLocs() { assertMultiLocation(resolve("multi:(targets=localhost)"), 1, ImmutableList.of(Predicates.instanceOf(LocalhostMachineProvisioningLocation.class))); @@ -107,6 +107,7 @@ public class MultiLocationResolverTest { assertMultiLocation(resolve("multi:(targets=byon:(hosts=\"1.1.1.1\"))"), 1, ImmutableList.of(Predicates.and( Predicates.instanceOf(FixedListMachineProvisioningLocation.class), new Predicate<MachineProvisioningLocation>() { + @SuppressWarnings("unchecked") @Override public boolean apply(MachineProvisioningLocation input) { SshMachineLocation machine; try { @@ -141,10 +142,10 @@ public class MultiLocationResolverTest { @Test public void testResolvesFromMap() throws NoMachinesAvailableException { - Location l = managementContext.getLocationRegistry().resolve("multi", MutableMap.of("targets", + Location l = managementContext.getLocationRegistry().getLocationManaged("multi", MutableMap.of("targets", MutableList.of("localhost", MutableMap.of("byon", MutableMap.of("hosts", "127.0.0.127"))))); MultiLocation<?> ml = (MultiLocation<?>)l; - Iterator<MachineProvisioningLocation<?>> ci = ml.getSubLocations().iterator(); + Iterator<MachineProvisioningLocation<?>> ci = ml.getSubLocationsAsLocations().iterator(); l = ci.next(); Assert.assertTrue(l instanceof LocalhostMachineProvisioningLocation, "Expected localhost, got "+l); @@ -178,10 +179,10 @@ public class MultiLocationResolverTest { @SuppressWarnings("unchecked") private MultiLocation<SshMachineLocation> resolve(String val) { - return (MultiLocation<SshMachineLocation>) managementContext.getLocationRegistry().resolve(val); + return (MultiLocation<SshMachineLocation>) managementContext.getLocationRegistry().getLocationManaged(val); } - @SuppressWarnings("rawtypes") + @SuppressWarnings({ "rawtypes", "unchecked" }) private void assertMultiLocation(MultiLocation<?> multiLoc, int expectedSize, List<? extends Predicate> expectedSubLocationPredicates) { AvailabilityZoneExtension zones = multiLoc.getExtension(AvailabilityZoneExtension.class); List<Location> subLocs = zones.getAllSubLocations(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java index 95271ee..605d9c0 100644 --- a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationIntegrationTest.java @@ -18,33 +18,34 @@ */ package org.apache.brooklyn.location.ssh; +import static org.testng.Assert.assertEquals; + import java.io.ByteArrayOutputStream; import java.security.KeyPair; import java.util.Arrays; import java.util.Map; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; - +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; -import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.crypto.SecureKeys; import org.apache.brooklyn.util.core.internal.ssh.SshTool; import org.apache.brooklyn.util.core.internal.ssh.sshj.SshjTool; import org.apache.brooklyn.util.core.internal.ssh.sshj.SshjTool.SshjToolBuilder; +import org.apache.brooklyn.util.guava.Maybe; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import com.google.common.base.Preconditions; - -import static org.testng.Assert.assertEquals; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; public class SshMachineLocationIntegrationTest { @@ -75,8 +76,9 @@ public class SshMachineLocationIntegrationTest { // brooklyn.location.named.localhost-passphrase.privateKeyPassphrase=brooklyn @Test(groups = "Integration") public void testExtractingConnectablePassphraselessKey() throws Exception { - LocalhostMachineProvisioningLocation lhp = (LocalhostMachineProvisioningLocation) mgmt.getLocationRegistry().resolve("named:localhost-passphrase", true, null).orNull(); - Preconditions.checkNotNull(lhp, "This test requires a localhost named location called 'localhost-passphrase' (which should have a passphrase set)"); + Maybe<LocationSpec<? extends Location>> lhps = mgmt.getLocationRegistry().getLocationSpec("named:localhost-passphrase"); + Preconditions.checkArgument(lhps.isPresent(), "This test requires a localhost named location called 'localhost-passphrase' (which should have a passphrase set)"); + LocalhostMachineProvisioningLocation lhp = (LocalhostMachineProvisioningLocation) mgmt.getLocationManager().createLocation(lhps.get()); SshMachineLocation sm = lhp.obtain(); SshjToolBuilder builder = SshjTool.builder().host(sm.getAddress().getHostName()).user(sm.getUser()); @@ -98,7 +100,7 @@ public class SshMachineLocationIntegrationTest { // For explanation of (some of) the magic behind this command, see http://stackoverflow.com/a/229606/68898 final String command = "if [[ \"$0\" == \"/var/tmp/\"* ]]; then true; else false; fi"; - LocalhostMachineProvisioningLocation lhp = (LocalhostMachineProvisioningLocation) mgmt.getLocationRegistry().resolve("localhost", true, null).orNull(); + LocalhostMachineProvisioningLocation lhp = mgmt.getLocationManager().createLocation(LocationSpec.create(LocalhostMachineProvisioningLocation.class)); SshMachineLocation sm = lhp.obtain(); Map<String, Object> props = ImmutableMap.<String, Object>builder() @@ -117,7 +119,9 @@ public class SshMachineLocationIntegrationTest { .put(SshMachineLocation.SCRIPT_DIR.getName(), "/var/tmp") .build(); - LocalhostMachineProvisioningLocation lhp = (LocalhostMachineProvisioningLocation) mgmt.getLocationRegistry().resolve("localhost", locationConfig); + LocalhostMachineProvisioningLocation lhp = + mgmt.getLocationManager().createLocation(LocationSpec.create(LocalhostMachineProvisioningLocation.class) + .configure(locationConfig)); SshMachineLocation sm = lhp.obtain(); int rc = sm.execScript("Test script directory execution", ImmutableList.of(command)); @@ -132,7 +136,9 @@ public class SshMachineLocationIntegrationTest { // .put(SshMachineLocation.SCRIPT_DIR.getName(), "/var/tmp") .build(); - LocalhostMachineProvisioningLocation lhp = (LocalhostMachineProvisioningLocation) mgmt.getLocationRegistry().resolve("localhost", locationConfig); + LocalhostMachineProvisioningLocation lhp = + mgmt.getLocationManager().createLocation(LocationSpec.create(LocalhostMachineProvisioningLocation.class) + .configure(locationConfig)); SshMachineLocation sm = lhp.obtain(); int rc = sm.execScript("Test script directory execution", ImmutableList.of(command)); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java index cec7ab0..6e36067 100644 --- a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationSshToolTest.java @@ -96,7 +96,7 @@ public class SshMachineLocationSshToolTest extends BrooklynAppUnitTestSupport { mgmt.getBrooklynProperties().putAll(ImmutableMap.of( "brooklyn.location.named.localhostWithCustomTool", "localhost", "brooklyn.location.named.localhostWithCustomTool."+SshMachineLocation.SSH_TOOL_CLASS.getName(), RecordingSshTool.class.getName())); - MachineProvisioningLocation<SshMachineLocation> loc = (MachineProvisioningLocation<SshMachineLocation>) mgmt.getLocationRegistry().resolve("localhostWithCustomTool"); + MachineProvisioningLocation<SshMachineLocation> loc = (MachineProvisioningLocation<SshMachineLocation>) mgmt.getLocationRegistry().getLocationManaged("localhostWithCustomTool"); SshMachineLocation machine = loc.obtain(ImmutableMap.of()); runCustomSshToolClass(machine); } @@ -108,7 +108,7 @@ public class SshMachineLocationSshToolTest extends BrooklynAppUnitTestSupport { "brooklyn.location.named.localhostWithCustomTool", "byon:(hosts=127.0.0.1, user=myname)", "brooklyn.location.named.localhostWithCustomTool."+SshMachineLocation.SSH_TOOL_CLASS.getName(), RecordingSshTool.class.getName(), "brooklyn.location.named.localhostWithCustomTool."+SshMachineLocation.SSH_TOOL_CLASS.getName()+".myparam", "myvalue")); - MachineProvisioningLocation<SshMachineLocation> loc = (MachineProvisioningLocation<SshMachineLocation>) mgmt.getLocationRegistry().resolve("localhostWithCustomTool"); + MachineProvisioningLocation<SshMachineLocation> loc = (MachineProvisioningLocation<SshMachineLocation>) mgmt.getLocationRegistry().getLocationManaged("localhostWithCustomTool"); SshMachineLocation machine = loc.obtain(ImmutableMap.of()); runCustomSshToolClass(machine); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreCleaner.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreCleaner.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreCleaner.java index da3a921..35495c3 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreCleaner.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreCleaner.java @@ -41,7 +41,7 @@ public class BlobStoreCleaner { public static void main(String[] args) { LocalManagementContextForTests mgmt = new LocalManagementContextForTests(BrooklynProperties.Factory.newDefault()); - JcloudsLocation location = (JcloudsLocation) mgmt.getLocationRegistry().resolve(locationSpec); + JcloudsLocation location = (JcloudsLocation) mgmt.getLocationRegistry().getLocationManaged(locationSpec); String identity = checkNotNull(location.getConfig(LocationConfigKeys.ACCESS_IDENTITY), "identity must not be null"); String credential = checkNotNull(location.getConfig(LocationConfigKeys.ACCESS_CREDENTIAL), "credential must not be null"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java index db09c84..98c49a2 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreExpiryTest.java @@ -95,7 +95,7 @@ public class BlobStoreExpiryTest { if (location==null) { Preconditions.checkNotNull(locationSpec, "locationSpec required for remote object store when location is null"); Preconditions.checkNotNull(mgmt, "mgmt required for remote object store when location is null"); - location = (JcloudsLocation) mgmt.getLocationRegistry().resolve(locationSpec); + location = (JcloudsLocation) mgmt.getLocationRegistry().getLocationManaged(locationSpec); } identity = checkNotNull(location.getConfig(LocationConfigKeys.ACCESS_IDENTITY), "identity must not be null"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java index 5573ace..5c07752 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/BlobStoreTest.java @@ -73,7 +73,7 @@ public class BlobStoreTest { if (location==null) { Preconditions.checkNotNull(locationSpec, "locationSpec required for remote object store when location is null"); Preconditions.checkNotNull(mgmt, "mgmt required for remote object store when location is null"); - location = (JcloudsLocation) mgmt.getLocationRegistry().resolve(locationSpec); + location = (JcloudsLocation) mgmt.getLocationRegistry().getLocationManaged(locationSpec); } String identity = checkNotNull(location.getConfig(LocationConfigKeys.ACCESS_IDENTITY), "identity must not be null"); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsExpect100ContinueTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsExpect100ContinueTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsExpect100ContinueTest.java index f5d3c81..02824f9 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsExpect100ContinueTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsExpect100ContinueTest.java @@ -59,7 +59,7 @@ public class JcloudsExpect100ContinueTest { setInfoLevel("org.jclouds"); mgmt = new LocalManagementContextForTests(BrooklynProperties.Factory.newDefault()); - JcloudsLocation jcloudsLocation = (JcloudsLocation) mgmt.getLocationRegistry().resolve(LOCATION_SPEC); + JcloudsLocation jcloudsLocation = (JcloudsLocation) mgmt.getLocationRegistry().getLocationManaged(LOCATION_SPEC); context = JcloudsUtil.newBlobstoreContext( jcloudsLocation.getProvider(), jcloudsLocation.getEndpoint(), http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java index 5a2c6c0..472dbf3 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsStubbedLiveTest.java @@ -113,7 +113,7 @@ public abstract class AbstractJcloudsStubbedLiveTest extends AbstractJcloudsLive return new StubbedComputeService(delegate, nodeCreator); } }; - jcloudsLocation = (JcloudsLocation) managementContext.getLocationRegistry().resolve( + jcloudsLocation = (JcloudsLocation) managementContext.getLocationRegistry().getLocationManaged( LOCATION_SPEC, ImmutableMap.of( JcloudsLocationConfig.COMPUTE_SERVICE_REGISTRY, computeServiceRegistry, http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java index 70e1bde..4ffb57e 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsAddressesLiveTest.java @@ -70,7 +70,7 @@ public class JcloudsAddressesLiveTest extends AbstractJcloudsLiveTest { @Test(groups = {"Live"}) protected void testAwsEc2Addresses() throws Exception { - jcloudsLocation = (JcloudsLocation) managementContext.getLocationRegistry().resolve(AWS_EC2_LOCATION_SPEC); + jcloudsLocation = (JcloudsLocation) managementContext.getLocationRegistry().getLocationManaged(AWS_EC2_LOCATION_SPEC); machine = createEc2Machine(ImmutableMap.<String,Object>of()); assertSshable(machine); @@ -117,7 +117,7 @@ public class JcloudsAddressesLiveTest extends AbstractJcloudsLiveTest { @Test(groups = {"Live"}) protected void testRackspaceAddresses() throws Exception { - jcloudsLocation = (JcloudsLocation) managementContext.getLocationRegistry().resolve(RACKSPACE_LOCATION_SPEC); + jcloudsLocation = (JcloudsLocation) managementContext.getLocationRegistry().getLocationManaged(RACKSPACE_LOCATION_SPEC); machine = createRackspaceMachine(ImmutableMap.<String,Object>of()); assertSshable(machine); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java index 486f5e7..2285e79 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverAwsLiveTest.java @@ -52,7 +52,7 @@ public class JcloudsByonLocationResolverAwsLiveTest extends AbstractJcloudsLiveT @BeforeClass(groups="Live") public void setUpClass() throws Exception { classManagementContext = newManagementContext(); - classEc2Loc = (JcloudsLocation) classManagementContext.getLocationRegistry().resolve(AWS_LOCATION_SPEC); + classEc2Loc = (JcloudsLocation) classManagementContext.getLocationRegistry().getLocationManaged(AWS_LOCATION_SPEC); classEc2Vm = (JcloudsSshMachineLocation)classEc2Loc.obtain(MutableMap.<String,Object>builder() .put("hardwareId", AWS_EC2_SMALL_HARDWARE_ID) .put("inboundPorts", ImmutableList.of(22)) @@ -172,6 +172,6 @@ public class JcloudsByonLocationResolverAwsLiveTest extends AbstractJcloudsLiveT @SuppressWarnings("unchecked") private FixedListMachineProvisioningLocation<JcloudsSshMachineLocation> resolve(String spec) { - return (FixedListMachineProvisioningLocation<JcloudsSshMachineLocation>) managementContext.getLocationRegistry().resolve(spec); + return (FixedListMachineProvisioningLocation<JcloudsSshMachineLocation>) managementContext.getLocationRegistry().getLocationManaged(spec); } } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java index 112e039..648e71e 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverSoftlayerLiveTest.java @@ -50,7 +50,7 @@ public class JcloudsByonLocationResolverSoftlayerLiveTest extends AbstractJcloud @BeforeClass(groups="Live") public void setUpClass() throws Exception { classManagementContext = newManagementContext(); - classEc2Loc = (JcloudsLocation) classManagementContext.getLocationRegistry().resolve(SOFTLAYER_LOCATION_SPEC); + classEc2Loc = (JcloudsLocation) classManagementContext.getLocationRegistry().getLocationManaged(SOFTLAYER_LOCATION_SPEC); classVm = (JcloudsSshMachineLocation)classEc2Loc.obtain(MutableMap.<String,Object>builder() .put("inboundPorts", ImmutableList.of(22)) .build()); @@ -98,7 +98,7 @@ public class JcloudsByonLocationResolverSoftlayerLiveTest extends AbstractJcloud @SuppressWarnings("unchecked") private FixedListMachineProvisioningLocation<JcloudsSshMachineLocation> resolve(String spec) { - return (FixedListMachineProvisioningLocation<JcloudsSshMachineLocation>) managementContext.getLocationRegistry().resolve(spec); + return (FixedListMachineProvisioningLocation<JcloudsSshMachineLocation>) managementContext.getLocationRegistry().getLocationManaged(spec); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java index 817a0b8..6505b7a 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolverTest.java @@ -57,7 +57,7 @@ public class JcloudsByonLocationResolverTest { @SuppressWarnings("unchecked") private FixedListMachineProvisioningLocation<JcloudsSshMachineLocation> resolve(String spec) { - return (FixedListMachineProvisioningLocation<JcloudsSshMachineLocation>) managementContext.getLocationRegistry().resolve(spec); + return (FixedListMachineProvisioningLocation<JcloudsSshMachineLocation>) managementContext.getLocationRegistry().getLocationManaged(spec); } private void assertThrowsNoSuchElement(String val) { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java index 705935b..23963e0 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsByonRebindLiveTest.java @@ -106,13 +106,13 @@ public class JcloudsByonRebindLiveTest extends RebindTestFixtureWithApp { .put("imageId", SOFTLAYER_IMAGE_ID) .put("inboundPorts", ImmutableList.of(22)) .build(); - JcloudsLocation provisioningLoc = (JcloudsLocation) provisioningManagementContext.getLocationRegistry().resolve(SOFTLAYER_LOCATION_SPEC); + JcloudsLocation provisioningLoc = (JcloudsLocation) provisioningManagementContext.getLocationRegistry().getLocationManaged(SOFTLAYER_LOCATION_SPEC); provisionedMachine = (JcloudsSshMachineLocation) provisioningLoc.obtain(obtainFlags); // Test with a jclouds-byon String locSpec = "jcloudsByon:(provider=\""+SOFTLAYER_PROVIDER+"\",region=\""+SOFTLAYER_REGION+"\",user=\""+provisionedMachine.getUser()+"\",hosts=\""+provisionedMachine.getNode().getProviderId()+"\")"; - FixedListMachineProvisioningLocation<?> origByon = (FixedListMachineProvisioningLocation<?>) mgmt().getLocationRegistry().resolve(locSpec); + FixedListMachineProvisioningLocation<?> origByon = (FixedListMachineProvisioningLocation<?>) mgmt().getLocationRegistry().getLocationManaged(locSpec); JcloudsSshMachineLocation origMachine = (JcloudsSshMachineLocation)origByon.obtain(ImmutableMap.<String,Object>of()); JcloudsLocation origJcloudsLocation = origMachine.getParent(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java index 81c6acf..c18ff7d 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationMetadataTest.java @@ -54,7 +54,7 @@ public class JcloudsLocationMetadataTest implements JcloudsLocationConfig { @Test public void testGetsDefaultAwsEc2Metadata() throws Exception { - Location loc = managementContext.getLocationRegistry().resolve("jclouds:aws-ec2:us-west-1"); + Location loc = managementContext.getLocationRegistry().getLocationManaged("jclouds:aws-ec2:us-west-1"); assertEquals(loc.getConfig(LocationConfigKeys.LATITUDE), 40.0d); assertEquals(loc.getConfig(LocationConfigKeys.LONGITUDE), -120.0d); @@ -64,7 +64,7 @@ public class JcloudsLocationMetadataTest implements JcloudsLocationConfig { @Test public void testCanOverrideDefaultAwsEc2Metadata() throws Exception { brooklynProperties.put("brooklyn.location.jclouds.aws-ec2@us-west-1.latitude", "41.2"); - Location loc = managementContext.getLocationRegistry().resolve("jclouds:aws-ec2:us-west-1"); + Location loc = managementContext.getLocationRegistry().getLocationManaged("jclouds:aws-ec2:us-west-1"); assertEquals(loc.getConfig(LocationConfigKeys.LATITUDE), 41.2d); } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationRegisterMachineLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationRegisterMachineLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationRegisterMachineLiveTest.java index e7d7d36..923da80 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationRegisterMachineLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationRegisterMachineLiveTest.java @@ -46,7 +46,7 @@ public class JcloudsLocationRegisterMachineLiveTest extends AbstractJcloudsLiveT @Override public void setUp() throws Exception { super.setUp(); - jcloudsLocation = (JcloudsLocation) managementContext.getLocationRegistry().resolve(AWS_EC2_PROVIDER+":"+AWS_EC2_EUWEST_REGION_NAME); + jcloudsLocation = (JcloudsLocation) managementContext.getLocationRegistry().getLocationManaged(AWS_EC2_PROVIDER+":"+AWS_EC2_EUWEST_REGION_NAME); } @Test(groups = { "Live", "Live-sanity" }) @@ -78,7 +78,7 @@ public class JcloudsLocationRegisterMachineLiveTest extends AbstractJcloudsLiveT String user = checkNotNull(machine.getUser(), "user"); // Create a new jclouds location, and re-bind the existing VM to that - JcloudsLocation loc2 = (JcloudsLocation) managementContext.getLocationRegistry().resolve(AWS_EC2_PROVIDER+":"+AWS_EC2_EUWEST_REGION_NAME); + JcloudsLocation loc2 = (JcloudsLocation) managementContext.getLocationRegistry().getLocationManaged(AWS_EC2_PROVIDER+":"+AWS_EC2_EUWEST_REGION_NAME); MachineLocation machineLocation = loc2.registerMachine(ImmutableMap.of("id", id, "hostname", hostname, "user", user)); assertTrue(machineLocation instanceof SshMachineLocation); SshMachineLocation machine2 = (SshMachineLocation) machineLocation; @@ -109,7 +109,7 @@ public class JcloudsLocationRegisterMachineLiveTest extends AbstractJcloudsLiveT String username = machine.getUser(); // Create a new jclouds location, and re-bind the existing VM to that - JcloudsLocation loc2 = (JcloudsLocation) managementContext.getLocationRegistry().resolve(AWS_EC2_PROVIDER+":"+AWS_EC2_EUWEST_REGION_NAME); + JcloudsLocation loc2 = (JcloudsLocation) managementContext.getLocationRegistry().getLocationManaged(AWS_EC2_PROVIDER+":"+AWS_EC2_EUWEST_REGION_NAME); // pass deprecated userName MachineLocation machineLocation = loc2.registerMachine(ImmutableMap.of("id", id, "hostname", hostname, "userName", username)); assertTrue(machineLocation instanceof SshMachineLocation); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/3f1e4c61/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingTest.java index c37dd22..57ba788 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationReleasePortForwardingTest.java @@ -68,8 +68,8 @@ public class JcloudsLocationReleasePortForwardingTest extends BrooklynAppLiveTes public void setUp() throws Exception { super.setUp(); stopwatch = Stopwatch.createStarted(); - portForwardManager = (PortForwardManager) mgmt.getLocationRegistry().resolve("portForwardManager(scope=global)"); - loc = (JcloudsLocation) mgmt.getLocationRegistry().resolve("jclouds:aws-ec2:us-east-1"); + portForwardManager = (PortForwardManager) mgmt.getLocationRegistry().getLocationManaged("portForwardManager(scope=global)"); + loc = (JcloudsLocation) mgmt.getLocationRegistry().getLocationManaged("jclouds:aws-ec2:us-east-1"); node = Mockito.mock(NodeMetadata.class); Mockito.when(node.getId()).thenReturn("mynodeid");
