You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@jclouds.apache.org by Andrew Bayer <no...@github.com> on 2014/01/08 23:43:57 UTC
[jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
- Adds networks field/methods to TemplateOptions.
- Adds them to children as well for legacy reasons.
- Deprecates CloudStackTemplateOptions#networkIds methods in favor of #networks.
- TODO: Modify compute abstraction layer for provisioning for nova,
EC2, et al to take advantage of this.
You can merge this Pull Request by running:
git pull https://github.com/abayer/jclouds-1 jclouds-416-1.7.x
Or you can view, comment on it, or merge it online at:
https://github.com/jclouds/jclouds/pull/249
-- Commit Summary --
* JCLOUDS-416. Add TemplateOptions#networks.
-- File Changes --
M apis/cloudsigma/src/main/java/org/jclouds/cloudsigma/compute/options/CloudSigmaTemplateOptions.java (20)
M apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java (58)
M apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/AdvancedNetworkOptionsConverter.java (21)
M apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/strategy/BasicNetworkOptionsConverter.java (10)
M apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/CloudStackExperimentLiveTest.java (24)
M apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptionsTest.java (45)
M apis/cloudstack/src/test/java/org/jclouds/cloudstack/compute/strategy/OptionsConverterTest.java (17)
M apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java (47)
M apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java (15)
M apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java (16)
M compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java (55)
M compute/src/test/java/org/jclouds/compute/options/TemplateOptionsTest.java (23)
M providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java (16)
M providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java (16)
M providers/gogrid/src/main/java/org/jclouds/gogrid/compute/options/GoGridTemplateOptions.java (16)
M providers/softlayer/src/main/java/org/jclouds/softlayer/compute/options/SoftLayerTemplateOptions.java (16)
-- Patch Links --
https://github.com/jclouds/jclouds/pull/249.patch
https://github.com/jclouds/jclouds/pull/249.diff
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by Andrew Bayer <no...@github.com>.
> @@ -332,7 +329,15 @@ public static EC2TemplateOptions nodeNames(Iterable<String> nodeNames) {
> EC2TemplateOptions options = new EC2TemplateOptions();
> return EC2TemplateOptions.class.cast(options.nodeNames(nodeNames));
> }
> -
> +
> + /**
> + * @see TemplateOptions#networks(Iterable)
> + */
> + public static EC2TemplateOptions networks(Iterable<String> networks) {
> + EC2TemplateOptions options = new EC2TemplateOptions();
> + return EC2TemplateOptions.class.cast(options.nodeNames(networks));
Arrrgh. I missed this here too?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249/files#r8742898
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #966](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/966/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-31891048
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #502](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/502/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-31890896
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #501](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/501/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-31888603
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #503](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/503/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-31892392
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by BuildHive <no...@github.com>.
[jclouds ยป jclouds #729](https://buildhive.cloudbees.com/job/jclouds/job/jclouds/729/) SUCCESS
This pull request looks good
[(what's this?)](https://www.cloudbees.com/what-is-buildhive)
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-31891083
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #967](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/967/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-31892422
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by Andrew Bayer <no...@github.com>.
Pushing now.
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-32909015
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by Andrew Phillips <no...@github.com>.
> @@ -196,4 +190,11 @@ public void testNodeNames() {
> TemplateOptions options = nodeNames(nodeNames);
> assertTrue(options.getNodeNames().containsAll(nodeNames));
> }
> +
> + @Test
> + public void testNetworks() {
> + Set<String> networks = ImmutableSet.of("first-network", "second-network");
> + TemplateOptions options = networks(networks);
> + assertTrue(options.getNetworks().containsAll(networks));
As with the other PR...comment explaining this assertion, perhaps?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249/files#r8742179
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by Andrew Phillips <no...@github.com>.
> @@ -332,7 +329,15 @@ public static EC2TemplateOptions nodeNames(Iterable<String> nodeNames) {
> EC2TemplateOptions options = new EC2TemplateOptions();
> return EC2TemplateOptions.class.cast(options.nodeNames(nodeNames));
> }
> -
> +
> + /**
> + * @see TemplateOptions#networks(Iterable)
> + */
> + public static EC2TemplateOptions networks(Iterable<String> networks) {
> + EC2TemplateOptions options = new EC2TemplateOptions();
> + return EC2TemplateOptions.class.cast(options.nodeNames(networks));
See [Ignasi's comment](https://github.com/jclouds/jclouds/pull/246/files#r8742283) on the original PR. Meant to be `options.networks` here?
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249/files#r8742774
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-java-7-pull-requests #965](https://jclouds.ci.cloudbees.com/job/jclouds-java-7-pull-requests/965/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-31888657
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by CloudBees pull request builder plugin <no...@github.com>.
[jclouds-pull-requests #515](https://jclouds.ci.cloudbees.com/job/jclouds-pull-requests/515/) SUCCESS
This pull request looks good
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-32913938
Re: [jclouds] Backport JCLOUDS-416 to 1.7.x. Add
TemplateOptions#networks. (#249)
Posted by Zack Shoylev <no...@github.com>.
+1, thanks for the backport @abayer
---
Reply to this email directly or view it on GitHub:
https://github.com/jclouds/jclouds/pull/249#issuecomment-32905749