Updated Branches: refs/heads/master 375cb2075 -> 2fcd90c39
JCLOUDS-220. Adding projectId to a bunch of CloudStack API options Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/2fcd90c3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/2fcd90c3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/2fcd90c3 Branch: refs/heads/master Commit: 2fcd90c394c8d113f9b78dde675f040c8892407a Parents: 375cb20 Author: Andrew Bayer <[email protected]> Authored: Thu Aug 1 15:25:46 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Thu Aug 1 17:17:24 2013 -0700 ---------------------------------------------------------------------- .../options/AssociateIPAddressOptions.java | 17 +++++++++++++++++ .../cloudstack/options/CreateNetworkOptions.java | 17 +++++++++++++++++ .../cloudstack/options/CreateVMGroupOptions.java | 16 ++++++++++++++++ .../options/CreateVlanIPRangeOptions.java | 9 +++++++++ .../options/DeployVirtualMachineOptions.java | 16 ++++++++++++++++ .../cloudstack/options/ListEventsOptions.java | 10 ++++++++++ .../options/ListFirewallRulesOptions.java | 17 +++++++++++++++++ .../options/ListIPForwardingRulesOptions.java | 18 ++++++++++++++++++ .../cloudstack/options/ListISOsOptions.java | 15 +++++++++++++++ .../options/ListLoadBalancerRulesOptions.java | 16 ++++++++++++++++ .../cloudstack/options/ListNetworksOptions.java | 18 ++++++++++++++++++ .../options/ListPortForwardingRulesOptions.java | 17 +++++++++++++++++ .../options/ListPublicIPAddressesOptions.java | 18 ++++++++++++++++++ .../options/ListResourceLimitsOptions.java | 19 +++++++++++++++++++ .../options/ListSSHKeyPairsOptions.java | 17 +++++++++++++++++ .../options/ListSecurityGroupsOptions.java | 17 +++++++++++++++++ .../cloudstack/options/ListSnapshotsOptions.java | 15 +++++++++++++++ .../cloudstack/options/ListTemplatesOptions.java | 18 ++++++++++++++++++ .../options/ListUsageRecordsOptions.java | 10 ++++++++++ .../cloudstack/options/ListVMGroupsOptions.java | 16 ++++++++++++++++ .../options/ListVirtualMachinesOptions.java | 18 ++++++++++++++++++ .../options/ListVlanIPRangesOptions.java | 9 +++++++++ .../cloudstack/options/ListVolumesOptions.java | 17 +++++++++++++++++ .../cloudstack/options/RegisterISOOptions.java | 15 +++++++++++++++ .../options/RegisterTemplateOptions.java | 13 +++++++++++++ .../UpdateTemplatePermissionsOptions.java | 13 +++++++++++++ 26 files changed, 401 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java index 0cbaf41..da81895 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/AssociateIPAddressOptions.java @@ -40,6 +40,15 @@ public class AssociateIPAddressOptions extends AccountInDomainOptions { } + /** + * @param projectId + * Project for the IP + */ + public AssociateIPAddressOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + public static class Builder { /** @@ -65,6 +74,14 @@ public class AssociateIPAddressOptions extends AccountInDomainOptions { AssociateIPAddressOptions options = new AssociateIPAddressOptions(); return options.domainId(domainId); } + + /** + * @see AssociateIPAddressOptions#projectId(String) + */ + public static AssociateIPAddressOptions projectId(String projectId) { + AssociateIPAddressOptions options = new AssociateIPAddressOptions(); + return options.projectId(projectId); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java index 48c9c97..fe369ab 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateNetworkOptions.java @@ -102,6 +102,15 @@ public class CreateNetworkOptions extends AccountInDomainOptions { return this; } + /** + * @param projectId + * the project this network will be in. + */ + public CreateNetworkOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + public static class Builder { /** * @see CreateNetworkOptions#isDefault @@ -182,6 +191,14 @@ public class CreateNetworkOptions extends AccountInDomainOptions { CreateNetworkOptions options = new CreateNetworkOptions(); return options.domainId(domainId); } + + /** + * @see CreateNetworkOptions#projectId(String) + */ + public static CreateNetworkOptions projectId(String projectId) { + CreateNetworkOptions options = new CreateNetworkOptions(); + return options.projectId(projectId); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java index e1b4cdf..60506c7 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVMGroupOptions.java @@ -48,6 +48,14 @@ public class CreateVMGroupOptions extends BaseHttpRequestOptions { return this; } + /** + * @param projectId the project the vm group will be in + */ + public CreateVMGroupOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + public static class Builder { /** * @see org.jclouds.cloudstack.options.CreateVMGroupOptions#account @@ -64,6 +72,14 @@ public class CreateVMGroupOptions extends BaseHttpRequestOptions { CreateVMGroupOptions options = new CreateVMGroupOptions(); return options.domainId(id); } + + /** + * @see org.jclouds.cloudstack.options.CreateVMGroupOptions#projectId(String) + */ + public static CreateVMGroupOptions projectId(String id) { + CreateVMGroupOptions options = new CreateVMGroupOptions(); + return options.projectId(id); + } } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptions.java index 1ebaf42..397b316 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/CreateVlanIPRangeOptions.java @@ -67,6 +67,10 @@ public class CreateVlanIPRangeOptions extends AccountInDomainOptions { return new CreateVlanIPRangeOptions().networkId(networkId); } + public static CreateVlanIPRangeOptions projectId(String projectId) { + return new CreateVlanIPRangeOptions().projectId(projectId); + } + } @Override @@ -118,4 +122,9 @@ public class CreateVlanIPRangeOptions extends AccountInDomainOptions { this.queryParameters.replaceValues("networkid", ImmutableSet.of(networkId+"")); return this; } + + public CreateVlanIPRangeOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId+"")); + return this; + } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java index c9d14eb..dcec8f6 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/DeployVirtualMachineOptions.java @@ -170,6 +170,14 @@ public class DeployVirtualMachineOptions extends AccountInDomainOptions { } /** + * @param projectId The project this VM will be in. + */ + public DeployVirtualMachineOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + + /** * @param securityGroupId * security group applied to the virtual machine. Should be passed * only when vm is created from a zone with Basic Network support @@ -299,6 +307,14 @@ public class DeployVirtualMachineOptions extends AccountInDomainOptions { } /** + * @see DeployVirtualMachineOptions#projectId(String) + */ + public static DeployVirtualMachineOptions projectId(String id) { + DeployVirtualMachineOptions options = new DeployVirtualMachineOptions(); + return options.projectId(id); + } + + /** * @see DeployVirtualMachineOptions#securityGroupId */ public static DeployVirtualMachineOptions securityGroupId(String id) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java index 058b1df..166933d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListEventsOptions.java @@ -63,6 +63,11 @@ public class ListEventsOptions extends BaseHttpRequestOptions { return this; } + public ListEventsOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + public ListEventsOptions keyword(String keyword) { this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword)); return this; @@ -110,6 +115,11 @@ public class ListEventsOptions extends BaseHttpRequestOptions { return options.id(id); } + public static ListEventsOptions projectId(String projectId) { + final ListEventsOptions options = new ListEventsOptions(); + return options.projectId(projectId); + } + public static ListEventsOptions keyword(String keyword) { final ListEventsOptions options = new ListEventsOptions(); return options.keyword(keyword); http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListFirewallRulesOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListFirewallRulesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListFirewallRulesOptions.java index af37002..2679f95 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListFirewallRulesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListFirewallRulesOptions.java @@ -49,6 +49,15 @@ public class ListFirewallRulesOptions extends AccountInDomainOptions { } /** + * @param projectId + * List firewall rules in this project. + */ + public ListFirewallRulesOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + + /** * @param keyword * list by keyword */ @@ -86,6 +95,14 @@ public class ListFirewallRulesOptions extends AccountInDomainOptions { } /** + * @see ListFirewallRulesOptions#projectId(String) + */ + public static ListFirewallRulesOptions projectId(String projectId) { + ListFirewallRulesOptions options = new ListFirewallRulesOptions(); + return options.projectId(projectId); + } + + /** * @see ListFirewallRulesOptions#keyword */ public static ListFirewallRulesOptions keyword(String keyword) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java index a9c93df..856f3c1 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListIPForwardingRulesOptions.java @@ -59,6 +59,16 @@ public class ListIPForwardingRulesOptions extends AccountInDomainOptions { } + /** + * @param projectId + * Lists all rules applied to VMs in the given project. + */ + public ListIPForwardingRulesOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + + } + public static class Builder { /** @@ -100,6 +110,14 @@ public class ListIPForwardingRulesOptions extends AccountInDomainOptions { ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions(); return options.virtualMachineId(virtualMachineId); } + + /** + * @see ListIPForwardingRulesOptions#projectId(String) + */ + public static ListIPForwardingRulesOptions projectId(String projectId) { + ListIPForwardingRulesOptions options = new ListIPForwardingRulesOptions(); + return options.projectId(projectId); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java index 727f274..479b7c2 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListISOsOptions.java @@ -68,6 +68,14 @@ public class ListISOsOptions extends AccountInDomainOptions { } /** + * @param projectId list ISOs in the given project + */ + public ListISOsOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + + /** * @param isoFilter possible values are "featured", "self", "self-executable","executable", and "community". */ public ListISOsOptions isoFilter(ISO.ISOFilter isoFilter) { @@ -175,6 +183,13 @@ public class ListISOsOptions extends AccountInDomainOptions { } /** + * @param projectId list ISOs in project + */ + public static ListISOsOptions projectId(String projectId) { + return new ListISOsOptions().projectId(projectId); + } + + /** * @param isoFilter possible values are "featured", "self", "self-executable","executable", and "community". */ public static ListISOsOptions isoFilter(ISO.ISOFilter isoFilter) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java index c9483f4..a3b7792 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListLoadBalancerRulesOptions.java @@ -75,6 +75,14 @@ public class ListLoadBalancerRulesOptions extends AccountInDomainOptions { } /** + * @param projectId the project ID + */ + public ListLoadBalancerRulesOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + + /** * @param page the number of the page */ public ListLoadBalancerRulesOptions page(long page) { @@ -149,6 +157,14 @@ public class ListLoadBalancerRulesOptions extends AccountInDomainOptions { } /** + * @see ListLoadBalancerRulesOptions#projectId(String) + */ + public static ListLoadBalancerRulesOptions projectId(String projectId) { + ListLoadBalancerRulesOptions options = new ListLoadBalancerRulesOptions(); + return options.projectId(projectId); + } + + /** * @see ListLoadBalancerRulesOptions#page */ public static ListLoadBalancerRulesOptions page(long page) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java index 4b3e0f1..f364158 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListNetworksOptions.java @@ -89,6 +89,16 @@ public class ListNetworksOptions extends AccountInDomainOptions { } /** + * @param projectId + * the project ID of the network + */ + public ListNetworksOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + + } + + /** * @param trafficType * type of the traffic */ @@ -163,6 +173,14 @@ public class ListNetworksOptions extends AccountInDomainOptions { } /** + * @see ListNetworksOptions#projectId(String) + */ + public static ListNetworksOptions projectId(String id) { + ListNetworksOptions options = new ListNetworksOptions(); + return options.projectId(id); + } + + /** * @see ListNetworksOptions#trafficType */ public static ListNetworksOptions trafficType(TrafficType trafficType) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java index 26bb2d6..c14a1d5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPortForwardingRulesOptions.java @@ -49,6 +49,15 @@ public class ListPortForwardingRulesOptions extends AccountInDomainOptions { } + /** + * @param projectId + * list the rules in this project + */ + public ListPortForwardingRulesOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + + } public static class Builder { /** @@ -68,6 +77,14 @@ public class ListPortForwardingRulesOptions extends AccountInDomainOptions { } /** + * @see ListPortForwardingRulesOptions#projectId(String) + */ + public static ListPortForwardingRulesOptions projectId(String projectId) { + ListPortForwardingRulesOptions options = new ListPortForwardingRulesOptions(); + return options.projectId(projectId); + } + + /** * @see ListPortForwardingRulesOptions#accountInDomain */ public static ListPortForwardingRulesOptions accountInDomain(String account, String domain) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java index e4f2084..848a277 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListPublicIPAddressesOptions.java @@ -60,6 +60,16 @@ public class ListPublicIPAddressesOptions extends AccountInDomainOptions { } /** + * @param projectId + * list ip addresss by project. + */ + public ListPublicIPAddressesOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + + } + + /** * @param VLANId * lists all public IP addresses by VLAN ID */ @@ -148,6 +158,14 @@ public class ListPublicIPAddressesOptions extends AccountInDomainOptions { } /** + * @see ListPublicIPAddressesOptions#projectId(String) + */ + public static ListPublicIPAddressesOptions projectId(String id) { + ListPublicIPAddressesOptions options = new ListPublicIPAddressesOptions(); + return options.projectId(id); + } + + /** * @see ListPublicIPAddressesOptions#VLANId */ public static ListPublicIPAddressesOptions VLANId(String id) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java index 48c6c17..aafc192 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListResourceLimitsOptions.java @@ -62,6 +62,17 @@ public class ListResourceLimitsOptions extends BaseHttpRequestOptions { } /** + * Lists resource limits by project. + * + * @param projectId the project + * @return ListResourceLimitsOptions + */ + public ListResourceLimitsOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(String.valueOf(projectId + ""))); + return this; + } + + /** * List by keyword * * @param keyword @@ -117,6 +128,14 @@ public class ListResourceLimitsOptions extends BaseHttpRequestOptions { } /** + * @see ListResourceLimitsOptions#projectId(String) + */ + public static ListResourceLimitsOptions projectId(String projectId) { + ListResourceLimitsOptions options = new ListResourceLimitsOptions(); + return options.projectId(projectId); + } + + /** * @see ListResourceLimitsOptions#keyword(String) */ public static ListResourceLimitsOptions keyword(String keyword) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java index 9bf3f5b..9700b3e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSSHKeyPairsOptions.java @@ -36,6 +36,15 @@ public class ListSSHKeyPairsOptions extends BaseHttpRequestOptions { return this; } + /** + * @param projectId + * the project to list in + */ + public ListSSHKeyPairsOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectId", ImmutableSet.of(projectId + "")); + return this; + } + public static class Builder { /** * @see ListSSHKeyPairsOptions#name @@ -45,5 +54,13 @@ public class ListSSHKeyPairsOptions extends BaseHttpRequestOptions { return options.name(name); } + /** + * @see ListSSHKeyPairsOptions#projectId(String) + */ + public static ListSSHKeyPairsOptions projectId(String projectId) { + ListSSHKeyPairsOptions options = new ListSSHKeyPairsOptions(); + return options.projectId(projectId); + } + } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java index 050bcb4..cad55e5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSecurityGroupsOptions.java @@ -60,6 +60,15 @@ public class ListSecurityGroupsOptions extends AssociateIPAddressOptions { } + /** + * @param projectId + * the ID of the project to search in. + */ + public ListSecurityGroupsOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + public static class Builder { /** @@ -87,6 +96,14 @@ public class ListSecurityGroupsOptions extends AssociateIPAddressOptions { } /** + * @see ListSecurityGroupsOptions#projectId(String) + */ + public static ListSecurityGroupsOptions projectId(String projectId) { + ListSecurityGroupsOptions options = new ListSecurityGroupsOptions(); + return options.projectId(projectId); + } + + /** * @see DeployVirtualMachineOptions#accountInDomain */ public static ListSecurityGroupsOptions accountInDomain(String account, String domain) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java index 605a851..fa142eb 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListSnapshotsOptions.java @@ -87,6 +87,14 @@ public class ListSnapshotsOptions extends AccountInDomainOptions { return this; } + /** + * @param projectId the project to list in + */ + public ListSnapshotsOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + public static class Builder { /** @@ -152,6 +160,13 @@ public class ListSnapshotsOptions extends AccountInDomainOptions { public static ListSnapshotsOptions volumeId(String volumeId) { return new ListSnapshotsOptions().volumeId(volumeId); } + + /** + * @param projectId the project to list in + */ + public static ListSnapshotsOptions projectId(String projectId) { + return new ListSnapshotsOptions().projectId(projectId); + } } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java index 0c9bd4e..709a8bb 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListTemplatesOptions.java @@ -73,6 +73,16 @@ public class ListTemplatesOptions extends AccountInDomainOptions { } /** + * @param projectId + * list templates by projectId. + */ + public ListTemplatesOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + + } + + /** * @param hypervisor * the hypervisor for which to restrict the search */ @@ -132,6 +142,14 @@ public class ListTemplatesOptions extends AccountInDomainOptions { } /** + * @see ListTemplatesOptions#projectId(String) + */ + public static ListTemplatesOptions projectId(String projectId) { + ListTemplatesOptions options = new ListTemplatesOptions(); + return options.projectId(projectId); + } + + /** * @see ListTemplatesOptions#hypervisor */ public static ListTemplatesOptions hypervisor(String hypervisor) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListUsageRecordsOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListUsageRecordsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListUsageRecordsOptions.java index ebc6010..324e2fc 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListUsageRecordsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListUsageRecordsOptions.java @@ -43,6 +43,11 @@ public class ListUsageRecordsOptions extends AccountInDomainOptions { return options.accountId(accountId); } + public static ListUsageRecordsOptions projectId(String projectId) { + ListUsageRecordsOptions options = new ListUsageRecordsOptions(); + return options.projectId(projectId); + } + public static ListUsageRecordsOptions keyword(String keyword) { ListUsageRecordsOptions options = new ListUsageRecordsOptions(); return options.keyword(keyword); @@ -64,6 +69,11 @@ public class ListUsageRecordsOptions extends AccountInDomainOptions { return this; } + public ListUsageRecordsOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + public ListUsageRecordsOptions keyword(String keyword) { this.queryParameters.replaceValues("keyword", ImmutableSet.of(keyword)); return this; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java index 731e4e2..b9ba4d9 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVMGroupsOptions.java @@ -57,6 +57,14 @@ public class ListVMGroupsOptions extends BaseHttpRequestOptions { } /** + * @param projectId id of the project the vm group is in + */ + public ListVMGroupsOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + + /** * @param keyword keyword to search on */ public ListVMGroupsOptions keyword(String keyword) { @@ -98,6 +106,14 @@ public class ListVMGroupsOptions extends BaseHttpRequestOptions { } /** + * @see org.jclouds.cloudstack.options.ListVMGroupsOptions#projectId(String) + */ + public static ListVMGroupsOptions projectId(String id) { + ListVMGroupsOptions options = new ListVMGroupsOptions(); + return options.projectId(id); + } + + /** * @see org.jclouds.cloudstack.options.ListVMGroupsOptions#keyword */ public static ListVMGroupsOptions keyword(String keyword) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java index 2a538f2..95c26ea 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVirtualMachinesOptions.java @@ -98,6 +98,16 @@ public class ListVirtualMachinesOptions extends AccountInDomainOptions { } /** + * @param projectId + * list virtual machines by projectId. + */ + public ListVirtualMachinesOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + + } + + /** * @param zoneId * list virtual machines by zoneId. */ @@ -192,6 +202,14 @@ public class ListVirtualMachinesOptions extends AccountInDomainOptions { } /** + * @see ListVirtualMachinesOptions#projectId(String) + */ + public static ListVirtualMachinesOptions projectId(String id) { + ListVirtualMachinesOptions options = new ListVirtualMachinesOptions(); + return options.projectId(id); + } + + /** * @see ListVirtualMachinesOptions#zoneId */ public static ListVirtualMachinesOptions zoneId(String id) { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptions.java index 30ca63c..11b5d8b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVlanIPRangesOptions.java @@ -55,6 +55,10 @@ public class ListVlanIPRangesOptions extends AccountInDomainOptions { return new ListVlanIPRangesOptions().podId(podId); } + public static ListVlanIPRangesOptions projectId(String projectId) { + return new ListVlanIPRangesOptions().projectId(projectId); + } + public static ListVlanIPRangesOptions vlan(long vlan) { return new ListVlanIPRangesOptions().vlan(vlan); } @@ -103,6 +107,11 @@ public class ListVlanIPRangesOptions extends AccountInDomainOptions { return this; } + public ListVlanIPRangesOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId+"")); + return this; + } + public ListVlanIPRangesOptions vlan(String vlan) { this.queryParameters.replaceValues("vlan", ImmutableSet.of(vlan)); return this; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java index c045f3b..d26c647 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/ListVolumesOptions.java @@ -107,6 +107,15 @@ public class ListVolumesOptions extends AccountInDomainOptions { } + /** + * @param projectId list volumes by projectId. + */ + public ListVolumesOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + + } + public static class Builder { @@ -198,6 +207,14 @@ public class ListVolumesOptions extends AccountInDomainOptions { ListVolumesOptions options = new ListVolumesOptions(); return options.zoneId(id); } + + /** + * @see ListVolumesOptions#projectId(String) + */ + public static ListVolumesOptions projectId(String id) { + ListVolumesOptions options = new ListVolumesOptions(); + return options.projectId(id); + } } /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java index fdb77b8..acdf5cc 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterISOOptions.java @@ -69,6 +69,14 @@ public class RegisterISOOptions extends AccountInDomainOptions { return this; } + /** + * @param projectId the project this ISO will be in. + */ + public RegisterISOOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + public static class Builder { /** @@ -119,6 +127,13 @@ public class RegisterISOOptions extends AccountInDomainOptions { public static RegisterISOOptions osTypeId(String osTypeId) { return new RegisterISOOptions().osTypeId(osTypeId); } + + /** + * @param projectId the project this ISO will be in. + */ + public static RegisterISOOptions projectId(String projectId) { + return new RegisterISOOptions().projectId(projectId); + } } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java index 738e243..01c79c1 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/RegisterTemplateOptions.java @@ -47,6 +47,14 @@ public class RegisterTemplateOptions extends AccountInDomainOptions { } /** + * the project for this template. + */ + public RegisterTemplateOptions projectId(String projectId) { + this.queryParameters.replaceValues("projectid", ImmutableSet.of(projectId + "")); + return this; + } + + /** * true if the template or its derivatives are extractable; default is true */ public RegisterTemplateOptions isExtractable(boolean isExtractable) { @@ -98,6 +106,11 @@ public class RegisterTemplateOptions extends AccountInDomainOptions { return options.checksum(checksum); } + public static RegisterTemplateOptions projectId(String projectId) { + RegisterTemplateOptions options = new RegisterTemplateOptions(); + return options.projectId(projectId); + } + public static RegisterTemplateOptions isExtractable(boolean isExtractable) { RegisterTemplateOptions options = new RegisterTemplateOptions(); return options.isExtractable(isExtractable); http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/2fcd90c3/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java index 1dedd7d..d7558f3 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/options/UpdateTemplatePermissionsOptions.java @@ -40,6 +40,14 @@ public class UpdateTemplatePermissionsOptions extends BaseHttpRequestOptions { } /** + * a list of projects. If specified, "op" parameter has to be passed in. + */ + public UpdateTemplatePermissionsOptions projectIds(Iterable<String> projectIds) { + this.queryParameters.replaceValues("projectids", ImmutableSet.of(Joiner.on(',').join(projectIds))); + return this; + } + + /** * true if the template/iso is extractable, false other wise. Can be set only by root admin */ public UpdateTemplatePermissionsOptions isExtractable(boolean isExtractable) { @@ -82,6 +90,11 @@ public class UpdateTemplatePermissionsOptions extends BaseHttpRequestOptions { return options.accounts(accounts); } + public static UpdateTemplatePermissionsOptions projectIds(Iterable<String> projectIds) { + UpdateTemplatePermissionsOptions options = new UpdateTemplatePermissionsOptions(); + return options.projectIds(projectIds); + } + public static UpdateTemplatePermissionsOptions isExtractable(boolean isExtractable) { UpdateTemplatePermissionsOptions options = new UpdateTemplatePermissionsOptions(); return options.isExtractable(isExtractable);
