Merge pull request #107 from aledsage/bostko-aled/make_compilable

Reflect changes from apache/brooklyn-server#355 (strike 2)

Author: aledsage

cloudstack/src/main/java/brooklyn/networking/cloudstack/legacy/LegacyAbstractSubnetApp.java

@@ -67,7 +67,7 @@ public abstract class LegacyAbstractSubnetApp extends AbstractApplication implem
     }
 
     protected <T> void setIfNotAlreadySet(ConfigKey<T> key, T value) {
-        if (config().getRaw(key).isAbsent()) configure(key, value);
+        if (config().getRaw(key).isAbsent()) config().set(key, value);
     }
 
     protected void applyDefaultConfig() {
@@ -80,7 +80,7 @@ protected void applyDefaultConfig() {
         // FIXME not safe for persistence
         if (config().getRaw(LegacyJcloudsCloudstackSubnetLocation.PORT_FORWARDING_MANAGER).isAbsent()) {
             PortForwardManager pfm = (PortForwardManager) getManagementContext().getLocationRegistry().resolve("portForwardManager(scope=global)");
-            configure(LegacyJcloudsCloudstackSubnetLocation.PORT_FORWARDING_MANAGER, pfm);
+            config().set(LegacyJcloudsCloudstackSubnetLocation.PORT_FORWARDING_MANAGER, pfm);
         }
 
         setIfNotAlreadySet(MANAGEMENT_ACCESS_CIDR, MANAGEMENT_ACCESS_CIDR.getDefaultValue());

cloudstack/src/main/java/brooklyn/networking/cloudstack/legacy/LegacyJcloudsCloudstackSubnetLocation.java

@@ -55,6 +55,7 @@
 import org.apache.brooklyn.util.text.Strings;
 import org.apache.brooklyn.util.time.Duration;
 import org.apache.brooklyn.util.time.Time;
+import org.apache.commons.lang3.tuple.Pair;
 import org.jclouds.cloudstack.CloudStackApi;
 import org.jclouds.cloudstack.compute.options.CloudStackTemplateOptions;
 import org.jclouds.cloudstack.domain.AsyncCreateResponse;
@@ -125,6 +126,8 @@ public class LegacyJcloudsCloudstackSubnetLocation extends JcloudsLocation {
 
     public LegacyJcloudsCloudstackSubnetLocation(JcloudsLocation parent, ConfigBag map) {
         super(MutableMap.copyOf(parent.getLocalConfigBag().getAllConfig()));
+        // TODO
+        // TODO NB relying on behaviour implemented in deprecated method
         configure(map.getAllConfig());
     }
 
@@ -207,9 +210,10 @@ public JcloudsMachineLocation obtain(Map<?,?> flagsIn) throws NoMachinesAvailabl
     }
 
     @Override
-    protected JcloudsSshMachineLocation createJcloudsSshMachineLocation(ComputeService computeService, NodeMetadata node, Optional<Template> template, String vmHostname1, Optional<HostAndPort> sshHostAndPort, LoginCredentials userCredentials, ConfigBag setup) throws IOException {
+    protected JcloudsSshMachineLocation createJcloudsSshMachineLocation(ComputeService computeService, NodeMetadata node, Optional<Template> template,
+                                                                        LoginCredentials userCredentials, HostAndPort managementHostAndPort, ConfigBag setup) throws IOException {
         String subnetSpecificHostname = null;
-        String vmHostname = vmHostname1;
+        String vmHostname = managementHostAndPort.getHostText();
         String sshHost = vmHostname;
         Integer sshPort = null;
         PortForwardManager pfw = null;

cloudstack/src/main/java/brooklyn/networking/cloudstack/legacy/LegacySubnetTierImpl.java

@@ -79,6 +79,7 @@ public boolean isVpcEnabled() {
         return getConfig(VirtualPrivateCloud.USE_VPC);
     }
 
+    @Override
     public void start(Collection<? extends Location> locations) {
         addLocations(locations);
         if (isSubnetEnabled()) {
@@ -325,6 +326,7 @@ protected void openCidrAccess(Collection<Cidr> values) {
 
     }
 
+    @Override
     public void propagateSensorStringReplacingWithSubnetAddress(final Entity target, final AttributeSensor<String> sensor) {
         SensorPropagaterWithReplacement mapper = new SensorPropagaterWithReplacement(this, sensor, new Function<String,String>() {
             @Override
@@ -347,6 +349,7 @@ public static String replaceIfNotNull(String string, String searchFor, String re
         return Strings.replaceAll(string, searchFor, replaceWith);
     }
 
+    @Override
     public void transformSensorStringReplacingWithPublicAddressAndPort(
             final Entity sensorToMapFromSource, final AttributeSensor<String> sensorToMapFromPropagating,
             final Entity optionalSensorOfPortToMapFromSource, final AttributeSensor<Integer> optionalSensorOfPortToMapFrom,

common/src/test/java/brooklyn/networking/PortForwarderAsyncTest.java

@@ -88,6 +88,7 @@ public class PortForwarderAsyncTest extends BrooklynAppLiveTestSupport {
     private PortForwarderAsyncImpl pfa;
 
     @BeforeMethod(alwaysRun=true)
+    @Override
     public void setUp() throws Exception {
         super.setUp();
         loc = mgmt.getLocationRegistry().resolve("localhost");

portforwarding/src/main/java/brooklyn/networking/portforwarding/PortForwarderIptables.java

@@ -103,6 +103,7 @@ public void inject(Entity owner, List<Location> locations) {
         }
     }
 
+    @Override
     public PortForwardManager getPortForwardManager() {
         return portForwardManager;
     }

portforwarding/src/main/java/brooklyn/networking/portforwarding/subnet/JcloudsPortforwardingSubnetLocation.java

@@ -127,7 +127,8 @@ public JcloudsMachineLocation obtain(Map<?,?> flagsIn) throws NoMachinesAvailabl
     // TODO Remove duplication from super's JcloudsLocation.createJcloudsSshMachineLocation
     // the todos/fixmes in this method are copied from there; they should be addressed in core brooklyn
     @Override
-    protected JcloudsSshMachineLocation createJcloudsSshMachineLocation(ComputeService computeService, NodeMetadata node, Optional<Template> template, String vmHostname, Optional<HostAndPort> sshHostAndPort, LoginCredentials userCredentials, ConfigBag setup) throws IOException {
+    protected JcloudsSshMachineLocation createJcloudsSshMachineLocation(ComputeService computeService, NodeMetadata node, Optional<Template> template,
+                                                                        LoginCredentials userCredentials, HostAndPort managementHostAndPort, ConfigBag setup) throws IOException {
         Map<?,?> sshConfig = extractSshConfig(setup, node);
         String nodeAvailabilityZone = extractAvailabilityZone(setup, node);
         String nodeRegion = extractRegion(setup, node);
@@ -136,7 +137,7 @@ protected JcloudsSshMachineLocation createJcloudsSshMachineLocation(ComputeServi
             nodeRegion = extractProvider(setup, node);
         }
 
-        String address = sshHostAndPort.isPresent() ? sshHostAndPort.get().getHostText() : vmHostname;
+        String address = managementHostAndPort.getHostText();
         try {
             Networking.getInetAddressWithFixedName(address);
             // fine, it resolves
@@ -149,7 +150,7 @@ protected JcloudsSshMachineLocation createJcloudsSshMachineLocation(ComputeServi
                 // Don't want to wait for (or don't expect) VM to be ssh'able, so just check IP reachabilty; 
                 // but don't fail if can't access it at all.
                 // TODO What is a sensible time to wait?
-                LOG.debug("Could not resolve reported address '"+address+"' for "+vmHostname+" ("+setup.getDescription()+"/"+node+"), waitForSshable=false, so requesting reachable address");
+                LOG.debug("Could not resolve reported address '"+address+"' for "+managementHostAndPort+" ("+setup.getDescription()+"/"+node+"), waitForSshable=false, so requesting reachable address");
                 Iterable<String> addresses = Iterables.concat(node.getPublicAddresses(), node.getPrivateAddresses());
                 ListeningExecutorService executor = MoreExecutors.listeningDecorator(Executors.newCachedThreadPool());
                 try {
@@ -161,7 +162,7 @@ protected JcloudsSshMachineLocation createJcloudsSshMachineLocation(ComputeServi
                     executor.shutdownNow();
                 }
             } else {
-                LOG.debug("Could not resolve reported address '"+address+"' for "+vmHostname+" ("+setup.getDescription()+"/"+node+"), requesting reachable socket address");
+                LOG.debug("Could not resolve reported address '"+address+"' for "+managementHostAndPort+" ("+setup.getDescription()+"/"+node+"), requesting reachable socket address");
                 if (computeService==null) throw Exceptions.propagate(e);
                 // this has sometimes already been done in waitForReachable (unless skipped) but easy enough to do again
                 address = JcloudsUtil.getFirstReachableAddress(computeService.getContext(), node);
@@ -174,7 +175,7 @@ protected JcloudsSshMachineLocation createJcloudsSshMachineLocation(ComputeServi
                             userCredentials.getUser(),
                             address,
                             Entities.sanitize(sshConfig),
-                            sshHostAndPort,
+                            managementHostAndPort,
                             setup.getDescription(),
                             node
                     });
@@ -189,10 +190,10 @@ protected JcloudsSshMachineLocation createJcloudsSshMachineLocation(ComputeServi
             // TODO Why pass in "config"? I (Aled) am dubious that has any effect!
             // TODO These things need fixed in JcloudsLocation.createJcloudsSshMachineLocation, rather than just here.
             return getManagementContext().getLocationManager().createLocation(LocationSpec.create(JcloudsPortforwardingSubnetMachineLocation.class)
-                    .displayName(vmHostname)
+                    .displayName(address)
                     .configure(setup.getAllConfig())
                     .configure("address", address)
-                    .configure("port", sshHostAndPort.isPresent() ? sshHostAndPort.get().getPort() : node.getLoginPort())
+                    .configure("port", managementHostAndPort.getPort())
                     .configure("user", userCredentials.getUser())
                     // don't think "config" does anything
                     .configure(sshConfig)

portforwarding/src/main/java/brooklyn/networking/subnet/SubnetEnrichers.java

@@ -302,6 +302,7 @@ protected Integer extractPrivatePort(Integer sensorVal) {
             return sensorVal;
         }
 
+        @Override
         public void init() {
             SubnetTier subnetTier = getConfig(SUBNET_TIER);
             config().set(TRANSFORMATION_FROM_EVENT, new HostAndPortTransformingFunction(subnetTier));

portforwarding/src/main/java/brooklyn/networking/subnet/SubnetTierImpl.java

@@ -269,6 +269,7 @@ protected void openAndRegisterGateway() {
     }
 
     // Code is modelled on AbstractApplication.start(locs)
+    @Override
     public void start(Collection<? extends Location> locations) {
         PortForwarder portForwarder = getPortForwarder();
         portForwarder.inject(getProxy(), ImmutableList.copyOf(Locations.getLocationsCheckingAncestors(locations, this)));
@@ -378,7 +379,6 @@ public synchronized JcloudsPortForwarderExtension getPortForwarderExtension() {
         return _portForwarderExtension;
     }
 
-
     @Override
     @Effector(description = "Stop the process/service represented by an entity")
     public void stop() {
@@ -408,12 +408,14 @@ public void transformSensorStringReplacingWithPublicAddressAndPort(
         getAttributeMunger().transformSensorStringReplacingWithPublicAddressAndPort(targetToUpdate, optionalTargetPort, targetsToMatch, replacementSource);
     }
 
+    @Override
     public void transformPort(EntityAndAttribute<Integer> original, EntityAndAttribute<String> destinationToPublish) {
         // TODO Should we do this without an enricher? Or change #transformSensorStringReplacingWithPublicAddressAndPort 
         // to not use an enricher?
         destinationToPublish.getEntity().enrichers().add(hostAndPortTransformingEnricher(original, destinationToPublish.getAttribute()));
     }
 
+    @Override
     public void transformUri(EntityAndAttribute<String> targetToUpdate) {
         // TODO Should we change #transformSensorStringReplacingWithPublicAddressAndPort 
         // to not use an enricher?
@@ -422,6 +424,7 @@ public void transformUri(EntityAndAttribute<String> targetToUpdate) {
                 .configure(Transformer.SUPPRESS_DUPLICATES, true));
     }
 
+    @Override
     public void transformUri(EntityAndAttribute<String> original, EntityAndAttribute<String> destinationToPublish) {
         // TODO Should we do this without an enricher? Or change #transformSensorStringReplacingWithPublicAddressAndPort 
         // to not use an enricher?

vcloud-director/src/test/java/brooklyn/networking/vclouddirector/NatServiceLiveTest.java

@@ -145,6 +145,7 @@ public void testAddNatRuleAtTai2b() throws Exception {
 
 
     @Test(groups="Live")
+    @Override
     public void testAddNatRulesConcurrently() throws Exception {
         sharedMutex = new Object();
         try {
@@ -154,10 +155,12 @@ public void testAddNatRulesConcurrently() throws Exception {
         }
     }
 
+    @Override
     protected HostAndPort openPortForwarding(PortForwardingConfig config) throws Exception {
         return openPortForwarding(loc, config);
     }
 
+    @Override
     protected HostAndPort closePortForwarding(PortForwardingConfig config) throws Exception {
         return closePortForwarding(loc, config);
     }