You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/02/01 18:50:16 UTC
[19/50] [abbrv] brooklyn-server git commit: better warnings and
comments on use of `networkName` in JcloudsLocation
better warnings and comments on use of `networkName` in JcloudsLocation
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/4a6ada40
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/4a6ada40
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/4a6ada40
Branch: refs/heads/0.7.0-incubating
Commit: 4a6ada40b89b09f8aea2355e00542251309653a7
Parents: d5fcc34
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Jun 23 23:12:07 2015 -0700
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jun 24 01:04:24 2015 -0700
----------------------------------------------------------------------
.../brooklyn/location/jclouds/JcloudsLocation.java | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/4a6ada40/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 969d41d..7797138 100644
--- a/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
+++ b/locations/jclouds/src/main/java/brooklyn/location/jclouds/JcloudsLocation.java
@@ -1257,14 +1257,20 @@ public class JcloudsLocation extends AbstractCloudMachineProvisioningLocation im
((AWSEC2TemplateOptions)t).subnetId((String)v);
} else {
- if (t instanceof SoftLayerTemplateOptions) {
- LOG.warn("networkName may not be supported in SoftLayer; use `templateOptions` with `primaryNetworkComponentNetworkVlanId` or `primaryNetworkBackendComponentNetworkVlanId`");
+ if (t instanceof GoogleComputeEngineTemplateOptions) {
+ // no warning needed
+ // we think this is the only jclouds endpoint which supports this option
+
+ } else if (t instanceof SoftLayerTemplateOptions) {
+ LOG.warn("networkName is not be supported in SoftLayer; use `templateOptions` with `primaryNetworkComponentNetworkVlanId` or `primaryNetworkBackendComponentNetworkVlanId`");
} else if (!(t instanceof CloudStackTemplateOptions) && !(t instanceof NovaTemplateOptions)) {
- LOG.warn("networkName may not be supported in this cloud; only known to work in CloudStack and OpenStack");
+ LOG.warn("networkName is experimental in many jclouds endpoints may not be supported in this cloud");
+ // NB, from @andreaturli
+// Cloudstack uses custom securityGroupIds and networkIds not the generic networks
+// Openstack Nova uses securityGroupNames which is marked as @deprecated (suggests to use groups which is maybe even more confusing)
+// Azure supports the custom networkSecurityGroupName
}
- // looks like this is only supported in Cloudstack and Openstack
- // should we log warning if using another cloud?
t.networks((String)v);
}
}})