http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/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 new file mode 100644 index 0000000..a9f11a8 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationResolverTest.java @@ -0,0 +1,203 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.brooklyn.location.multi; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + +import java.net.InetAddress; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.NoSuchElementException; + +import javax.annotation.Nullable; + +import org.apache.brooklyn.api.location.Location; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.location.LocationPredicates; +import org.apache.brooklyn.core.location.cloud.AvailabilityZoneExtension; +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; +import org.apache.brooklyn.util.exceptions.Exceptions; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + +import com.google.common.base.Objects; +import com.google.common.base.Optional; +import com.google.common.base.Predicate; +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Iterables; + +public class MultiLocationResolverTest { + + private BrooklynProperties brooklynProperties; + private LocalManagementContext managementContext; + + @BeforeMethod(alwaysRun=true) + public void setUp() throws Exception { + managementContext = LocalManagementContextForTests.newInstance(); + brooklynProperties = managementContext.getBrooklynProperties(); + } + + @AfterMethod(alwaysRun=true) + public void tearDown() throws Exception { + if (managementContext != null) Entities.destroyAll(managementContext); + } + + @Test + public void testThrowsOnInvalid() throws Exception { + assertThrowsNoSuchElement("wrongprefix:(hosts=\"1.1.1.1\")"); + assertThrowsIllegalArgument("single"); + } + + @Test + public void testThrowsOnInvalidTarget() throws Exception { + assertThrowsIllegalArgument("multi:()"); + assertThrowsIllegalArgument("multi:(wrongprefix:(hosts=\"1.1.1.1\"))"); + assertThrowsIllegalArgument("multi:(foo:bar)"); + } + + @Test + public void testCleansUpOnInvalidTarget() { + assertThrowsNoSuchElement("multi:(targets=\"localhost:(name=testCleansUpOnInvalidTarget),thisNamedLocationDoesNotExist\")"); + Optional<Location> subtarget = Iterables.tryFind(managementContext.getLocationManager().getLocations(), LocationPredicates.displayNameEqualTo("testCleansUpOnInvalidTarget")); + assertFalse(subtarget.isPresent(), "subtarget="+subtarget); + } + + + @Test + public void testResolvesSubLocs() { + assertMultiLocation(resolve("multi:(targets=localhost)"), 1, ImmutableList.of(Predicates.instanceOf(LocalhostMachineProvisioningLocation.class))); + assertMultiLocation(resolve("multi:(targets=\"localhost,localhost\")"), 2, Collections.nCopies(2, Predicates.instanceOf(LocalhostMachineProvisioningLocation.class))); + assertMultiLocation(resolve("multi:(targets=\"localhost,localhost,localhost\")"), 3, Collections.nCopies(3, Predicates.instanceOf(LocalhostMachineProvisioningLocation.class))); + assertMultiLocation(resolve("multi:(targets=\"localhost:(name=mysubname)\")"), 1, ImmutableList.of(displayNameEqualTo("mysubname"))); + assertMultiLocation(resolve("multi:(targets=byon:(hosts=\"1.1.1.1\"))"), 1, ImmutableList.of(Predicates.and( + Predicates.instanceOf(FixedListMachineProvisioningLocation.class), + new Predicate<MachineProvisioningLocation>() { + @Override public boolean apply(MachineProvisioningLocation input) { + SshMachineLocation machine; + try { + machine = (SshMachineLocation) input.obtain(ImmutableMap.of()); + } catch (NoMachinesAvailableException e) { + throw Exceptions.propagate(e); + } + try { + String addr = ((SshMachineLocation)machine).getAddress().getHostAddress(); + return addr != null && addr.equals("1.1.1.1"); + } finally { + input.release(machine); + } + } + }))); + assertMultiLocation(resolve("multi:(targets=\"byon:(hosts=1.1.1.1),byon:(hosts=1.1.1.2)\")"), 2, Collections.nCopies(2, Predicates.instanceOf(FixedListMachineProvisioningLocation.class))); + } + + @Test + public void testResolvesName() { + MultiLocation<SshMachineLocation> multiLoc = resolve("multi:(name=myname,targets=localhost)"); + assertEquals(multiLoc.getDisplayName(), "myname"); + } + + @Test + public void testNamedByonLocation() throws Exception { + brooklynProperties.put("brooklyn.location.named.mynamed", "multi:(targets=byon:(hosts=\"1.1.1.1\"))"); + + MultiLocation<SshMachineLocation> loc = resolve("named:mynamed"); + assertEquals(loc.obtain(ImmutableMap.of()).getAddress(), InetAddress.getByName("1.1.1.1")); + } + + @Test + public void testResolvesFromMap() throws NoMachinesAvailableException { + Location l = managementContext.getLocationRegistry().resolve("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(); + + l = ci.next(); + Assert.assertTrue(l instanceof LocalhostMachineProvisioningLocation, "Expected localhost, got "+l); + + l = ci.next(); + Assert.assertTrue(l instanceof FixedListMachineProvisioningLocation, "Expected fixed, got "+l); + MachineLocation sl = ((FixedListMachineProvisioningLocation<?>)l).obtain(); + Assert.assertEquals(sl.getAddress().getHostAddress(), "127.0.0.127"); + + Assert.assertFalse(ci.hasNext()); + } + + + private void assertThrowsNoSuchElement(String val) { + try { + resolve(val); + fail(); + } catch (NoSuchElementException e) { + // success + } + } + + private void assertThrowsIllegalArgument(String val) { + try { + resolve(val); + fail(); + } catch (IllegalArgumentException e) { + // success + } + } + + @SuppressWarnings("unchecked") + private MultiLocation<SshMachineLocation> resolve(String val) { + return (MultiLocation<SshMachineLocation>) managementContext.getLocationRegistry().resolve(val); + } + + @SuppressWarnings("rawtypes") + private void assertMultiLocation(MultiLocation<?> multiLoc, int expectedSize, List<? extends Predicate> expectedSubLocationPredicates) { + AvailabilityZoneExtension zones = multiLoc.getExtension(AvailabilityZoneExtension.class); + List<Location> subLocs = zones.getAllSubLocations(); + assertEquals(subLocs.size(), expectedSize, "zones="+subLocs); + for (int i = 0; i < subLocs.size(); i++) { + MachineProvisioningLocation subLoc = (MachineProvisioningLocation) subLocs.get(i); + assertTrue(expectedSubLocationPredicates.get(i).apply(subLoc), "index="+i+"; subLocs="+subLocs); + } + } + + public static <T> Predicate<Location> displayNameEqualTo(final T val) { + return new Predicate<Location>() { + @Override + public boolean apply(@Nullable Location input) { + return Objects.equal(input.getDisplayName(), val); + } + }; + } +}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationTest.java new file mode 100644 index 0000000..3752f2b --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/location/multi/MultiLocationTest.java @@ -0,0 +1,121 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.brooklyn.location.multi; + +import static org.testng.Assert.assertTrue; + +import org.apache.brooklyn.test.Asserts; +import org.apache.brooklyn.util.collections.MutableSet; +import org.apache.brooklyn.util.net.Networking; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.testng.Assert; +import org.testng.annotations.AfterMethod; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.cloud.AvailabilityZoneExtension; +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.multi.MultiLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; + +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + +public class MultiLocationTest { + + private static final Logger log = LoggerFactory.getLogger(MultiLocationTest.class); + + private LocalManagementContext managementContext; + private SshMachineLocation mac1a; + private SshMachineLocation mac1b; + private SshMachineLocation mac2a; + private SshMachineLocation mac2b; + private FixedListMachineProvisioningLocation<SshMachineLocation> loc1; + private FixedListMachineProvisioningLocation<SshMachineLocation> loc2; + private MultiLocation<SshMachineLocation> multiLoc; + + @SuppressWarnings("unchecked") + @BeforeMethod(alwaysRun=true) + public void setUp() throws Exception { + managementContext = LocalManagementContextForTests.newInstance(); + mac1a = managementContext.getLocationManager().createLocation(LocationSpec.create(SshMachineLocation.class) + .displayName("mac1a") + .configure("address", Networking.getInetAddressWithFixedName("1.1.1.1"))); + mac1b = managementContext.getLocationManager().createLocation(LocationSpec.create(SshMachineLocation.class) + .displayName("mac1b") + .configure("address", Networking.getInetAddressWithFixedName("1.1.1.2"))); + mac2a = managementContext.getLocationManager().createLocation(LocationSpec.create(SshMachineLocation.class) + .displayName("mac2a") + .configure("address", Networking.getInetAddressWithFixedName("1.1.1.3"))); + mac2b = managementContext.getLocationManager().createLocation(LocationSpec.create(SshMachineLocation.class) + .displayName("mac2b") + .configure("address", Networking.getInetAddressWithFixedName("1.1.1.4"))); + loc1 = managementContext.getLocationManager().createLocation(LocationSpec.create(FixedListMachineProvisioningLocation.class) + .displayName("loc1") + .configure("machines", MutableSet.of(mac1a, mac1b))); + loc2 = managementContext.getLocationManager().createLocation(LocationSpec.create(FixedListMachineProvisioningLocation.class) + .displayName("loc2") + .configure("machines", MutableSet.of(mac2a, mac2b))); + multiLoc = managementContext.getLocationManager().createLocation(LocationSpec.create(MultiLocation.class) + .displayName("multiLoc") + .configure("subLocations", ImmutableList.of(loc1, loc2))); + } + + @AfterMethod(alwaysRun=true) + public void tearDown() throws Exception { + if (managementContext != null) Entities.destroyAll(managementContext); + } + + @Test + public void testHasAvailabilityZonesAsSubLocations() throws Exception { + multiLoc.hasExtension(AvailabilityZoneExtension.class); + AvailabilityZoneExtension extension = multiLoc.getExtension(AvailabilityZoneExtension.class); + Asserts.assertEqualsIgnoringOrder(extension.getAllSubLocations(), ImmutableList.of(loc1, loc2)); + Asserts.assertEqualsIgnoringOrder(extension.getSubLocations(2), ImmutableList.of(loc1, loc2)); + assertTrue(ImmutableList.of(loc1, loc2).containsAll(extension.getSubLocations(1))); + } + + @Test + public void testObtainAndReleaseDelegateToSubLocation() throws Exception { + SshMachineLocation obtained = multiLoc.obtain(ImmutableMap.of()); + assertTrue(ImmutableList.of(mac1a, mac1b, mac2a, mac2b).contains(obtained)); + multiLoc.release(obtained); + } + + @Test + public void testObtainsMovesThroughSubLocations() throws Exception { + Assert.assertEquals(multiLoc.obtain().getAddress().getHostAddress(), "1.1.1.1"); + Assert.assertEquals(multiLoc.obtain().getAddress().getHostAddress(), "1.1.1.2"); + Assert.assertEquals(multiLoc.obtain().getAddress().getHostAddress(), "1.1.1.3"); + Assert.assertEquals(multiLoc.obtain().getAddress().getHostAddress(), "1.1.1.4"); + try { + multiLoc.obtain(); + Assert.fail(); + } catch (NoMachinesAvailableException e) { + log.info("Error when no machines available across locations is: "+e); + Assert.assertTrue(e.toString().contains("loc1"), "Message should have referred to sub-location message: "+e); + } + } + +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/location/paas/PaasLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/paas/PaasLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/paas/PaasLocationTest.java new file mode 100644 index 0000000..6d6c513 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/location/paas/PaasLocationTest.java @@ -0,0 +1,34 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.brooklyn.location.paas; + +import org.apache.brooklyn.location.paas.PaasLocation; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class PaasLocationTest { + + private PaasLocation location; + + @Test + public void testProviderName(){ + location = new TestPaasLocation(); + Assert.assertEquals(location.getPaasProviderName(), "TestPaas"); + } +} http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/location/paas/TestPaasLocation.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/paas/TestPaasLocation.java b/core/src/test/java/org/apache/brooklyn/location/paas/TestPaasLocation.java new file mode 100644 index 0000000..36b28d6 --- /dev/null +++ b/core/src/test/java/org/apache/brooklyn/location/paas/TestPaasLocation.java @@ -0,0 +1,32 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.brooklyn.location.paas; + +import org.apache.brooklyn.core.location.AbstractLocation; +import org.apache.brooklyn.location.paas.PaasLocation; + +/** + * Mock {@link PaasLocation} for test purposes + */ +public class TestPaasLocation extends AbstractLocation implements PaasLocation { + @Override + public String getPaasProviderName() { + return "TestPaas"; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java index 880ba12..dec55ec 100644 --- a/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java +++ b/core/src/test/java/org/apache/brooklyn/location/ssh/SshMachineLocationTest.java @@ -47,16 +47,16 @@ import org.apache.brooklyn.core.entity.BrooklynConfigKeys; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.EntityInternal; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.core.location.BasicHardwareDetails; +import org.apache.brooklyn.core.location.BasicMachineDetails; +import org.apache.brooklyn.core.location.BasicOsDetails; +import org.apache.brooklyn.core.location.Machines; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.effector.core.EffectorTaskTest; import org.apache.brooklyn.effector.core.Effectors; -import org.apache.brooklyn.location.core.BasicHardwareDetails; -import org.apache.brooklyn.location.core.BasicMachineDetails; -import org.apache.brooklyn.location.core.BasicOsDetails; -import org.apache.brooklyn.location.core.Machines; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy b/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy index 57008ee..0700c91 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherDeprecatedTest.groovy @@ -26,7 +26,7 @@ import org.apache.brooklyn.core.test.entity.TestApplication import org.apache.brooklyn.core.test.entity.TestEntity import org.apache.brooklyn.core.entity.Entities import org.apache.brooklyn.entity.group.BasicGroup -import org.apache.brooklyn.location.core.SimulatedLocation +import org.apache.brooklyn.core.location.SimulatedLocation import org.apache.brooklyn.sensor.core.BasicAttributeSensor import org.apache.brooklyn.test.TestUtils import org.slf4j.Logger http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java b/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java index 39cbcee..05e0fe3 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/CustomAggregatingEnricherTest.java @@ -25,6 +25,7 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.entity.group.BasicGroup; @@ -36,7 +37,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.SimulatedLocation; import com.google.common.base.Function; import com.google.common.base.Predicates; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy b/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy index 17939c1..2883a05 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherDeprecatedTest.groovy @@ -25,7 +25,7 @@ import org.apache.brooklyn.api.sensor.AttributeSensor import org.apache.brooklyn.core.test.entity.TestApplication import org.apache.brooklyn.core.test.entity.TestEntity import org.apache.brooklyn.core.entity.Entities -import org.apache.brooklyn.location.core.SimulatedLocation +import org.apache.brooklyn.core.location.SimulatedLocation import org.apache.brooklyn.sensor.core.BasicAttributeSensor import org.apache.brooklyn.test.TestUtils import org.apache.brooklyn.util.collections.MutableMap http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java b/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java index d438933..70d5af5 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/enricher/TransformingEnricherTest.java @@ -20,6 +20,7 @@ package org.apache.brooklyn.sensor.enricher; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.sensor.core.BasicAttributeSensor; @@ -30,7 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.SimulatedLocation; import com.google.common.base.Function; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/sensor/feed/http/HttpFeedIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/sensor/feed/http/HttpFeedIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/sensor/feed/http/HttpFeedIntegrationTest.java index c139dfd..9e322fb 100644 --- a/core/src/test/java/org/apache/brooklyn/sensor/feed/http/HttpFeedIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/sensor/feed/http/HttpFeedIntegrationTest.java @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.test.BrooklynAppUnitTestSupport; import org.apache.brooklyn.core.test.HttpService; import org.apache.brooklyn.core.test.entity.TestEntity; @@ -39,7 +40,6 @@ import org.apache.brooklyn.test.EntityTestUtils; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.location.localhost.LocalhostMachineProvisioningLocation; import com.google.common.base.Functions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/core/src/test/java/org/apache/brooklyn/util/core/http/HttpToolIntegrationTest.java ---------------------------------------------------------------------- diff --git a/core/src/test/java/org/apache/brooklyn/util/core/http/HttpToolIntegrationTest.java b/core/src/test/java/org/apache/brooklyn/util/core/http/HttpToolIntegrationTest.java index fc830a6..2c12357 100644 --- a/core/src/test/java/org/apache/brooklyn/util/core/http/HttpToolIntegrationTest.java +++ b/core/src/test/java/org/apache/brooklyn/util/core/http/HttpToolIntegrationTest.java @@ -26,8 +26,8 @@ import org.apache.http.client.HttpClient; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.core.test.HttpService; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.util.core.http.HttpTool; import org.apache.brooklyn.util.core.http.HttpToolResponse; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java ---------------------------------------------------------------------- diff --git a/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java b/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java index 2748852..c83d1d0 100644 --- a/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java +++ b/examples/global-web-fabric/src/main/java/org/apache/brooklyn/demo/GlobalWebFabricExample.java @@ -34,13 +34,13 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.dns.geoscaling.GeoscalingDnsService; import org.apache.brooklyn.entity.group.DynamicRegionsFabric; import org.apache.brooklyn.entity.proxy.AbstractController; import org.apache.brooklyn.entity.webapp.ElasticJavaWebAppService; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.sensor.core.PortAttributeSensorAndConfigKey; import org.apache.brooklyn.util.CommandLineUtil; import org.apache.brooklyn.util.core.BrooklynMavenArtifacts; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java ---------------------------------------------------------------------- diff --git a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java index a484900..02d4f89 100644 --- a/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java +++ b/examples/simple-nosql-cluster/src/main/java/org/apache/brooklyn/demo/CumulusRDFApplication.java @@ -43,6 +43,7 @@ import org.apache.brooklyn.core.entity.StartableApplication; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; import org.apache.brooklyn.core.entity.trait.Startable; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.effector.core.EffectorBody; import org.apache.brooklyn.effector.core.Effectors; import org.apache.brooklyn.entity.java.UsesJava; @@ -53,7 +54,6 @@ import org.apache.brooklyn.entity.nosql.cassandra.CassandraNode; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.tomcat.TomcatServer; import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.policy.ha.ServiceFailureDetector; import org.apache.brooklyn.policy.ha.ServiceReplacer; import org.apache.brooklyn.policy.ha.ServiceRestarter; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java index c37cf8c..cec7a7e 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/SingleWebServerExample.java @@ -27,10 +27,10 @@ import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Attributes; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.jboss.JBoss7Server; import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.util.CommandLineUtil; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java index 2299dfa..da1074e 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExample.java @@ -33,13 +33,13 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; import org.apache.brooklyn.entity.webapp.WebAppService; import org.apache.brooklyn.entity.webapp.WebAppServiceConstants; import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; import org.apache.brooklyn.sensor.core.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java ---------------------------------------------------------------------- diff --git a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java index c87fe61..cff372c 100644 --- a/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java +++ b/examples/simple-web-cluster/src/main/java/org/apache/brooklyn/demo/WebClusterDatabaseExampleApp.java @@ -35,6 +35,7 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.AbstractApplication; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.StartableApplication; +import org.apache.brooklyn.core.location.PortRanges; import org.apache.brooklyn.entity.webapp.ControlledDynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.DynamicWebAppCluster; import org.apache.brooklyn.entity.webapp.JavaWebAppService; @@ -44,7 +45,6 @@ import org.apache.brooklyn.entity.database.mysql.MySqlNode; import org.apache.brooklyn.entity.group.DynamicCluster; import org.apache.brooklyn.entity.java.JavaEntityMethods; import org.apache.brooklyn.launcher.BrooklynLauncher; -import org.apache.brooklyn.location.core.PortRanges; import org.apache.brooklyn.policy.autoscaling.AutoScalerPolicy; import org.apache.brooklyn.policy.enricher.HttpLatencyDetector; import org.apache.brooklyn.sensor.core.Sensors; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStore.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStore.java b/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStore.java index 182e8cd..6c92753 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStore.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/core/mgmt/persist/jclouds/JcloudsBlobStoreBasedObjectStore.java @@ -26,6 +26,8 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.api.mgmt.ha.HighAvailabilityMode; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.core.mgmt.persist.PersistMode; import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore; import org.apache.brooklyn.core.server.BrooklynServerConfig; @@ -34,8 +36,6 @@ import org.jclouds.blobstore.domain.StorageMetadata; import org.jclouds.blobstore.options.ListContainerOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.core.LocationConfigKeys; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsUtil; import org.apache.brooklyn.util.exceptions.FatalConfigurationRuntimeException; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsSubnetSshMachineLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsSubnetSshMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsSubnetSshMachineLocation.java index d4e8615..d0ec124 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsSubnetSshMachineLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/AbstractJcloudsSubnetSshMachineLocation.java @@ -20,8 +20,8 @@ package org.apache.brooklyn.location.jclouds; import java.util.Map; +import org.apache.brooklyn.core.location.SupportsPortForwarding.RequiresPortForwarding; import org.jclouds.compute.domain.NodeMetadata; -import org.apache.brooklyn.location.core.SupportsPortForwarding.RequiresPortForwarding; public abstract class AbstractJcloudsSubnetSshMachineLocation extends JcloudsSshMachineLocation implements RequiresPortForwarding { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java index 29be5cf..a4af284 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/ComputeServiceRegistryImpl.java @@ -28,7 +28,7 @@ import java.util.Properties; import java.util.concurrent.ConcurrentHashMap; import org.apache.brooklyn.core.config.Sanitizer; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.time.Duration; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java index 1773470..95597c5 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsByonLocationResolver.java @@ -30,14 +30,14 @@ import org.apache.brooklyn.api.location.LocationResolver; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.location.BasicLocationRegistry; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.LocationConfigUtils; +import org.apache.brooklyn.core.location.LocationPropertiesFromBrooklynProperties; +import org.apache.brooklyn.core.location.internal.LocationInternal; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.location.byon.FixedListMachineProvisioningLocation; -import org.apache.brooklyn.location.core.BasicLocationRegistry; -import org.apache.brooklyn.location.core.LocationConfigKeys; -import org.apache.brooklyn.location.core.LocationConfigUtils; -import org.apache.brooklyn.location.core.LocationPropertiesFromBrooklynProperties; -import org.apache.brooklyn.location.core.internal.LocationInternal; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java index c2f1a28..9167587 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocation.java @@ -61,12 +61,20 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.config.ConfigKey.HasConfigKey; import org.apache.brooklyn.core.config.ConfigUtils; import org.apache.brooklyn.core.config.Sanitizer; +import org.apache.brooklyn.core.location.AbstractLocation; +import org.apache.brooklyn.core.location.BasicMachineMetadata; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.LocationConfigUtils; +import org.apache.brooklyn.core.location.LocationConfigUtils.OsCredential; +import org.apache.brooklyn.core.location.access.PortForwardManager; +import org.apache.brooklyn.core.location.access.PortMapping; +import org.apache.brooklyn.core.location.cloud.AbstractCloudMachineProvisioningLocation; +import org.apache.brooklyn.core.location.cloud.AvailabilityZoneExtension; +import org.apache.brooklyn.core.location.cloud.names.AbstractCloudMachineNamer; +import org.apache.brooklyn.core.location.cloud.names.CloudMachineNamer; import org.apache.brooklyn.core.mgmt.persist.LocationWithObjectStore; import org.apache.brooklyn.core.mgmt.persist.PersistenceObjectStore; import org.apache.brooklyn.core.mgmt.persist.jclouds.JcloudsBlobStoreBasedObjectStore; -import org.apache.brooklyn.location.access.PortMapping; -import org.apache.brooklyn.location.cloud.AbstractCloudMachineProvisioningLocation; -import org.apache.brooklyn.location.cloud.names.AbstractCloudMachineNamer; import org.apache.brooklyn.location.jclouds.networking.JcloudsPortForwarderExtension; import org.apache.brooklyn.location.jclouds.zone.AwsAvailabilityZoneExtension; import org.jclouds.aws.ec2.compute.AWSEC2TemplateOptions; @@ -132,14 +140,6 @@ import com.google.common.io.Files; import com.google.common.net.HostAndPort; import com.google.common.primitives.Ints; -import org.apache.brooklyn.location.access.PortForwardManager; -import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; -import org.apache.brooklyn.location.cloud.names.CloudMachineNamer; -import org.apache.brooklyn.location.core.AbstractLocation; -import org.apache.brooklyn.location.core.BasicMachineMetadata; -import org.apache.brooklyn.location.core.LocationConfigKeys; -import org.apache.brooklyn.location.core.LocationConfigUtils; -import org.apache.brooklyn.location.core.LocationConfigUtils.OsCredential; import org.apache.brooklyn.location.jclouds.JcloudsPredicates.NodeInLocation; import org.apache.brooklyn.location.jclouds.templates.PortableTemplateBuilder; import org.apache.brooklyn.location.ssh.SshMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java index dd52b75..3bcc02f 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationConfig.java @@ -26,16 +26,16 @@ import java.util.concurrent.Semaphore; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.core.location.access.PortForwardManager; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.location.jclouds.networking.JcloudsPortForwarderExtension; import org.jclouds.Constants; import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.OsFamily; import org.jclouds.compute.domain.TemplateBuilder; import org.jclouds.domain.LoginCredentials; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.access.PortForwardManager; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.core.LocationConfigKeys; import org.apache.brooklyn.util.core.internal.ssh.SshTool; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java index 60ce84f..3921407 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolver.java @@ -29,16 +29,16 @@ import org.apache.brooklyn.api.location.LocationRegistry; import org.apache.brooklyn.api.location.LocationResolver; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.mgmt.ManagementContext; +import org.apache.brooklyn.core.location.BasicLocationRegistry; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.LocationConfigUtils; +import org.apache.brooklyn.core.location.internal.LocationInternal; import org.jclouds.apis.ApiMetadata; import org.jclouds.apis.Apis; import org.jclouds.providers.ProviderMetadata; import org.jclouds.providers.Providers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.BasicLocationRegistry; -import org.apache.brooklyn.location.core.LocationConfigKeys; -import org.apache.brooklyn.location.core.LocationConfigUtils; -import org.apache.brooklyn.location.core.internal.LocationInternal; import org.apache.brooklyn.util.text.Strings; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java index 90b4db8..173b695 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineLocation.java @@ -19,7 +19,7 @@ package org.apache.brooklyn.location.jclouds; import org.apache.brooklyn.api.location.MachineLocation; -import org.apache.brooklyn.location.core.HasSubnetHostname; +import org.apache.brooklyn.core.location.HasSubnetHostname; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.Template; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java index 24ab01e..90e6629 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsMachineNamer.java @@ -18,7 +18,7 @@ */ package org.apache.brooklyn.location.jclouds; -import org.apache.brooklyn.location.cloud.names.BasicCloudMachineNamer; +import org.apache.brooklyn.core.location.cloud.names.BasicCloudMachineNamer; import org.apache.brooklyn.util.core.config.ConfigBag; public class JcloudsMachineNamer extends BasicCloudMachineNamer { http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java index 6086d08..acc8d32 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsPropertiesFromBrooklynProperties.java @@ -21,11 +21,11 @@ package org.apache.brooklyn.location.jclouds; import java.util.Map; import org.apache.brooklyn.core.config.ConfigUtils; +import org.apache.brooklyn.core.location.DeprecatedKeysMappingBuilder; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.LocationPropertiesFromBrooklynProperties; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.DeprecatedKeysMappingBuilder; -import org.apache.brooklyn.location.core.LocationConfigKeys; -import org.apache.brooklyn.location.core.LocationPropertiesFromBrooklynProperties; import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.javalang.JavaClassNames; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java index 31b414b..606f062 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/JcloudsSshMachineLocation.java @@ -34,9 +34,9 @@ import javax.annotation.Nullable; import org.apache.brooklyn.api.location.HardwareDetails; import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.api.location.OsDetails; -import org.apache.brooklyn.location.core.BasicHardwareDetails; -import org.apache.brooklyn.location.core.BasicMachineDetails; -import org.apache.brooklyn.location.core.BasicOsDetails; +import org.apache.brooklyn.core.location.BasicHardwareDetails; +import org.apache.brooklyn.core.location.BasicMachineDetails; +import org.apache.brooklyn.core.location.BasicOsDetails; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.core.flags.SetFromFlag; import org.apache.brooklyn.util.exceptions.Exceptions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java index 4ae3f9f..cd4e45f 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsLocationSecurityGroupCustomizer.java @@ -28,7 +28,7 @@ import java.util.concurrent.ExecutionException; import javax.annotation.Nullable; import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.location.geo.LocalhostExternalIpLoader; +import org.apache.brooklyn.core.location.geo.LocalhostExternalIpLoader; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsLocationCustomizer; import org.apache.brooklyn.location.jclouds.JcloudsMachineLocation; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwarderExtension.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwarderExtension.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwarderExtension.java index 8146485..deacda4 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwarderExtension.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwarderExtension.java @@ -19,8 +19,8 @@ package org.apache.brooklyn.location.jclouds.networking; import org.jclouds.compute.domain.NodeMetadata; -import org.apache.brooklyn.location.access.BrooklynAccessUtils; -import org.apache.brooklyn.location.access.PortForwardManager; +import org.apache.brooklyn.core.location.access.BrooklynAccessUtils; +import org.apache.brooklyn.core.location.access.PortForwardManager; import org.apache.brooklyn.util.net.Cidr; import org.apache.brooklyn.util.net.Protocol; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java index 221e55d..3f3b9a5 100644 --- a/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java +++ b/locations/jclouds/src/main/java/org/apache/brooklyn/location/jclouds/zone/AwsAvailabilityZoneExtension.java @@ -26,10 +26,10 @@ import java.util.Set; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.mgmt.ManagementContext; -import org.apache.brooklyn.location.cloud.AbstractAvailabilityZoneExtension; +import org.apache.brooklyn.core.location.cloud.AbstractAvailabilityZoneExtension; +import org.apache.brooklyn.core.location.cloud.AvailabilityZoneExtension; import org.jclouds.aws.ec2.AWSEC2Api; import org.jclouds.ec2.domain.AvailabilityZoneInfo; -import org.apache.brooklyn.location.cloud.AvailabilityZoneExtension; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/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 8a75382..da3a921 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 @@ -27,9 +27,9 @@ import org.jclouds.blobstore.domain.StorageMetadata; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.core.LocationConfigKeys; import org.apache.brooklyn.location.jclouds.JcloudsLocation; /** Utility for cleaning up after test leaks. Most should not leak of course, but if they do... */ http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/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 90f7380..fd425fc 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 @@ -30,6 +30,8 @@ import java.util.Map.Entry; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.http.HttpTool; @@ -49,8 +51,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.core.LocationConfigKeys; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsUtil; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/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 22cebdf..5573ace 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 @@ -25,6 +25,8 @@ import java.io.IOException; import org.apache.brooklyn.api.mgmt.ManagementContext; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.util.stream.Streams; import org.apache.brooklyn.util.text.Identifiers; @@ -37,8 +39,6 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.core.LocationConfigKeys; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.jclouds.JcloudsUtil; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/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 0d1ed21..4a91255 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 @@ -29,7 +29,7 @@ import java.util.Map; import java.util.Set; import org.apache.brooklyn.api.location.LocationSpec; -import org.apache.brooklyn.location.core.Locations; +import org.apache.brooklyn.core.location.Locations; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.stream.Streams; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/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 b2d22c4..81c6acf 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 @@ -23,12 +23,12 @@ import static org.testng.Assert.assertEquals; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.internal.BrooklynProperties; +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.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.LocationConfigKeys; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java index 779bf6b..1ec8cc1 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationResolverTest.java @@ -28,10 +28,10 @@ import java.util.Set; import org.apache.brooklyn.core.config.MapConfigKey; import org.apache.brooklyn.core.config.SetConfigKey; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.core.location.internal.LocationInternal; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; -import org.apache.brooklyn.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.location.core.internal.LocationInternal; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.collections.MutableSet; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java index 485b22a..b4aeb17 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/JcloudsLocationTest.java @@ -35,10 +35,11 @@ import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.cloud.names.CustomMachineNamer; +import org.apache.brooklyn.core.location.geo.HostGeoInfo; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; -import org.apache.brooklyn.location.cloud.names.CustomMachineNamer; -import org.apache.brooklyn.location.core.LocationConfigKeys; import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.core.config.ConfigBag; @@ -59,7 +60,6 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.common.reflect.TypeToken; -import org.apache.brooklyn.location.geo.HostGeoInfo; import org.apache.brooklyn.location.jclouds.JcloudsLocation.UserCreation; /** http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java index e36c791..2a35b6c 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/LiveTestEntity.java @@ -25,11 +25,11 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.MachineProvisioningLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; +import org.apache.brooklyn.core.location.internal.LocationInternal; import org.apache.brooklyn.core.test.entity.TestEntity; import org.apache.brooklyn.core.test.entity.TestEntityImpl; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.brooklyn.location.core.internal.LocationInternal; import com.google.common.base.Predicates; import com.google.common.base.Throwables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java index 933c6b2..d8ef835 100644 --- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java +++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/networking/JcloudsPortForwardingStubbedLiveTest.java @@ -24,6 +24,8 @@ import static org.testng.Assert.assertNull; import java.util.List; import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.core.location.access.PortForwardManager; +import org.apache.brooklyn.core.location.access.PortForwardManagerImpl; import org.apache.brooklyn.location.jclouds.AbstractJcloudsStubbedLiveTest; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.jclouds.compute.domain.NodeMetadata; @@ -34,8 +36,6 @@ import org.jclouds.domain.LoginCredentials; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import org.apache.brooklyn.location.access.PortForwardManager; -import org.apache.brooklyn.location.access.PortForwardManagerImpl; import org.apache.brooklyn.location.jclouds.JcloudsSshMachineLocation; import org.apache.brooklyn.util.net.Cidr; import org.apache.brooklyn.util.net.Protocol; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/main/java/org/apache/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java b/policy/src/main/java/org/apache/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java index e5c328c..3a70fe4 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/followthesun/DefaultFollowTheSunModel.java @@ -33,7 +33,7 @@ import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.location.core.AbstractLocation; +import org.apache.brooklyn.core.location.AbstractLocation; import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java ---------------------------------------------------------------------- diff --git a/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java b/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java index 00c9515..12a1e4c 100644 --- a/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java +++ b/policy/src/main/java/org/apache/brooklyn/policy/ha/SshMachineFailureDetector.java @@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory; import org.apache.brooklyn.api.catalog.Catalog; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; -import org.apache.brooklyn.location.core.Machines; +import org.apache.brooklyn.core.location.Machines; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; import org.apache.brooklyn.sensor.core.BasicNotificationSensor; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java index 9ac732a..c6ac315 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/autoscaling/AutoScalerPolicyRebindTest.java @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixtureWithApp; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; @@ -37,7 +38,6 @@ import org.apache.brooklyn.test.EntityTestUtils; import org.apache.brooklyn.util.time.Duration; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.SimulatedLocation; import com.google.common.collect.ImmutableList; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java index deff64c..ba62dc7 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/AbstractFollowTheSunPolicyTest.java @@ -34,6 +34,7 @@ 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.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.group.DynamicGroup; @@ -44,7 +45,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import org.apache.brooklyn.location.core.SimulatedLocation; import org.apache.brooklyn.policy.loadbalancing.BalanceableContainer; import org.apache.brooklyn.policy.loadbalancing.MockContainerEntity; import org.apache.brooklyn.policy.loadbalancing.MockItemEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunModelTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunModelTest.java b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunModelTest.java index 89b53d5..29344aa 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunModelTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunModelTest.java @@ -26,7 +26,7 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; import org.apache.brooklyn.api.location.Location; -import org.apache.brooklyn.location.core.SimulatedLocation; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.policy.loadbalancing.MockContainerEntity; import org.apache.brooklyn.policy.loadbalancing.MockContainerEntityImpl; import org.apache.brooklyn.policy.loadbalancing.MockItemEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java index b159d2b..44be76b 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicySoakTest.java @@ -31,10 +31,10 @@ import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.entity.EntityLocal; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.SimulatedLocation; import org.apache.brooklyn.policy.loadbalancing.BalanceableContainer; import org.apache.brooklyn.policy.loadbalancing.MockContainerEntity; import org.apache.brooklyn.policy.loadbalancing.MockItemEntity; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java index b3a311c..325400e 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/followthesun/FollowTheSunPolicyTest.java @@ -33,10 +33,10 @@ import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.sensor.SensorEvent; import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.SimulatedLocation; import org.apache.brooklyn.policy.loadbalancing.MockContainerEntity; import org.apache.brooklyn.policy.loadbalancing.MockItemEntity; import org.apache.brooklyn.policy.loadbalancing.Movable; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java b/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java index f491ab5..242a33b 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/ha/HaPolicyRebindTest.java @@ -37,6 +37,7 @@ import org.apache.brooklyn.api.sensor.SensorEventListener; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.mgmt.rebind.RebindTestFixtureWithApp; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; @@ -45,7 +46,6 @@ import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.SimulatedLocation; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java index 2ca95db..d984b0e 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/ha/ServiceReplacerTest.java @@ -43,6 +43,7 @@ import org.apache.brooklyn.core.entity.lifecycle.Lifecycle; import org.apache.brooklyn.core.entity.lifecycle.QuorumCheck; import org.apache.brooklyn.core.entity.lifecycle.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers; import org.apache.brooklyn.core.entity.trait.FailingEntity; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.test.entity.LocalManagementContextForTests; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.core.test.entity.TestEntity; @@ -57,7 +58,6 @@ import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.SimulatedLocation; import org.apache.brooklyn.policy.ha.HASensors.FailureDescriptor; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java index 317f3b8..fb714ad 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/AbstractLoadBalancingPolicyTest.java @@ -34,6 +34,7 @@ import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigKey; import org.apache.brooklyn.core.entity.Entities; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.group.DynamicGroup; import org.apache.brooklyn.sensor.core.Sensors; @@ -44,7 +45,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; -import org.apache.brooklyn.location.core.SimulatedLocation; import com.google.common.base.Function; import com.google.common.base.Preconditions; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java index 54f04ff..5b657ed 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/BalanceableWorkerPoolTest.java @@ -27,6 +27,7 @@ import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; import org.apache.brooklyn.core.entity.trait.Resizable; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.group.AbstractGroup; import org.apache.brooklyn.entity.group.AbstractGroupImpl; @@ -38,7 +39,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.SimulatedLocation; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableList; http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/538324e1/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java ---------------------------------------------------------------------- diff --git a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java index 9697842..0be5fb7 100644 --- a/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java +++ b/policy/src/test/java/org/apache/brooklyn/policy/loadbalancing/ItemsInContainersGroupTest.java @@ -25,6 +25,7 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.entity.Group; import org.apache.brooklyn.core.entity.Entities; import org.apache.brooklyn.core.entity.factory.ApplicationBuilder; +import org.apache.brooklyn.core.location.SimulatedLocation; import org.apache.brooklyn.core.test.entity.TestApplication; import org.apache.brooklyn.entity.group.DynamicGroup; import org.apache.brooklyn.test.Asserts; @@ -32,7 +33,6 @@ import org.apache.brooklyn.util.collections.MutableMap; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.apache.brooklyn.location.core.SimulatedLocation; import com.google.common.base.Predicate; import com.google.common.collect.ImmutableList;
