You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by dr...@apache.org on 2017/05/30 11:40:34 UTC
[1/3] brooklyn-server git commit: Delete deprecated
JcloudsLocation.rebindMachine(*)
Repository: brooklyn-server
Updated Branches:
refs/heads/master dd6d9b78b -> 947d5ae44
Delete deprecated JcloudsLocation.rebindMachine(*)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/e9257fda
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/e9257fda
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/e9257fda
Branch: refs/heads/master
Commit: e9257fda37da6e3edb2ee8fa9eb44f031d662550
Parents: dd6d9b7
Author: Aled Sage <al...@gmail.com>
Authored: Tue May 30 10:23:07 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue May 30 10:23:07 2017 +0100
----------------------------------------------------------------------
.../location/jclouds/JcloudsLocation.java | 35 --------------------
...loudsLocationUserLoginAndConfigLiveTest.java | 12 +++----
2 files changed, 6 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9257fda/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 f97518d..f988bf4 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
@@ -1783,26 +1783,10 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
// ----------------- registering existing machines ------------------------
- /**
- * @deprecated since 0.8.0 use {@link #registerMachine(NodeMetadata)} instead.
- */
- @Deprecated
- public JcloudsSshMachineLocation rebindMachine(NodeMetadata metadata) throws NoMachinesAvailableException {
- return (JcloudsSshMachineLocation) registerMachine(metadata);
- }
-
protected MachineLocation registerMachine(NodeMetadata metadata) throws NoMachinesAvailableException {
return registerMachine(MutableMap.of(), metadata);
}
- /**
- * @deprecated since 0.8.0 use {@link #registerMachine(Map, NodeMetadata)} instead.
- */
- @Deprecated
- public JcloudsSshMachineLocation rebindMachine(Map<?,?> flags, NodeMetadata metadata) throws NoMachinesAvailableException {
- return (JcloudsSshMachineLocation) registerMachine(flags, metadata);
- }
-
protected MachineLocation registerMachine(Map<?, ?> flags, NodeMetadata metadata) throws NoMachinesAvailableException {
ConfigBag setup = ConfigBag.newInstanceExtending(config().getBag(), flags);
if (!setup.containsKey("id")) setup.putStringKey("id", metadata.getId());
@@ -1813,17 +1797,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
/**
* Brings an existing machine with the given details under management.
* <p>
- * This method will throw an exception if used to reconnect to a Windows VM.
- * @deprecated since 0.8.0 use {@link #registerMachine(ConfigBag)} instead.
- */
- @Deprecated
- public JcloudsSshMachineLocation rebindMachine(ConfigBag setup) throws NoMachinesAvailableException {
- return (JcloudsSshMachineLocation) registerMachine(setup);
- }
-
- /**
- * Brings an existing machine with the given details under management.
- * <p>
* Required fields are:
* <ul>
* <li>id: the jclouds VM id, e.g. "eu-west-1/i-5504f21d" (NB this is {@see JcloudsMachineLocation#getJcloudsId()} not #getId())
@@ -1909,14 +1882,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
return node;
}
- /**
- * @deprecated since 0.8.0 use {@link #registerMachine(Map)} instead.
- */
- @Deprecated
- public JcloudsSshMachineLocation rebindMachine(Map<?, ?> flags) throws NoMachinesAvailableException {
- return (JcloudsSshMachineLocation) registerMachine(flags);
- }
-
public MachineLocation registerMachine(Map<?,?> flags) throws NoMachinesAvailableException {
ConfigBag setup = ConfigBag.newInstanceExtending(config().getBag(), flags);
return registerMachine(setup);
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/e9257fda/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java
----------------------------------------------------------------------
diff --git a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java
index 9587515..e9755ad 100644
--- a/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java
+++ b/locations/jclouds/src/test/java/org/apache/brooklyn/location/jclouds/SimpleJcloudsLocationUserLoginAndConfigLiveTest.java
@@ -67,7 +67,7 @@ public class SimpleJcloudsLocationUserLoginAndConfigLiveTest extends AbstractJcl
Assert.assertTrue(result.contains("trying m1"));
log.info("now trying rebind "+m1);
- JcloudsSshMachineLocation m2 = jcloudsLocation.rebindMachine(details);
+ JcloudsSshMachineLocation m2 = (JcloudsSshMachineLocation) jcloudsLocation.registerMachine(details);
result = execWithOutput(m2, Arrays.asList("echo trying m2", "hostname", "date"));
Assert.assertTrue(result.contains("trying m2"));
}
@@ -86,7 +86,7 @@ public class SimpleJcloudsLocationUserLoginAndConfigLiveTest extends AbstractJcl
Assert.assertTrue(result.contains("trying m1"));
log.info("now trying rebind "+m1);
- JcloudsSshMachineLocation m2 = jcloudsLocation.rebindMachine(details);
+ JcloudsSshMachineLocation m2 = (JcloudsSshMachineLocation) jcloudsLocation.registerMachine(details);
result = execWithOutput(m2, Arrays.asList("echo trying m2", "hostname", "date"));
Assert.assertTrue(result.contains("trying m2"));
@@ -112,7 +112,7 @@ public class SimpleJcloudsLocationUserLoginAndConfigLiveTest extends AbstractJcl
Assert.assertTrue(result.contains("trying m1"));
log.info("now trying rebind "+m1);
- JcloudsSshMachineLocation m2 = jcloudsLocation.rebindMachine(details);
+ JcloudsSshMachineLocation m2 = (JcloudsSshMachineLocation) jcloudsLocation.registerMachine(details);
result = execWithOutput(m2, Arrays.asList("echo trying m2", "hostname", "date"));
Assert.assertTrue(result.contains("trying m2"));
Assert.assertEquals(m2.node.getUserMetadata().get(key), value);
@@ -153,7 +153,7 @@ public class SimpleJcloudsLocationUserLoginAndConfigLiveTest extends AbstractJcl
Assert.assertTrue(result.contains("trying m1"));
log.info("now trying rebind "+m1);
- JcloudsSshMachineLocation m2 = jcloudsLocation.rebindMachine(details);
+ JcloudsSshMachineLocation m2 = (JcloudsSshMachineLocation) jcloudsLocation.registerMachine(details);
result = execWithOutput(m2, Arrays.asList("echo trying m2", "hostname", "date"));
Assert.assertTrue(result.contains("trying m2"));
@@ -178,7 +178,7 @@ public class SimpleJcloudsLocationUserLoginAndConfigLiveTest extends AbstractJcl
Assert.assertTrue(result.contains("trying m1"));
log.info("now trying rebind "+m1);
- JcloudsSshMachineLocation m2 = jcloudsLocation.rebindMachine(details);
+ JcloudsSshMachineLocation m2 = (JcloudsSshMachineLocation) jcloudsLocation.registerMachine(details);
result = execWithOutput(m2, Arrays.asList("echo trying m2", "hostname", "date"));
Assert.assertTrue(result.contains("trying m2"));
@@ -202,7 +202,7 @@ public class SimpleJcloudsLocationUserLoginAndConfigLiveTest extends AbstractJcl
Assert.assertTrue(result.contains("trying m1"));
log.info("now trying rebind "+m1);
- JcloudsSshMachineLocation m2 = jcloudsLocation.rebindMachine(details);
+ JcloudsSshMachineLocation m2 = (JcloudsSshMachineLocation) jcloudsLocation.registerMachine(details);
result = execWithOutput(m2, Arrays.asList("echo trying m2", "hostname", "date"));
Assert.assertTrue(result.contains("trying m2"));
}
[3/3] brooklyn-server git commit: This closes #709
Posted by dr...@apache.org.
This closes #709
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/947d5ae4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/947d5ae4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/947d5ae4
Branch: refs/heads/master
Commit: 947d5ae447eaf2f43183312450f3387653ddc1ec
Parents: dd6d9b7 7f5f9ae
Author: Duncan Godwin <dr...@googlemail.com>
Authored: Tue May 30 12:40:28 2017 +0100
Committer: Duncan Godwin <dr...@googlemail.com>
Committed: Tue May 30 12:40:28 2017 +0100
----------------------------------------------------------------------
.../location/jclouds/JcloudsLocation.java | 46 --------------------
...loudsLocationUserLoginAndConfigLiveTest.java | 12 ++---
2 files changed, 6 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
[2/3] brooklyn-server git commit: Delete deprecated
JcloudsLocation.listNodes(*)
Posted by dr...@apache.org.
Delete deprecated JcloudsLocation.listNodes(*)
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/7f5f9ae8
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/7f5f9ae8
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/7f5f9ae8
Branch: refs/heads/master
Commit: 7f5f9ae8447a12774a2aad776d579a2421fcaf8c
Parents: e9257fd
Author: Aled Sage <al...@gmail.com>
Authored: Tue May 30 10:25:38 2017 +0100
Committer: Aled Sage <al...@gmail.com>
Committed: Tue May 30 10:25:38 2017 +0100
----------------------------------------------------------------------
.../brooklyn/location/jclouds/JcloudsLocation.java | 11 -----------
1 file changed, 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/7f5f9ae8/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 f988bf4..e91b588 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
@@ -516,17 +516,6 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
return registry.findComputeService(ResolvingConfigBag.newInstanceExtending(getManagementContext(), config), true);
}
- /** @deprecated since 0.7.0 use {@link #listMachines()} */ @Deprecated
- public Set<? extends ComputeMetadata> listNodes() {
- return listNodes(MutableMap.of());
- }
- /** @deprecated since 0.7.0 use {@link #listMachines()}.
- * (no support for custom compute service flags; if that is needed, we'll have to introduce a new method,
- * but it seems there are no usages) */ @Deprecated
- public Set<? extends ComputeMetadata> listNodes(Map<?,?> flags) {
- return getComputeService(flags).listNodes();
- }
-
@Override
public Map<String, MachineManagementMixins.MachineMetadata> listMachines() {
Set<? extends ComputeMetadata> nodes =