You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2017/12/19 10:33:48 UTC
jclouds-labs-openstack git commit: WIP: Keystone V3 in Neutron
Repository: jclouds-labs-openstack
Updated Branches:
refs/heads/keystonev3 [created] bbc67d532
WIP: Keystone V3 in Neutron
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/bbc67d53
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/bbc67d53
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/bbc67d53
Branch: refs/heads/keystonev3
Commit: bbc67d5324fd79eda4cf4a7b1ce3d5dbf5385dd9
Parents: 660f10f
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Dec 19 11:33:38 2017 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue Dec 19 11:33:38 2017 +0100
----------------------------------------------------------------------
.gitignore | 1 +
.../v2/domain/AutoValue_CreateFirewall.java | 176 ++++++++
.../domain/AutoValue_CreateFirewallPolicy.java | 202 ++++++++++
.../v2/domain/AutoValue_CreateFirewallRule.java | 401 +++++++++++++++++++
.../neutron/v2/domain/AutoValue_Firewall.java | 133 ++++++
.../v2/domain/AutoValue_FirewallPolicy.java | 132 ++++++
.../v2/domain/AutoValue_FirewallRule.java | 235 +++++++++++
.../v2/domain/AutoValue_UpdateFirewall.java | 176 ++++++++
.../domain/AutoValue_UpdateFirewallPolicy.java | 202 ++++++++++
.../v2/domain/AutoValue_UpdateFirewallRule.java | 401 +++++++++++++++++++
.../neutron/v2/NeutronApiMetadata.java | 18 +-
.../neutron/v2/extensions/FWaaSApi.java | 2 +-
.../neutron/v2/extensions/FloatingIPApi.java | 2 +-
.../neutron/v2/extensions/RouterApi.java | 2 +-
.../v2/extensions/lbaas/v1/LBaaSApi.java | 2 +-
.../neutron/v2/features/NetworkApi.java | 2 +-
.../openstack/neutron/v2/features/PortApi.java | 28 +-
.../neutron/v2/features/SecurityGroupApi.java | 2 +-
.../neutron/v2/features/SubnetApi.java | 28 +-
.../v2/internal/BaseNeutronApiLiveTest.java | 2 +-
.../v2/internal/BaseNeutronApiMockTest.java | 6 +-
21 files changed, 2109 insertions(+), 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 3242d22..f98a95a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ TAGS
atlassian-ide-plugin.xml
.DS_Store
.java-version
+.factorypath
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewall.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewall.java b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewall.java
new file mode 100644
index 0000000..4fce7ac
--- /dev/null
+++ b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewall.java
@@ -0,0 +1,176 @@
+
+package org.jclouds.openstack.neutron.v2.domain;
+
+import javax.annotation.Generated;
+
+@Generated("com.google.auto.value.processor.AutoValueProcessor")
+final class AutoValue_CreateFirewall extends CreateFirewall {
+
+ private final String tenantId;
+ private final String name;
+ private final String description;
+ private final Boolean adminStateUp;
+ private final String firewallPolicyId;
+
+ private AutoValue_CreateFirewall(
+ @org.jclouds.javax.annotation.Nullable String tenantId,
+ @org.jclouds.javax.annotation.Nullable String name,
+ @org.jclouds.javax.annotation.Nullable String description,
+ @org.jclouds.javax.annotation.Nullable Boolean adminStateUp,
+ @org.jclouds.javax.annotation.Nullable String firewallPolicyId) {
+ this.tenantId = tenantId;
+ this.name = name;
+ this.description = description;
+ this.adminStateUp = adminStateUp;
+ this.firewallPolicyId = firewallPolicyId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getAdminStateUp() {
+ return adminStateUp;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getFirewallPolicyId() {
+ return firewallPolicyId;
+ }
+
+ @Override
+ public String toString() {
+ return "CreateFirewall{"
+ + "tenantId=" + tenantId + ", "
+ + "name=" + name + ", "
+ + "description=" + description + ", "
+ + "adminStateUp=" + adminStateUp + ", "
+ + "firewallPolicyId=" + firewallPolicyId
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof CreateFirewall) {
+ CreateFirewall that = (CreateFirewall) o;
+ return ((this.tenantId == null) ? (that.getTenantId() == null) : this.tenantId.equals(that.getTenantId()))
+ && ((this.name == null) ? (that.getName() == null) : this.name.equals(that.getName()))
+ && ((this.description == null) ? (that.getDescription() == null) : this.description.equals(that.getDescription()))
+ && ((this.adminStateUp == null) ? (that.getAdminStateUp() == null) : this.adminStateUp.equals(that.getAdminStateUp()))
+ && ((this.firewallPolicyId == null) ? (that.getFirewallPolicyId() == null) : this.firewallPolicyId.equals(that.getFirewallPolicyId()));
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h = 1;
+ h *= 1000003;
+ h ^= (tenantId == null) ? 0 : tenantId.hashCode();
+ h *= 1000003;
+ h ^= (name == null) ? 0 : name.hashCode();
+ h *= 1000003;
+ h ^= (description == null) ? 0 : description.hashCode();
+ h *= 1000003;
+ h ^= (adminStateUp == null) ? 0 : adminStateUp.hashCode();
+ h *= 1000003;
+ h ^= (firewallPolicyId == null) ? 0 : firewallPolicyId.hashCode();
+ return h;
+ }
+
+ @Override
+ public CreateFirewall.Builder toBuilder() {
+ return new Builder(this);
+ }
+
+ static final class Builder extends CreateFirewall.Builder {
+ private String tenantId;
+ private String name;
+ private String description;
+ private Boolean adminStateUp;
+ private String firewallPolicyId;
+ Builder() {
+ }
+ Builder(CreateFirewall source) {
+ this.tenantId = source.getTenantId();
+ this.name = source.getName();
+ this.description = source.getDescription();
+ this.adminStateUp = source.getAdminStateUp();
+ this.firewallPolicyId = source.getFirewallPolicyId();
+ }
+ @Override
+ public CreateFirewall.Builder tenantId(String tenantId) {
+ this.tenantId = tenantId;
+ return this;
+ }
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+ @Override
+ public CreateFirewall.Builder name(String name) {
+ this.name = name;
+ return this;
+ }
+ @Override
+ public String getName() {
+ return name;
+ }
+ @Override
+ public CreateFirewall.Builder description(String description) {
+ this.description = description;
+ return this;
+ }
+ @Override
+ public String getDescription() {
+ return description;
+ }
+ @Override
+ public CreateFirewall.Builder adminStateUp(Boolean adminStateUp) {
+ this.adminStateUp = adminStateUp;
+ return this;
+ }
+ @Override
+ public Boolean getAdminStateUp() {
+ return adminStateUp;
+ }
+ @Override
+ public CreateFirewall.Builder firewallPolicyId(String firewallPolicyId) {
+ this.firewallPolicyId = firewallPolicyId;
+ return this;
+ }
+ @Override
+ public String getFirewallPolicyId() {
+ return firewallPolicyId;
+ }
+ @Override
+ public CreateFirewall build() {
+ return new AutoValue_CreateFirewall(
+ this.tenantId,
+ this.name,
+ this.description,
+ this.adminStateUp,
+ this.firewallPolicyId);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewallPolicy.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewallPolicy.java b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewallPolicy.java
new file mode 100644
index 0000000..eb08e0c
--- /dev/null
+++ b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewallPolicy.java
@@ -0,0 +1,202 @@
+
+package org.jclouds.openstack.neutron.v2.domain;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+@Generated("com.google.auto.value.processor.AutoValueProcessor")
+final class AutoValue_CreateFirewallPolicy extends CreateFirewallPolicy {
+
+ private final String tenantId;
+ private final String name;
+ private final String description;
+ private final Boolean shared;
+ private final List<String> firewallRules;
+ private final Boolean audited;
+
+ private AutoValue_CreateFirewallPolicy(
+ @org.jclouds.javax.annotation.Nullable String tenantId,
+ @org.jclouds.javax.annotation.Nullable String name,
+ @org.jclouds.javax.annotation.Nullable String description,
+ @org.jclouds.javax.annotation.Nullable Boolean shared,
+ @org.jclouds.javax.annotation.Nullable List<String> firewallRules,
+ @org.jclouds.javax.annotation.Nullable Boolean audited) {
+ this.tenantId = tenantId;
+ this.name = name;
+ this.description = description;
+ this.shared = shared;
+ this.firewallRules = firewallRules;
+ this.audited = audited;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getShared() {
+ return shared;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public List<String> getFirewallRules() {
+ return firewallRules;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getAudited() {
+ return audited;
+ }
+
+ @Override
+ public String toString() {
+ return "CreateFirewallPolicy{"
+ + "tenantId=" + tenantId + ", "
+ + "name=" + name + ", "
+ + "description=" + description + ", "
+ + "shared=" + shared + ", "
+ + "firewallRules=" + firewallRules + ", "
+ + "audited=" + audited
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof CreateFirewallPolicy) {
+ CreateFirewallPolicy that = (CreateFirewallPolicy) o;
+ return ((this.tenantId == null) ? (that.getTenantId() == null) : this.tenantId.equals(that.getTenantId()))
+ && ((this.name == null) ? (that.getName() == null) : this.name.equals(that.getName()))
+ && ((this.description == null) ? (that.getDescription() == null) : this.description.equals(that.getDescription()))
+ && ((this.shared == null) ? (that.getShared() == null) : this.shared.equals(that.getShared()))
+ && ((this.firewallRules == null) ? (that.getFirewallRules() == null) : this.firewallRules.equals(that.getFirewallRules()))
+ && ((this.audited == null) ? (that.getAudited() == null) : this.audited.equals(that.getAudited()));
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h = 1;
+ h *= 1000003;
+ h ^= (tenantId == null) ? 0 : tenantId.hashCode();
+ h *= 1000003;
+ h ^= (name == null) ? 0 : name.hashCode();
+ h *= 1000003;
+ h ^= (description == null) ? 0 : description.hashCode();
+ h *= 1000003;
+ h ^= (shared == null) ? 0 : shared.hashCode();
+ h *= 1000003;
+ h ^= (firewallRules == null) ? 0 : firewallRules.hashCode();
+ h *= 1000003;
+ h ^= (audited == null) ? 0 : audited.hashCode();
+ return h;
+ }
+
+ @Override
+ public CreateFirewallPolicy.Builder toBuilder() {
+ return new Builder(this);
+ }
+
+ static final class Builder extends CreateFirewallPolicy.Builder {
+ private String tenantId;
+ private String name;
+ private String description;
+ private Boolean shared;
+ private List<String> firewallRules;
+ private Boolean audited;
+ Builder() {
+ }
+ Builder(CreateFirewallPolicy source) {
+ this.tenantId = source.getTenantId();
+ this.name = source.getName();
+ this.description = source.getDescription();
+ this.shared = source.getShared();
+ this.firewallRules = source.getFirewallRules();
+ this.audited = source.getAudited();
+ }
+ @Override
+ public CreateFirewallPolicy.Builder tenantId(String tenantId) {
+ this.tenantId = tenantId;
+ return this;
+ }
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+ @Override
+ public CreateFirewallPolicy.Builder name(String name) {
+ this.name = name;
+ return this;
+ }
+ @Override
+ public String getName() {
+ return name;
+ }
+ @Override
+ public CreateFirewallPolicy.Builder description(String description) {
+ this.description = description;
+ return this;
+ }
+ @Override
+ public String getDescription() {
+ return description;
+ }
+ @Override
+ public CreateFirewallPolicy.Builder shared(Boolean shared) {
+ this.shared = shared;
+ return this;
+ }
+ @Override
+ public Boolean getShared() {
+ return shared;
+ }
+ @Override
+ public CreateFirewallPolicy.Builder firewallRules(List<String> firewallRules) {
+ this.firewallRules = firewallRules;
+ return this;
+ }
+ @Override
+ public List<String> getFirewallRules() {
+ return firewallRules;
+ }
+ @Override
+ public CreateFirewallPolicy.Builder audited(Boolean audited) {
+ this.audited = audited;
+ return this;
+ }
+ @Override
+ public Boolean getAudited() {
+ return audited;
+ }
+ @Override
+ public CreateFirewallPolicy autoBuild() {
+ return new AutoValue_CreateFirewallPolicy(
+ this.tenantId,
+ this.name,
+ this.description,
+ this.shared,
+ this.firewallRules,
+ this.audited);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewallRule.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewallRule.java b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewallRule.java
new file mode 100644
index 0000000..e7699bc
--- /dev/null
+++ b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_CreateFirewallRule.java
@@ -0,0 +1,401 @@
+
+package org.jclouds.openstack.neutron.v2.domain;
+
+import javax.annotation.Generated;
+
+@Generated("com.google.auto.value.processor.AutoValueProcessor")
+final class AutoValue_CreateFirewallRule extends CreateFirewallRule {
+
+ private final String tenantId;
+ private final String name;
+ private final String description;
+ private final String firewallPolicyId;
+ private final Boolean shared;
+ private final String protocol;
+ private final IpVersion ipVersion;
+ private final String sourceIpAddress;
+ private final String destinationIpAddress;
+ private final String sourcePort;
+ private final String destinationPort;
+ private final Integer position;
+ private final String action;
+ private final Boolean enabled;
+
+ private AutoValue_CreateFirewallRule(
+ @org.jclouds.javax.annotation.Nullable String tenantId,
+ @org.jclouds.javax.annotation.Nullable String name,
+ @org.jclouds.javax.annotation.Nullable String description,
+ @org.jclouds.javax.annotation.Nullable String firewallPolicyId,
+ @org.jclouds.javax.annotation.Nullable Boolean shared,
+ @org.jclouds.javax.annotation.Nullable String protocol,
+ @org.jclouds.javax.annotation.Nullable IpVersion ipVersion,
+ @org.jclouds.javax.annotation.Nullable String sourceIpAddress,
+ @org.jclouds.javax.annotation.Nullable String destinationIpAddress,
+ @org.jclouds.javax.annotation.Nullable String sourcePort,
+ @org.jclouds.javax.annotation.Nullable String destinationPort,
+ @org.jclouds.javax.annotation.Nullable Integer position,
+ @org.jclouds.javax.annotation.Nullable String action,
+ @org.jclouds.javax.annotation.Nullable Boolean enabled) {
+ this.tenantId = tenantId;
+ this.name = name;
+ this.description = description;
+ this.firewallPolicyId = firewallPolicyId;
+ this.shared = shared;
+ this.protocol = protocol;
+ this.ipVersion = ipVersion;
+ this.sourceIpAddress = sourceIpAddress;
+ this.destinationIpAddress = destinationIpAddress;
+ this.sourcePort = sourcePort;
+ this.destinationPort = destinationPort;
+ this.position = position;
+ this.action = action;
+ this.enabled = enabled;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getFirewallPolicyId() {
+ return firewallPolicyId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getShared() {
+ return shared;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getProtocol() {
+ return protocol;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public IpVersion getIpVersion() {
+ return ipVersion;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getSourceIpAddress() {
+ return sourceIpAddress;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDestinationIpAddress() {
+ return destinationIpAddress;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getSourcePort() {
+ return sourcePort;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDestinationPort() {
+ return destinationPort;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Integer getPosition() {
+ return position;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getAction() {
+ return action;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getEnabled() {
+ return enabled;
+ }
+
+ @Override
+ public String toString() {
+ return "CreateFirewallRule{"
+ + "tenantId=" + tenantId + ", "
+ + "name=" + name + ", "
+ + "description=" + description + ", "
+ + "firewallPolicyId=" + firewallPolicyId + ", "
+ + "shared=" + shared + ", "
+ + "protocol=" + protocol + ", "
+ + "ipVersion=" + ipVersion + ", "
+ + "sourceIpAddress=" + sourceIpAddress + ", "
+ + "destinationIpAddress=" + destinationIpAddress + ", "
+ + "sourcePort=" + sourcePort + ", "
+ + "destinationPort=" + destinationPort + ", "
+ + "position=" + position + ", "
+ + "action=" + action + ", "
+ + "enabled=" + enabled
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof CreateFirewallRule) {
+ CreateFirewallRule that = (CreateFirewallRule) o;
+ return ((this.tenantId == null) ? (that.getTenantId() == null) : this.tenantId.equals(that.getTenantId()))
+ && ((this.name == null) ? (that.getName() == null) : this.name.equals(that.getName()))
+ && ((this.description == null) ? (that.getDescription() == null) : this.description.equals(that.getDescription()))
+ && ((this.firewallPolicyId == null) ? (that.getFirewallPolicyId() == null) : this.firewallPolicyId.equals(that.getFirewallPolicyId()))
+ && ((this.shared == null) ? (that.getShared() == null) : this.shared.equals(that.getShared()))
+ && ((this.protocol == null) ? (that.getProtocol() == null) : this.protocol.equals(that.getProtocol()))
+ && ((this.ipVersion == null) ? (that.getIpVersion() == null) : this.ipVersion.equals(that.getIpVersion()))
+ && ((this.sourceIpAddress == null) ? (that.getSourceIpAddress() == null) : this.sourceIpAddress.equals(that.getSourceIpAddress()))
+ && ((this.destinationIpAddress == null) ? (that.getDestinationIpAddress() == null) : this.destinationIpAddress.equals(that.getDestinationIpAddress()))
+ && ((this.sourcePort == null) ? (that.getSourcePort() == null) : this.sourcePort.equals(that.getSourcePort()))
+ && ((this.destinationPort == null) ? (that.getDestinationPort() == null) : this.destinationPort.equals(that.getDestinationPort()))
+ && ((this.position == null) ? (that.getPosition() == null) : this.position.equals(that.getPosition()))
+ && ((this.action == null) ? (that.getAction() == null) : this.action.equals(that.getAction()))
+ && ((this.enabled == null) ? (that.getEnabled() == null) : this.enabled.equals(that.getEnabled()));
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h = 1;
+ h *= 1000003;
+ h ^= (tenantId == null) ? 0 : tenantId.hashCode();
+ h *= 1000003;
+ h ^= (name == null) ? 0 : name.hashCode();
+ h *= 1000003;
+ h ^= (description == null) ? 0 : description.hashCode();
+ h *= 1000003;
+ h ^= (firewallPolicyId == null) ? 0 : firewallPolicyId.hashCode();
+ h *= 1000003;
+ h ^= (shared == null) ? 0 : shared.hashCode();
+ h *= 1000003;
+ h ^= (protocol == null) ? 0 : protocol.hashCode();
+ h *= 1000003;
+ h ^= (ipVersion == null) ? 0 : ipVersion.hashCode();
+ h *= 1000003;
+ h ^= (sourceIpAddress == null) ? 0 : sourceIpAddress.hashCode();
+ h *= 1000003;
+ h ^= (destinationIpAddress == null) ? 0 : destinationIpAddress.hashCode();
+ h *= 1000003;
+ h ^= (sourcePort == null) ? 0 : sourcePort.hashCode();
+ h *= 1000003;
+ h ^= (destinationPort == null) ? 0 : destinationPort.hashCode();
+ h *= 1000003;
+ h ^= (position == null) ? 0 : position.hashCode();
+ h *= 1000003;
+ h ^= (action == null) ? 0 : action.hashCode();
+ h *= 1000003;
+ h ^= (enabled == null) ? 0 : enabled.hashCode();
+ return h;
+ }
+
+ @Override
+ public CreateFirewallRule.Builder toBuilder() {
+ return new Builder(this);
+ }
+
+ static final class Builder extends CreateFirewallRule.Builder {
+ private String tenantId;
+ private String name;
+ private String description;
+ private String firewallPolicyId;
+ private Boolean shared;
+ private String protocol;
+ private IpVersion ipVersion;
+ private String sourceIpAddress;
+ private String destinationIpAddress;
+ private String sourcePort;
+ private String destinationPort;
+ private Integer position;
+ private String action;
+ private Boolean enabled;
+ Builder() {
+ }
+ Builder(CreateFirewallRule source) {
+ this.tenantId = source.getTenantId();
+ this.name = source.getName();
+ this.description = source.getDescription();
+ this.firewallPolicyId = source.getFirewallPolicyId();
+ this.shared = source.getShared();
+ this.protocol = source.getProtocol();
+ this.ipVersion = source.getIpVersion();
+ this.sourceIpAddress = source.getSourceIpAddress();
+ this.destinationIpAddress = source.getDestinationIpAddress();
+ this.sourcePort = source.getSourcePort();
+ this.destinationPort = source.getDestinationPort();
+ this.position = source.getPosition();
+ this.action = source.getAction();
+ this.enabled = source.getEnabled();
+ }
+ @Override
+ public CreateFirewallRule.Builder tenantId(String tenantId) {
+ this.tenantId = tenantId;
+ return this;
+ }
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+ @Override
+ public CreateFirewallRule.Builder name(String name) {
+ this.name = name;
+ return this;
+ }
+ @Override
+ public String getName() {
+ return name;
+ }
+ @Override
+ public CreateFirewallRule.Builder description(String description) {
+ this.description = description;
+ return this;
+ }
+ @Override
+ public String getDescription() {
+ return description;
+ }
+ @Override
+ public CreateFirewallRule.Builder firewallPolicyId(String firewallPolicyId) {
+ this.firewallPolicyId = firewallPolicyId;
+ return this;
+ }
+ @Override
+ public String getFirewallPolicyId() {
+ return firewallPolicyId;
+ }
+ @Override
+ public CreateFirewallRule.Builder shared(Boolean shared) {
+ this.shared = shared;
+ return this;
+ }
+ @Override
+ public Boolean getShared() {
+ return shared;
+ }
+ @Override
+ public CreateFirewallRule.Builder protocol(String protocol) {
+ this.protocol = protocol;
+ return this;
+ }
+ @Override
+ public String getProtocol() {
+ return protocol;
+ }
+ @Override
+ public CreateFirewallRule.Builder ipVersion(IpVersion ipVersion) {
+ this.ipVersion = ipVersion;
+ return this;
+ }
+ @Override
+ public IpVersion getIpVersion() {
+ return ipVersion;
+ }
+ @Override
+ public CreateFirewallRule.Builder sourceIpAddress(String sourceIpAddress) {
+ this.sourceIpAddress = sourceIpAddress;
+ return this;
+ }
+ @Override
+ public String getSourceIpAddress() {
+ return sourceIpAddress;
+ }
+ @Override
+ public CreateFirewallRule.Builder destinationIpAddress(String destinationIpAddress) {
+ this.destinationIpAddress = destinationIpAddress;
+ return this;
+ }
+ @Override
+ public String getDestinationIpAddress() {
+ return destinationIpAddress;
+ }
+ @Override
+ public CreateFirewallRule.Builder sourcePort(String sourcePort) {
+ this.sourcePort = sourcePort;
+ return this;
+ }
+ @Override
+ public String getSourcePort() {
+ return sourcePort;
+ }
+ @Override
+ public CreateFirewallRule.Builder destinationPort(String destinationPort) {
+ this.destinationPort = destinationPort;
+ return this;
+ }
+ @Override
+ public String getDestinationPort() {
+ return destinationPort;
+ }
+ @Override
+ public CreateFirewallRule.Builder position(Integer position) {
+ this.position = position;
+ return this;
+ }
+ @Override
+ public Integer getPosition() {
+ return position;
+ }
+ @Override
+ public CreateFirewallRule.Builder action(String action) {
+ this.action = action;
+ return this;
+ }
+ @Override
+ public String getAction() {
+ return action;
+ }
+ @Override
+ public CreateFirewallRule.Builder enabled(Boolean enabled) {
+ this.enabled = enabled;
+ return this;
+ }
+ @Override
+ public Boolean getEnabled() {
+ return enabled;
+ }
+ @Override
+ public CreateFirewallRule build() {
+ return new AutoValue_CreateFirewallRule(
+ this.tenantId,
+ this.name,
+ this.description,
+ this.firewallPolicyId,
+ this.shared,
+ this.protocol,
+ this.ipVersion,
+ this.sourceIpAddress,
+ this.destinationIpAddress,
+ this.sourcePort,
+ this.destinationPort,
+ this.position,
+ this.action,
+ this.enabled);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_Firewall.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_Firewall.java b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_Firewall.java
new file mode 100644
index 0000000..3b17ccf
--- /dev/null
+++ b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_Firewall.java
@@ -0,0 +1,133 @@
+
+package org.jclouds.openstack.neutron.v2.domain;
+
+import javax.annotation.Generated;
+
+@Generated("com.google.auto.value.processor.AutoValueProcessor")
+final class AutoValue_Firewall extends Firewall {
+
+ private final String getId;
+ private final String getTenantId;
+ private final String getName;
+ private final String getDescription;
+ private final Boolean isAdminStateUp;
+ private final String getStatus;
+ private final String getFirewallPolicyId;
+
+ AutoValue_Firewall(
+ String getId,
+ String getTenantId,
+ @org.jclouds.javax.annotation.Nullable String getName,
+ @org.jclouds.javax.annotation.Nullable String getDescription,
+ @org.jclouds.javax.annotation.Nullable Boolean isAdminStateUp,
+ String getStatus,
+ @org.jclouds.javax.annotation.Nullable String getFirewallPolicyId) {
+ if (getId == null) {
+ throw new NullPointerException("Null getId");
+ }
+ this.getId = getId;
+ if (getTenantId == null) {
+ throw new NullPointerException("Null getTenantId");
+ }
+ this.getTenantId = getTenantId;
+ this.getName = getName;
+ this.getDescription = getDescription;
+ this.isAdminStateUp = isAdminStateUp;
+ if (getStatus == null) {
+ throw new NullPointerException("Null getStatus");
+ }
+ this.getStatus = getStatus;
+ this.getFirewallPolicyId = getFirewallPolicyId;
+ }
+
+ @Override
+ public String getId() {
+ return getId;
+ }
+
+ @Override
+ public String getTenantId() {
+ return getTenantId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getName() {
+ return getName;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDescription() {
+ return getDescription;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean isAdminStateUp() {
+ return isAdminStateUp;
+ }
+
+ @Override
+ public String getStatus() {
+ return getStatus;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getFirewallPolicyId() {
+ return getFirewallPolicyId;
+ }
+
+ @Override
+ public String toString() {
+ return "Firewall{"
+ + "getId=" + getId + ", "
+ + "getTenantId=" + getTenantId + ", "
+ + "getName=" + getName + ", "
+ + "getDescription=" + getDescription + ", "
+ + "isAdminStateUp=" + isAdminStateUp + ", "
+ + "getStatus=" + getStatus + ", "
+ + "getFirewallPolicyId=" + getFirewallPolicyId
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof Firewall) {
+ Firewall that = (Firewall) o;
+ return (this.getId.equals(that.getId()))
+ && (this.getTenantId.equals(that.getTenantId()))
+ && ((this.getName == null) ? (that.getName() == null) : this.getName.equals(that.getName()))
+ && ((this.getDescription == null) ? (that.getDescription() == null) : this.getDescription.equals(that.getDescription()))
+ && ((this.isAdminStateUp == null) ? (that.isAdminStateUp() == null) : this.isAdminStateUp.equals(that.isAdminStateUp()))
+ && (this.getStatus.equals(that.getStatus()))
+ && ((this.getFirewallPolicyId == null) ? (that.getFirewallPolicyId() == null) : this.getFirewallPolicyId.equals(that.getFirewallPolicyId()));
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h = 1;
+ h *= 1000003;
+ h ^= getId.hashCode();
+ h *= 1000003;
+ h ^= getTenantId.hashCode();
+ h *= 1000003;
+ h ^= (getName == null) ? 0 : getName.hashCode();
+ h *= 1000003;
+ h ^= (getDescription == null) ? 0 : getDescription.hashCode();
+ h *= 1000003;
+ h ^= (isAdminStateUp == null) ? 0 : isAdminStateUp.hashCode();
+ h *= 1000003;
+ h ^= getStatus.hashCode();
+ h *= 1000003;
+ h ^= (getFirewallPolicyId == null) ? 0 : getFirewallPolicyId.hashCode();
+ return h;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_FirewallPolicy.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_FirewallPolicy.java b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_FirewallPolicy.java
new file mode 100644
index 0000000..6b3305d
--- /dev/null
+++ b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_FirewallPolicy.java
@@ -0,0 +1,132 @@
+
+package org.jclouds.openstack.neutron.v2.domain;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+@Generated("com.google.auto.value.processor.AutoValueProcessor")
+final class AutoValue_FirewallPolicy extends FirewallPolicy {
+
+ private final String id;
+ private final String tenantId;
+ private final String name;
+ private final String description;
+ private final boolean shared;
+ private final List<String> firewallRules;
+ private final boolean audited;
+
+ AutoValue_FirewallPolicy(
+ String id,
+ String tenantId,
+ String name,
+ @org.jclouds.javax.annotation.Nullable String description,
+ boolean shared,
+ @org.jclouds.javax.annotation.Nullable List<String> firewallRules,
+ boolean audited) {
+ if (id == null) {
+ throw new NullPointerException("Null id");
+ }
+ this.id = id;
+ if (tenantId == null) {
+ throw new NullPointerException("Null tenantId");
+ }
+ this.tenantId = tenantId;
+ if (name == null) {
+ throw new NullPointerException("Null name");
+ }
+ this.name = name;
+ this.description = description;
+ this.shared = shared;
+ this.firewallRules = firewallRules;
+ this.audited = audited;
+ }
+
+ @Override
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @Override
+ public boolean isShared() {
+ return shared;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public List<String> getFirewallRules() {
+ return firewallRules;
+ }
+
+ @Override
+ public boolean isAudited() {
+ return audited;
+ }
+
+ @Override
+ public String toString() {
+ return "FirewallPolicy{"
+ + "id=" + id + ", "
+ + "tenantId=" + tenantId + ", "
+ + "name=" + name + ", "
+ + "description=" + description + ", "
+ + "shared=" + shared + ", "
+ + "firewallRules=" + firewallRules + ", "
+ + "audited=" + audited
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof FirewallPolicy) {
+ FirewallPolicy that = (FirewallPolicy) o;
+ return (this.id.equals(that.getId()))
+ && (this.tenantId.equals(that.getTenantId()))
+ && (this.name.equals(that.getName()))
+ && ((this.description == null) ? (that.getDescription() == null) : this.description.equals(that.getDescription()))
+ && (this.shared == that.isShared())
+ && ((this.firewallRules == null) ? (that.getFirewallRules() == null) : this.firewallRules.equals(that.getFirewallRules()))
+ && (this.audited == that.isAudited());
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h = 1;
+ h *= 1000003;
+ h ^= id.hashCode();
+ h *= 1000003;
+ h ^= tenantId.hashCode();
+ h *= 1000003;
+ h ^= name.hashCode();
+ h *= 1000003;
+ h ^= (description == null) ? 0 : description.hashCode();
+ h *= 1000003;
+ h ^= shared ? 1231 : 1237;
+ h *= 1000003;
+ h ^= (firewallRules == null) ? 0 : firewallRules.hashCode();
+ h *= 1000003;
+ h ^= audited ? 1231 : 1237;
+ return h;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_FirewallRule.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_FirewallRule.java b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_FirewallRule.java
new file mode 100644
index 0000000..0165ca8
--- /dev/null
+++ b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_FirewallRule.java
@@ -0,0 +1,235 @@
+
+package org.jclouds.openstack.neutron.v2.domain;
+
+import javax.annotation.Generated;
+
+@Generated("com.google.auto.value.processor.AutoValueProcessor")
+final class AutoValue_FirewallRule extends FirewallRule {
+
+ private final String id;
+ private final String tenantId;
+ private final String name;
+ private final String description;
+ private final String firewallPolicyId;
+ private final boolean shared;
+ private final String protocol;
+ private final IpVersion ipVersion;
+ private final String sourceIpAddress;
+ private final String destinationIpAddress;
+ private final String sourcePort;
+ private final String destinationPort;
+ private final Integer position;
+ private final String action;
+ private final boolean enabled;
+
+ AutoValue_FirewallRule(
+ String id,
+ String tenantId,
+ String name,
+ @org.jclouds.javax.annotation.Nullable String description,
+ @org.jclouds.javax.annotation.Nullable String firewallPolicyId,
+ boolean shared,
+ @org.jclouds.javax.annotation.Nullable String protocol,
+ @org.jclouds.javax.annotation.Nullable IpVersion ipVersion,
+ @org.jclouds.javax.annotation.Nullable String sourceIpAddress,
+ @org.jclouds.javax.annotation.Nullable String destinationIpAddress,
+ @org.jclouds.javax.annotation.Nullable String sourcePort,
+ @org.jclouds.javax.annotation.Nullable String destinationPort,
+ @org.jclouds.javax.annotation.Nullable Integer position,
+ @org.jclouds.javax.annotation.Nullable String action,
+ boolean enabled) {
+ if (id == null) {
+ throw new NullPointerException("Null id");
+ }
+ this.id = id;
+ if (tenantId == null) {
+ throw new NullPointerException("Null tenantId");
+ }
+ this.tenantId = tenantId;
+ if (name == null) {
+ throw new NullPointerException("Null name");
+ }
+ this.name = name;
+ this.description = description;
+ this.firewallPolicyId = firewallPolicyId;
+ this.shared = shared;
+ this.protocol = protocol;
+ this.ipVersion = ipVersion;
+ this.sourceIpAddress = sourceIpAddress;
+ this.destinationIpAddress = destinationIpAddress;
+ this.sourcePort = sourcePort;
+ this.destinationPort = destinationPort;
+ this.position = position;
+ this.action = action;
+ this.enabled = enabled;
+ }
+
+ @Override
+ public String getId() {
+ return id;
+ }
+
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getFirewallPolicyId() {
+ return firewallPolicyId;
+ }
+
+ @Override
+ public boolean isShared() {
+ return shared;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getProtocol() {
+ return protocol;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public IpVersion getIpVersion() {
+ return ipVersion;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getSourceIpAddress() {
+ return sourceIpAddress;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDestinationIpAddress() {
+ return destinationIpAddress;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getSourcePort() {
+ return sourcePort;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDestinationPort() {
+ return destinationPort;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Integer getPosition() {
+ return position;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getAction() {
+ return action;
+ }
+
+ @Override
+ public boolean isEnabled() {
+ return enabled;
+ }
+
+ @Override
+ public String toString() {
+ return "FirewallRule{"
+ + "id=" + id + ", "
+ + "tenantId=" + tenantId + ", "
+ + "name=" + name + ", "
+ + "description=" + description + ", "
+ + "firewallPolicyId=" + firewallPolicyId + ", "
+ + "shared=" + shared + ", "
+ + "protocol=" + protocol + ", "
+ + "ipVersion=" + ipVersion + ", "
+ + "sourceIpAddress=" + sourceIpAddress + ", "
+ + "destinationIpAddress=" + destinationIpAddress + ", "
+ + "sourcePort=" + sourcePort + ", "
+ + "destinationPort=" + destinationPort + ", "
+ + "position=" + position + ", "
+ + "action=" + action + ", "
+ + "enabled=" + enabled
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof FirewallRule) {
+ FirewallRule that = (FirewallRule) o;
+ return (this.id.equals(that.getId()))
+ && (this.tenantId.equals(that.getTenantId()))
+ && (this.name.equals(that.getName()))
+ && ((this.description == null) ? (that.getDescription() == null) : this.description.equals(that.getDescription()))
+ && ((this.firewallPolicyId == null) ? (that.getFirewallPolicyId() == null) : this.firewallPolicyId.equals(that.getFirewallPolicyId()))
+ && (this.shared == that.isShared())
+ && ((this.protocol == null) ? (that.getProtocol() == null) : this.protocol.equals(that.getProtocol()))
+ && ((this.ipVersion == null) ? (that.getIpVersion() == null) : this.ipVersion.equals(that.getIpVersion()))
+ && ((this.sourceIpAddress == null) ? (that.getSourceIpAddress() == null) : this.sourceIpAddress.equals(that.getSourceIpAddress()))
+ && ((this.destinationIpAddress == null) ? (that.getDestinationIpAddress() == null) : this.destinationIpAddress.equals(that.getDestinationIpAddress()))
+ && ((this.sourcePort == null) ? (that.getSourcePort() == null) : this.sourcePort.equals(that.getSourcePort()))
+ && ((this.destinationPort == null) ? (that.getDestinationPort() == null) : this.destinationPort.equals(that.getDestinationPort()))
+ && ((this.position == null) ? (that.getPosition() == null) : this.position.equals(that.getPosition()))
+ && ((this.action == null) ? (that.getAction() == null) : this.action.equals(that.getAction()))
+ && (this.enabled == that.isEnabled());
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h = 1;
+ h *= 1000003;
+ h ^= id.hashCode();
+ h *= 1000003;
+ h ^= tenantId.hashCode();
+ h *= 1000003;
+ h ^= name.hashCode();
+ h *= 1000003;
+ h ^= (description == null) ? 0 : description.hashCode();
+ h *= 1000003;
+ h ^= (firewallPolicyId == null) ? 0 : firewallPolicyId.hashCode();
+ h *= 1000003;
+ h ^= shared ? 1231 : 1237;
+ h *= 1000003;
+ h ^= (protocol == null) ? 0 : protocol.hashCode();
+ h *= 1000003;
+ h ^= (ipVersion == null) ? 0 : ipVersion.hashCode();
+ h *= 1000003;
+ h ^= (sourceIpAddress == null) ? 0 : sourceIpAddress.hashCode();
+ h *= 1000003;
+ h ^= (destinationIpAddress == null) ? 0 : destinationIpAddress.hashCode();
+ h *= 1000003;
+ h ^= (sourcePort == null) ? 0 : sourcePort.hashCode();
+ h *= 1000003;
+ h ^= (destinationPort == null) ? 0 : destinationPort.hashCode();
+ h *= 1000003;
+ h ^= (position == null) ? 0 : position.hashCode();
+ h *= 1000003;
+ h ^= (action == null) ? 0 : action.hashCode();
+ h *= 1000003;
+ h ^= enabled ? 1231 : 1237;
+ return h;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewall.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewall.java b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewall.java
new file mode 100644
index 0000000..1b58e70
--- /dev/null
+++ b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewall.java
@@ -0,0 +1,176 @@
+
+package org.jclouds.openstack.neutron.v2.domain;
+
+import javax.annotation.Generated;
+
+@Generated("com.google.auto.value.processor.AutoValueProcessor")
+final class AutoValue_UpdateFirewall extends UpdateFirewall {
+
+ private final String tenantId;
+ private final String name;
+ private final String description;
+ private final Boolean adminStateUp;
+ private final String firewallPolicyId;
+
+ private AutoValue_UpdateFirewall(
+ @org.jclouds.javax.annotation.Nullable String tenantId,
+ @org.jclouds.javax.annotation.Nullable String name,
+ @org.jclouds.javax.annotation.Nullable String description,
+ @org.jclouds.javax.annotation.Nullable Boolean adminStateUp,
+ @org.jclouds.javax.annotation.Nullable String firewallPolicyId) {
+ this.tenantId = tenantId;
+ this.name = name;
+ this.description = description;
+ this.adminStateUp = adminStateUp;
+ this.firewallPolicyId = firewallPolicyId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getAdminStateUp() {
+ return adminStateUp;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getFirewallPolicyId() {
+ return firewallPolicyId;
+ }
+
+ @Override
+ public String toString() {
+ return "UpdateFirewall{"
+ + "tenantId=" + tenantId + ", "
+ + "name=" + name + ", "
+ + "description=" + description + ", "
+ + "adminStateUp=" + adminStateUp + ", "
+ + "firewallPolicyId=" + firewallPolicyId
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof UpdateFirewall) {
+ UpdateFirewall that = (UpdateFirewall) o;
+ return ((this.tenantId == null) ? (that.getTenantId() == null) : this.tenantId.equals(that.getTenantId()))
+ && ((this.name == null) ? (that.getName() == null) : this.name.equals(that.getName()))
+ && ((this.description == null) ? (that.getDescription() == null) : this.description.equals(that.getDescription()))
+ && ((this.adminStateUp == null) ? (that.getAdminStateUp() == null) : this.adminStateUp.equals(that.getAdminStateUp()))
+ && ((this.firewallPolicyId == null) ? (that.getFirewallPolicyId() == null) : this.firewallPolicyId.equals(that.getFirewallPolicyId()));
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h = 1;
+ h *= 1000003;
+ h ^= (tenantId == null) ? 0 : tenantId.hashCode();
+ h *= 1000003;
+ h ^= (name == null) ? 0 : name.hashCode();
+ h *= 1000003;
+ h ^= (description == null) ? 0 : description.hashCode();
+ h *= 1000003;
+ h ^= (adminStateUp == null) ? 0 : adminStateUp.hashCode();
+ h *= 1000003;
+ h ^= (firewallPolicyId == null) ? 0 : firewallPolicyId.hashCode();
+ return h;
+ }
+
+ @Override
+ public UpdateFirewall.Builder toBuilder() {
+ return new Builder(this);
+ }
+
+ static final class Builder extends UpdateFirewall.Builder {
+ private String tenantId;
+ private String name;
+ private String description;
+ private Boolean adminStateUp;
+ private String firewallPolicyId;
+ Builder() {
+ }
+ Builder(UpdateFirewall source) {
+ this.tenantId = source.getTenantId();
+ this.name = source.getName();
+ this.description = source.getDescription();
+ this.adminStateUp = source.getAdminStateUp();
+ this.firewallPolicyId = source.getFirewallPolicyId();
+ }
+ @Override
+ public UpdateFirewall.Builder tenantId(String tenantId) {
+ this.tenantId = tenantId;
+ return this;
+ }
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+ @Override
+ public UpdateFirewall.Builder name(String name) {
+ this.name = name;
+ return this;
+ }
+ @Override
+ public String getName() {
+ return name;
+ }
+ @Override
+ public UpdateFirewall.Builder description(String description) {
+ this.description = description;
+ return this;
+ }
+ @Override
+ public String getDescription() {
+ return description;
+ }
+ @Override
+ public UpdateFirewall.Builder adminStateUp(Boolean adminStateUp) {
+ this.adminStateUp = adminStateUp;
+ return this;
+ }
+ @Override
+ public Boolean getAdminStateUp() {
+ return adminStateUp;
+ }
+ @Override
+ public UpdateFirewall.Builder firewallPolicyId(String firewallPolicyId) {
+ this.firewallPolicyId = firewallPolicyId;
+ return this;
+ }
+ @Override
+ public String getFirewallPolicyId() {
+ return firewallPolicyId;
+ }
+ @Override
+ public UpdateFirewall build() {
+ return new AutoValue_UpdateFirewall(
+ this.tenantId,
+ this.name,
+ this.description,
+ this.adminStateUp,
+ this.firewallPolicyId);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewallPolicy.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewallPolicy.java b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewallPolicy.java
new file mode 100644
index 0000000..0e1c4b0
--- /dev/null
+++ b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewallPolicy.java
@@ -0,0 +1,202 @@
+
+package org.jclouds.openstack.neutron.v2.domain;
+
+import java.util.List;
+import javax.annotation.Generated;
+
+@Generated("com.google.auto.value.processor.AutoValueProcessor")
+final class AutoValue_UpdateFirewallPolicy extends UpdateFirewallPolicy {
+
+ private final String tenantId;
+ private final String name;
+ private final String description;
+ private final Boolean shared;
+ private final List<String> firewallRules;
+ private final Boolean audited;
+
+ private AutoValue_UpdateFirewallPolicy(
+ @org.jclouds.javax.annotation.Nullable String tenantId,
+ @org.jclouds.javax.annotation.Nullable String name,
+ @org.jclouds.javax.annotation.Nullable String description,
+ @org.jclouds.javax.annotation.Nullable Boolean shared,
+ @org.jclouds.javax.annotation.Nullable List<String> firewallRules,
+ @org.jclouds.javax.annotation.Nullable Boolean audited) {
+ this.tenantId = tenantId;
+ this.name = name;
+ this.description = description;
+ this.shared = shared;
+ this.firewallRules = firewallRules;
+ this.audited = audited;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getShared() {
+ return shared;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public List<String> getFirewallRules() {
+ return firewallRules;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getAudited() {
+ return audited;
+ }
+
+ @Override
+ public String toString() {
+ return "UpdateFirewallPolicy{"
+ + "tenantId=" + tenantId + ", "
+ + "name=" + name + ", "
+ + "description=" + description + ", "
+ + "shared=" + shared + ", "
+ + "firewallRules=" + firewallRules + ", "
+ + "audited=" + audited
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof UpdateFirewallPolicy) {
+ UpdateFirewallPolicy that = (UpdateFirewallPolicy) o;
+ return ((this.tenantId == null) ? (that.getTenantId() == null) : this.tenantId.equals(that.getTenantId()))
+ && ((this.name == null) ? (that.getName() == null) : this.name.equals(that.getName()))
+ && ((this.description == null) ? (that.getDescription() == null) : this.description.equals(that.getDescription()))
+ && ((this.shared == null) ? (that.getShared() == null) : this.shared.equals(that.getShared()))
+ && ((this.firewallRules == null) ? (that.getFirewallRules() == null) : this.firewallRules.equals(that.getFirewallRules()))
+ && ((this.audited == null) ? (that.getAudited() == null) : this.audited.equals(that.getAudited()));
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h = 1;
+ h *= 1000003;
+ h ^= (tenantId == null) ? 0 : tenantId.hashCode();
+ h *= 1000003;
+ h ^= (name == null) ? 0 : name.hashCode();
+ h *= 1000003;
+ h ^= (description == null) ? 0 : description.hashCode();
+ h *= 1000003;
+ h ^= (shared == null) ? 0 : shared.hashCode();
+ h *= 1000003;
+ h ^= (firewallRules == null) ? 0 : firewallRules.hashCode();
+ h *= 1000003;
+ h ^= (audited == null) ? 0 : audited.hashCode();
+ return h;
+ }
+
+ @Override
+ public UpdateFirewallPolicy.Builder toBuilder() {
+ return new Builder(this);
+ }
+
+ static final class Builder extends UpdateFirewallPolicy.Builder {
+ private String tenantId;
+ private String name;
+ private String description;
+ private Boolean shared;
+ private List<String> firewallRules;
+ private Boolean audited;
+ Builder() {
+ }
+ Builder(UpdateFirewallPolicy source) {
+ this.tenantId = source.getTenantId();
+ this.name = source.getName();
+ this.description = source.getDescription();
+ this.shared = source.getShared();
+ this.firewallRules = source.getFirewallRules();
+ this.audited = source.getAudited();
+ }
+ @Override
+ public UpdateFirewallPolicy.Builder tenantId(String tenantId) {
+ this.tenantId = tenantId;
+ return this;
+ }
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+ @Override
+ public UpdateFirewallPolicy.Builder name(String name) {
+ this.name = name;
+ return this;
+ }
+ @Override
+ public String getName() {
+ return name;
+ }
+ @Override
+ public UpdateFirewallPolicy.Builder description(String description) {
+ this.description = description;
+ return this;
+ }
+ @Override
+ public String getDescription() {
+ return description;
+ }
+ @Override
+ public UpdateFirewallPolicy.Builder shared(Boolean shared) {
+ this.shared = shared;
+ return this;
+ }
+ @Override
+ public Boolean getShared() {
+ return shared;
+ }
+ @Override
+ public UpdateFirewallPolicy.Builder firewallRules(List<String> firewallRules) {
+ this.firewallRules = firewallRules;
+ return this;
+ }
+ @Override
+ public List<String> getFirewallRules() {
+ return firewallRules;
+ }
+ @Override
+ public UpdateFirewallPolicy.Builder audited(Boolean audited) {
+ this.audited = audited;
+ return this;
+ }
+ @Override
+ public Boolean getAudited() {
+ return audited;
+ }
+ @Override
+ public UpdateFirewallPolicy autoBuild() {
+ return new AutoValue_UpdateFirewallPolicy(
+ this.tenantId,
+ this.name,
+ this.description,
+ this.shared,
+ this.firewallRules,
+ this.audited);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewallRule.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewallRule.java b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewallRule.java
new file mode 100644
index 0000000..9136b5d
--- /dev/null
+++ b/openstack-neutron/.apt_generated/org/jclouds/openstack/neutron/v2/domain/AutoValue_UpdateFirewallRule.java
@@ -0,0 +1,401 @@
+
+package org.jclouds.openstack.neutron.v2.domain;
+
+import javax.annotation.Generated;
+
+@Generated("com.google.auto.value.processor.AutoValueProcessor")
+final class AutoValue_UpdateFirewallRule extends UpdateFirewallRule {
+
+ private final String tenantId;
+ private final String name;
+ private final String description;
+ private final String firewallPolicyId;
+ private final Boolean shared;
+ private final String protocol;
+ private final IpVersion ipVersion;
+ private final String sourceIpAddress;
+ private final String destinationIpAddress;
+ private final String sourcePort;
+ private final String destinationPort;
+ private final Integer position;
+ private final String action;
+ private final Boolean enabled;
+
+ private AutoValue_UpdateFirewallRule(
+ @org.jclouds.javax.annotation.Nullable String tenantId,
+ @org.jclouds.javax.annotation.Nullable String name,
+ @org.jclouds.javax.annotation.Nullable String description,
+ @org.jclouds.javax.annotation.Nullable String firewallPolicyId,
+ @org.jclouds.javax.annotation.Nullable Boolean shared,
+ @org.jclouds.javax.annotation.Nullable String protocol,
+ @org.jclouds.javax.annotation.Nullable IpVersion ipVersion,
+ @org.jclouds.javax.annotation.Nullable String sourceIpAddress,
+ @org.jclouds.javax.annotation.Nullable String destinationIpAddress,
+ @org.jclouds.javax.annotation.Nullable String sourcePort,
+ @org.jclouds.javax.annotation.Nullable String destinationPort,
+ @org.jclouds.javax.annotation.Nullable Integer position,
+ @org.jclouds.javax.annotation.Nullable String action,
+ @org.jclouds.javax.annotation.Nullable Boolean enabled) {
+ this.tenantId = tenantId;
+ this.name = name;
+ this.description = description;
+ this.firewallPolicyId = firewallPolicyId;
+ this.shared = shared;
+ this.protocol = protocol;
+ this.ipVersion = ipVersion;
+ this.sourceIpAddress = sourceIpAddress;
+ this.destinationIpAddress = destinationIpAddress;
+ this.sourcePort = sourcePort;
+ this.destinationPort = destinationPort;
+ this.position = position;
+ this.action = action;
+ this.enabled = enabled;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getName() {
+ return name;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDescription() {
+ return description;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getFirewallPolicyId() {
+ return firewallPolicyId;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getShared() {
+ return shared;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getProtocol() {
+ return protocol;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public IpVersion getIpVersion() {
+ return ipVersion;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getSourceIpAddress() {
+ return sourceIpAddress;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDestinationIpAddress() {
+ return destinationIpAddress;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getSourcePort() {
+ return sourcePort;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getDestinationPort() {
+ return destinationPort;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Integer getPosition() {
+ return position;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public String getAction() {
+ return action;
+ }
+
+ @org.jclouds.javax.annotation.Nullable
+ @Override
+ public Boolean getEnabled() {
+ return enabled;
+ }
+
+ @Override
+ public String toString() {
+ return "UpdateFirewallRule{"
+ + "tenantId=" + tenantId + ", "
+ + "name=" + name + ", "
+ + "description=" + description + ", "
+ + "firewallPolicyId=" + firewallPolicyId + ", "
+ + "shared=" + shared + ", "
+ + "protocol=" + protocol + ", "
+ + "ipVersion=" + ipVersion + ", "
+ + "sourceIpAddress=" + sourceIpAddress + ", "
+ + "destinationIpAddress=" + destinationIpAddress + ", "
+ + "sourcePort=" + sourcePort + ", "
+ + "destinationPort=" + destinationPort + ", "
+ + "position=" + position + ", "
+ + "action=" + action + ", "
+ + "enabled=" + enabled
+ + "}";
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (o instanceof UpdateFirewallRule) {
+ UpdateFirewallRule that = (UpdateFirewallRule) o;
+ return ((this.tenantId == null) ? (that.getTenantId() == null) : this.tenantId.equals(that.getTenantId()))
+ && ((this.name == null) ? (that.getName() == null) : this.name.equals(that.getName()))
+ && ((this.description == null) ? (that.getDescription() == null) : this.description.equals(that.getDescription()))
+ && ((this.firewallPolicyId == null) ? (that.getFirewallPolicyId() == null) : this.firewallPolicyId.equals(that.getFirewallPolicyId()))
+ && ((this.shared == null) ? (that.getShared() == null) : this.shared.equals(that.getShared()))
+ && ((this.protocol == null) ? (that.getProtocol() == null) : this.protocol.equals(that.getProtocol()))
+ && ((this.ipVersion == null) ? (that.getIpVersion() == null) : this.ipVersion.equals(that.getIpVersion()))
+ && ((this.sourceIpAddress == null) ? (that.getSourceIpAddress() == null) : this.sourceIpAddress.equals(that.getSourceIpAddress()))
+ && ((this.destinationIpAddress == null) ? (that.getDestinationIpAddress() == null) : this.destinationIpAddress.equals(that.getDestinationIpAddress()))
+ && ((this.sourcePort == null) ? (that.getSourcePort() == null) : this.sourcePort.equals(that.getSourcePort()))
+ && ((this.destinationPort == null) ? (that.getDestinationPort() == null) : this.destinationPort.equals(that.getDestinationPort()))
+ && ((this.position == null) ? (that.getPosition() == null) : this.position.equals(that.getPosition()))
+ && ((this.action == null) ? (that.getAction() == null) : this.action.equals(that.getAction()))
+ && ((this.enabled == null) ? (that.getEnabled() == null) : this.enabled.equals(that.getEnabled()));
+ }
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ int h = 1;
+ h *= 1000003;
+ h ^= (tenantId == null) ? 0 : tenantId.hashCode();
+ h *= 1000003;
+ h ^= (name == null) ? 0 : name.hashCode();
+ h *= 1000003;
+ h ^= (description == null) ? 0 : description.hashCode();
+ h *= 1000003;
+ h ^= (firewallPolicyId == null) ? 0 : firewallPolicyId.hashCode();
+ h *= 1000003;
+ h ^= (shared == null) ? 0 : shared.hashCode();
+ h *= 1000003;
+ h ^= (protocol == null) ? 0 : protocol.hashCode();
+ h *= 1000003;
+ h ^= (ipVersion == null) ? 0 : ipVersion.hashCode();
+ h *= 1000003;
+ h ^= (sourceIpAddress == null) ? 0 : sourceIpAddress.hashCode();
+ h *= 1000003;
+ h ^= (destinationIpAddress == null) ? 0 : destinationIpAddress.hashCode();
+ h *= 1000003;
+ h ^= (sourcePort == null) ? 0 : sourcePort.hashCode();
+ h *= 1000003;
+ h ^= (destinationPort == null) ? 0 : destinationPort.hashCode();
+ h *= 1000003;
+ h ^= (position == null) ? 0 : position.hashCode();
+ h *= 1000003;
+ h ^= (action == null) ? 0 : action.hashCode();
+ h *= 1000003;
+ h ^= (enabled == null) ? 0 : enabled.hashCode();
+ return h;
+ }
+
+ @Override
+ public UpdateFirewallRule.Builder toBuilder() {
+ return new Builder(this);
+ }
+
+ static final class Builder extends UpdateFirewallRule.Builder {
+ private String tenantId;
+ private String name;
+ private String description;
+ private String firewallPolicyId;
+ private Boolean shared;
+ private String protocol;
+ private IpVersion ipVersion;
+ private String sourceIpAddress;
+ private String destinationIpAddress;
+ private String sourcePort;
+ private String destinationPort;
+ private Integer position;
+ private String action;
+ private Boolean enabled;
+ Builder() {
+ }
+ Builder(UpdateFirewallRule source) {
+ this.tenantId = source.getTenantId();
+ this.name = source.getName();
+ this.description = source.getDescription();
+ this.firewallPolicyId = source.getFirewallPolicyId();
+ this.shared = source.getShared();
+ this.protocol = source.getProtocol();
+ this.ipVersion = source.getIpVersion();
+ this.sourceIpAddress = source.getSourceIpAddress();
+ this.destinationIpAddress = source.getDestinationIpAddress();
+ this.sourcePort = source.getSourcePort();
+ this.destinationPort = source.getDestinationPort();
+ this.position = source.getPosition();
+ this.action = source.getAction();
+ this.enabled = source.getEnabled();
+ }
+ @Override
+ public UpdateFirewallRule.Builder tenantId(String tenantId) {
+ this.tenantId = tenantId;
+ return this;
+ }
+ @Override
+ public String getTenantId() {
+ return tenantId;
+ }
+ @Override
+ public UpdateFirewallRule.Builder name(String name) {
+ this.name = name;
+ return this;
+ }
+ @Override
+ public String getName() {
+ return name;
+ }
+ @Override
+ public UpdateFirewallRule.Builder description(String description) {
+ this.description = description;
+ return this;
+ }
+ @Override
+ public String getDescription() {
+ return description;
+ }
+ @Override
+ public UpdateFirewallRule.Builder firewallPolicyId(String firewallPolicyId) {
+ this.firewallPolicyId = firewallPolicyId;
+ return this;
+ }
+ @Override
+ public String getFirewallPolicyId() {
+ return firewallPolicyId;
+ }
+ @Override
+ public UpdateFirewallRule.Builder shared(Boolean shared) {
+ this.shared = shared;
+ return this;
+ }
+ @Override
+ public Boolean getShared() {
+ return shared;
+ }
+ @Override
+ public UpdateFirewallRule.Builder protocol(String protocol) {
+ this.protocol = protocol;
+ return this;
+ }
+ @Override
+ public String getProtocol() {
+ return protocol;
+ }
+ @Override
+ public UpdateFirewallRule.Builder ipVersion(IpVersion ipVersion) {
+ this.ipVersion = ipVersion;
+ return this;
+ }
+ @Override
+ public IpVersion getIpVersion() {
+ return ipVersion;
+ }
+ @Override
+ public UpdateFirewallRule.Builder sourceIpAddress(String sourceIpAddress) {
+ this.sourceIpAddress = sourceIpAddress;
+ return this;
+ }
+ @Override
+ public String getSourceIpAddress() {
+ return sourceIpAddress;
+ }
+ @Override
+ public UpdateFirewallRule.Builder destinationIpAddress(String destinationIpAddress) {
+ this.destinationIpAddress = destinationIpAddress;
+ return this;
+ }
+ @Override
+ public String getDestinationIpAddress() {
+ return destinationIpAddress;
+ }
+ @Override
+ public UpdateFirewallRule.Builder sourcePort(String sourcePort) {
+ this.sourcePort = sourcePort;
+ return this;
+ }
+ @Override
+ public String getSourcePort() {
+ return sourcePort;
+ }
+ @Override
+ public UpdateFirewallRule.Builder destinationPort(String destinationPort) {
+ this.destinationPort = destinationPort;
+ return this;
+ }
+ @Override
+ public String getDestinationPort() {
+ return destinationPort;
+ }
+ @Override
+ public UpdateFirewallRule.Builder position(Integer position) {
+ this.position = position;
+ return this;
+ }
+ @Override
+ public Integer getPosition() {
+ return position;
+ }
+ @Override
+ public UpdateFirewallRule.Builder action(String action) {
+ this.action = action;
+ return this;
+ }
+ @Override
+ public String getAction() {
+ return action;
+ }
+ @Override
+ public UpdateFirewallRule.Builder enabled(Boolean enabled) {
+ this.enabled = enabled;
+ return this;
+ }
+ @Override
+ public Boolean getEnabled() {
+ return enabled;
+ }
+ @Override
+ public UpdateFirewallRule build() {
+ return new AutoValue_UpdateFirewallRule(
+ this.tenantId,
+ this.name,
+ this.description,
+ this.firewallPolicyId,
+ this.shared,
+ this.protocol,
+ this.ipVersion,
+ this.sourceIpAddress,
+ this.destinationIpAddress,
+ this.sourcePort,
+ this.destinationPort,
+ this.position,
+ this.action,
+ this.enabled);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java
index fec4e6a..1487af0 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/NeutronApiMetadata.java
@@ -16,17 +16,18 @@
*/
package org.jclouds.openstack.neutron.v2;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.KEYSTONE_VERSION;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE;
import java.net.URI;
import java.util.Properties;
import org.jclouds.apis.ApiMetadata;
-import org.jclouds.openstack.keystone.v2_0.config.AuthenticationApiModule;
-import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneAuthenticationModule.RegionModule;
+import org.jclouds.openstack.keystone.auth.config.AuthenticationModule;
+import org.jclouds.openstack.keystone.auth.config.CredentialTypes;
+import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule;
+import org.jclouds.openstack.keystone.catalog.config.ServiceCatalogModule.RegionModule;
import org.jclouds.openstack.neutron.v2.config.NeutronHttpApiModule;
import org.jclouds.openstack.v2_0.ServiceType;
import org.jclouds.rest.internal.BaseHttpApiMetadata;
@@ -59,6 +60,7 @@ public class NeutronApiMetadata extends BaseHttpApiMetadata<NeutronApi> {
Properties properties = BaseHttpApiMetadata.defaultProperties();
properties.setProperty(SERVICE_TYPE, ServiceType.NETWORK);
properties.setProperty(CREDENTIAL_TYPE, CredentialTypes.PASSWORD_CREDENTIALS);
+ properties.setProperty(KEYSTONE_VERSION, "2");
return properties;
}
@@ -76,8 +78,8 @@ public class NeutronApiMetadata extends BaseHttpApiMetadata<NeutronApi> {
.defaultEndpoint("http://localhost:5000/v2.0/")
.defaultProperties(NeutronApiMetadata.defaultProperties())
.defaultModules(ImmutableSet.<Class<? extends Module>>builder()
- .add(AuthenticationApiModule.class)
- .add(KeystoneAuthenticationModule.class)
+ .add(AuthenticationModule.class)
+ .add(ServiceCatalogModule.class)
.add(RegionModule.class)
.add(NeutronHttpApiModule.class).build());
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
index 35307b1..a4f45db 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FWaaSApi.java
@@ -31,8 +31,8 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
import org.jclouds.Fallbacks.NullOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
+import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest;
import org.jclouds.openstack.keystone.v2_0.KeystoneFallbacks.EmptyPaginatedCollectionOnNotFoundOr404;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
import org.jclouds.openstack.neutron.v2.domain.CreateFirewall;
import org.jclouds.openstack.neutron.v2.domain.CreateFirewallPolicy;
import org.jclouds.openstack.neutron.v2.domain.CreateFirewallRule;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
index ffd5c9e..a00bc04 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/FloatingIPApi.java
@@ -31,7 +31,7 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
import org.jclouds.Fallbacks.NullOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
+import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest;
import org.jclouds.openstack.neutron.v2.domain.FloatingIP;
import org.jclouds.openstack.neutron.v2.domain.FloatingIPs;
import org.jclouds.openstack.neutron.v2.fallbacks.EmptyFloatingIPsFallback;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
index b79553d..383c70e 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/RouterApi.java
@@ -31,7 +31,7 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
import org.jclouds.Fallbacks.NullOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
+import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest;
import org.jclouds.openstack.neutron.v2.domain.Router;
import org.jclouds.openstack.neutron.v2.domain.RouterInterface;
import org.jclouds.openstack.neutron.v2.domain.Routers;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
index 6f6d767..f67c6e3 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApi.java
@@ -32,7 +32,7 @@ import org.jclouds.Fallbacks.FalseOnNotFoundOr404;
import org.jclouds.Fallbacks.NullOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
+import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest;
import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.HealthMonitor;
import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.HealthMonitors;
import org.jclouds.openstack.neutron.v2.domain.lbaas.v1.Member;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
index 2706517..af908fc 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/NetworkApi.java
@@ -31,7 +31,7 @@ import org.jclouds.Fallbacks;
import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
+import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest;
import org.jclouds.openstack.neutron.v2.domain.Network;
import org.jclouds.openstack.neutron.v2.domain.Networks;
import org.jclouds.openstack.neutron.v2.fallbacks.EmptyNetworksFallback;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
index 3797810..3cd0e35 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/PortApi.java
@@ -16,13 +16,23 @@
*/
package org.jclouds.openstack.neutron.v2.features;
-import com.google.common.annotations.Beta;
-import com.google.common.collect.FluentIterable;
+import java.util.List;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.core.MediaType;
+
import org.jclouds.Fallbacks;
import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
+import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest;
import org.jclouds.openstack.neutron.v2.domain.Port;
import org.jclouds.openstack.neutron.v2.domain.Ports;
import org.jclouds.openstack.neutron.v2.fallbacks.EmptyPortsFallback;
@@ -36,16 +46,8 @@ import org.jclouds.rest.annotations.SelectJson;
import org.jclouds.rest.annotations.Transform;
import org.jclouds.rest.annotations.WrapWith;
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
+import com.google.common.annotations.Beta;
+import com.google.common.collect.FluentIterable;
/**
* Provides access to Port operations for the OpenStack Networking (Neutron) v2 API.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java
index 4b9803c..3646c17 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SecurityGroupApi.java
@@ -30,7 +30,7 @@ import org.jclouds.Fallbacks;
import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
+import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest;
import org.jclouds.openstack.neutron.v2.domain.Rule;
import org.jclouds.openstack.neutron.v2.domain.Rules;
import org.jclouds.openstack.neutron.v2.domain.SecurityGroup;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
index ffb7dcd..62fa7bb 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/features/SubnetApi.java
@@ -16,12 +16,24 @@
*/
package org.jclouds.openstack.neutron.v2.features;
-import com.google.common.collect.FluentIterable;
+import java.util.List;
+
+import javax.inject.Named;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+
import org.jclouds.Fallbacks;
import org.jclouds.Fallbacks.EmptyPagedIterableOnNotFoundOr404;
import org.jclouds.collect.PagedIterable;
import org.jclouds.javax.annotation.Nullable;
-import org.jclouds.openstack.keystone.v2_0.filters.AuthenticateRequest;
+import org.jclouds.openstack.keystone.auth.filters.AuthenticateRequest;
import org.jclouds.openstack.neutron.v2.domain.Subnet;
import org.jclouds.openstack.neutron.v2.domain.Subnets;
import org.jclouds.openstack.neutron.v2.fallbacks.EmptySubnetsFallback;
@@ -35,17 +47,7 @@ import org.jclouds.rest.annotations.SelectJson;
import org.jclouds.rest.annotations.Transform;
import org.jclouds.rest.annotations.WrapWith;
-import javax.inject.Named;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
-import java.util.List;
+import com.google.common.collect.FluentIterable;
/**
* Provides access to Subnet operations for the OpenStack Networking (Neutron) v2 API.
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiLiveTest.java
index f220a92..6ac472a 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiLiveTest.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.neutron.v2.internal;
import org.jclouds.apis.BaseApiLiveTest;
-import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties;
+import org.jclouds.openstack.keystone.config.KeystoneProperties;
import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.testng.annotations.Test;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/bbc67d53/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java
index d180e55..be7d245 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/internal/BaseNeutronApiMockTest.java
@@ -16,12 +16,12 @@
*/
package org.jclouds.openstack.neutron.v2.internal;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
-import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.SERVICE_TYPE;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.CREDENTIAL_TYPE;
+import static org.jclouds.openstack.keystone.config.KeystoneProperties.SERVICE_TYPE;
import java.util.Properties;
-import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
+import org.jclouds.openstack.keystone.auth.config.CredentialTypes;
import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest;