brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [10/27] incubator-brooklyn git commit: Registers location in vmInstanceIds to allow it to be destroyed after use
Date Fri, 29 May 2015 17:22:03 GMT
Registers location in vmInstanceIds to allow it to be destroyed after use


Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7e2d618d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7e2d618d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7e2d618d

Branch: refs/heads/master
Commit: 7e2d618d19ba12d4f79e3b388efb6bf0f4c92cc3
Parents: be1b504
Author: Martin Harris <github@nakomis.com>
Authored: Mon Apr 27 10:36:10 2015 +0530
Committer: Richard Downer <richard@apache.org>
Committed: Thu May 28 17:27:34 2015 +0100

----------------------------------------------------------------------
 .../main/java/brooklyn/location/jclouds/JcloudsLocation.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7e2d618d/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
index de0dfad..e793bb1 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
@@ -707,7 +707,7 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation
im
             if (windows) {
                 // FIMXE: Need to write WinRM equivalent of getPublicHostname
                 String hostName = node.getPublicAddresses().iterator().next();
-                winRmMachineLocation = registerWinRmMachineLocation(hostName, setup);
+                winRmMachineLocation = registerWinRmMachineLocation(hostName, setup, node.getId());
                 machineLocation = winRmMachineLocation;
             } else {
                 jcloudsSshMachineLocation = registerJcloudsSshMachineLocation(computeService,
node, userCredentials, sshHostAndPortOverride, setup);
@@ -1933,9 +1933,10 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation
im
         }
     }
 
-    protected WinRmMachineLocation registerWinRmMachineLocation(String vmHostname, ConfigBag
setup) {
+    protected WinRmMachineLocation registerWinRmMachineLocation(String vmHostname, ConfigBag
setup, String nodeId) {
         WinRmMachineLocation winRmMachineLocation = createWinRmMachineLocation(vmHostname,
setup);
         winRmMachineLocation.setParent(this);
+        vmInstanceIds.put(winRmMachineLocation, nodeId);
         return winRmMachineLocation;
     }
 


Mime
View raw message