You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/11/17 17:21:31 UTC
[24/32] jclouds-labs git commit: JCLOUDS-780 Remove vcloud-director.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
deleted file mode 100644
index 7a93659..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "FirewallService")
-@XmlType(propOrder = {
- "defaultAction",
- "logDefaultAction",
- "firewallRules"
-})
-public class FirewallService extends NetworkService<FirewallService> {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromFirewallService(this);
- }
-
- public static class Builder extends NetworkService.Builder<FirewallService> {
- private String defaultAction;
- private Boolean logDefaultAction;
- private Set<FirewallRule> firewallRules = Sets.newLinkedHashSet();
-
- /**
- * @see FirewallService#getDefaultAction()
- */
- public Builder defaultAction(String defaultAction) {
- this.defaultAction = defaultAction;
- return this;
- }
-
- /**
- * @see FirewallService#isLogDefaultAction()
- */
- public Builder logDefaultAction(Boolean logDefaultAction) {
- this.logDefaultAction = logDefaultAction;
- return this;
- }
-
- /**
- * @see FirewallService#getFirewallRules()
- */
- public Builder firewallRules(Set<FirewallRule> firewallRules) {
- this.firewallRules = checkNotNull(firewallRules, "firewallRules");
- return this;
- }
-
- @Override
- public FirewallService build() {
- return new FirewallService(isEnabled, defaultAction, logDefaultAction, firewallRules);
-
- }
-
- @Override
- public Builder fromNetworkServiceType(NetworkService<FirewallService> in) {
- return Builder.class.cast(super.fromNetworkServiceType(in));
- }
-
- public Builder fromFirewallService(FirewallService in) {
- return fromNetworkServiceType(in)
- .defaultAction(in.getDefaultAction())
- .logDefaultAction(in.isLogDefaultAction())
- .firewallRules(in.getFirewallRules());
- }
-
- @Override
- public Builder enabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- return this;
- }
- }
-
- private FirewallService(boolean enabled, String defaultAction, Boolean logDefaultAction, Set<FirewallRule> firewallRules) {
- super(enabled);
- this.defaultAction = defaultAction;
- this.logDefaultAction = logDefaultAction;
- this.firewallRules = ImmutableSet.copyOf(firewallRules);
- }
-
- private FirewallService() {
- // for JAXB
- }
-
- @XmlElement(name = "DefaultAction")
- protected String defaultAction;
- @XmlElement(name = "LogDefaultAction")
- protected Boolean logDefaultAction;
- @XmlElement(name = "FirewallRule")
- protected Set<FirewallRule> firewallRules = Sets.newLinkedHashSet();
-
- /**
- * Gets the value of the defaultAction property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDefaultAction() {
- return defaultAction;
- }
-
- /**
- * Gets the value of the logDefaultAction property.
- *
- * @return possible object is
- * {@link Boolean }
- */
- public Boolean isLogDefaultAction() {
- return logDefaultAction;
- }
-
- /**
- * Gets the value of the firewallRule property.
- */
- public Set<FirewallRule> getFirewallRules() {
- return Collections.unmodifiableSet(this.firewallRules);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- FirewallService that = FirewallService.class.cast(o);
- return equal(defaultAction, that.defaultAction) &&
- equal(logDefaultAction, that.logDefaultAction) &&
- equal(firewallRules, that.firewallRules);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(defaultAction,
- logDefaultAction,
- firewallRules);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("defaultAction", defaultAction)
- .add("logDefaultAction", logDefaultAction)
- .add("firewallRules", firewallRules).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
deleted file mode 100644
index 3f4bf0e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "IpAddresses")
-public class IpAddresses {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpAddresses(this);
- }
-
- public static class Builder {
- private Set<String> ipAddresses = Sets.newLinkedHashSet();
-
- /**
- * @see IpAddresses#getIpAddresses()
- */
- public Builder ipAddresses(Set<String> ipAddresses) {
- this.ipAddresses = Sets.newLinkedHashSet(checkNotNull(ipAddresses, "ipAddresses"));
- return this;
- }
-
- /**
- * @see IpAddresses#getIpAddresses()
- */
- public Builder ipAddress(String ipAddress) {
- ipAddresses.add(checkNotNull(ipAddress, "ipAddress"));
- return this;
- }
-
- public IpAddresses build() {
- return new IpAddresses(ipAddresses);
- }
-
- public Builder fromIpAddresses(IpAddresses in) {
- return ipAddresses(in.getIpAddresses());
- }
- }
-
- private IpAddresses() {
- // for JAXB
- }
-
- private IpAddresses(Set<String> orgs) {
- this.ipAddresses = ImmutableSet.copyOf(orgs);
- }
-
- @XmlElement(name = "IpAddress")
- private Set<String> ipAddresses = Sets.newLinkedHashSet();
-
- public Set<String> getIpAddresses() {
- return Collections.unmodifiableSet(ipAddresses);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpAddresses that = IpAddresses.class.cast(o);
- return equal(ipAddresses, that.ipAddresses);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(ipAddresses);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("ipAddresses", ipAddresses).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
deleted file mode 100644
index f51b931..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-
-/**
- * Represents a range of IP addresses, start and end inclusive.
- */
-@XmlRootElement(name = "IpRange")
-public class IpRange {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpRange(this);
- }
-
- public static class Builder {
-
- private String startAddress;
- private String endAddress;
-
- /**
- * @see IpRange#getStartAddress()
- */
- public Builder startAddress(String startAddress) {
- this.startAddress = startAddress;
- return this;
- }
-
- /**
- * @see IpRange#getEndAddress()
- */
- public Builder endAddress(String endAddress) {
- this.endAddress = endAddress;
- return this;
- }
-
- public IpRange build() {
- return new IpRange(startAddress, endAddress);
- }
-
- public Builder fromIpRange(IpRange in) {
- return startAddress(in.getStartAddress()).endAddress(in.getEndAddress());
- }
- }
-
- private IpRange() {
- // for JAXB
- }
-
- private IpRange(String startAddress, String endAddress) {
- this.startAddress = startAddress;
- this.endAddress = endAddress;
- }
-
- @XmlElement(name = "StartAddress")
- private String startAddress;
- @XmlElement(name = "EndAddress")
- private String endAddress;
-
- /**
- * @return Start address of the IP range.
- */
- public String getStartAddress() {
- return startAddress;
- }
-
- /**
- * @return End address of the IP range.
- */
- public String getEndAddress() {
- return endAddress;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpRange that = IpRange.class.cast(o);
- return equal(startAddress, that.startAddress) && equal(endAddress, that.endAddress);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(startAddress, endAddress);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("startAddress", startAddress)
- .add("endAddress", endAddress).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
deleted file mode 100644
index f20f7b8..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.Set;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
-
-@XmlRootElement(name = "IpRanges")
-public class IpRanges {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpRanges(this);
- }
-
- public static class Builder {
- private Set<IpRange> ipRanges = Sets.newLinkedHashSet();
-
- /**
- * @see IpRanges#getIpRanges()
- */
- public Builder ipRanges(Set<IpRange> ipRanges) {
- this.ipRanges = Sets.newLinkedHashSet(checkNotNull(ipRanges, "ipRanges"));
- return this;
- }
-
- /**
- * @see IpRanges#getIpRanges()
- */
- public Builder ipRange(IpRange ipRange) {
- ipRanges.add(checkNotNull(ipRange, "ipRange"));
- return this;
- }
-
- public IpRanges build() {
- return new IpRanges(ipRanges);
- }
-
- public Builder fromIpRanges(IpRanges in) {
- return ipRanges(in.getIpRanges());
- }
- }
-
- private IpRanges() {
- // for JAXB
- }
-
- private IpRanges(Set<IpRange> ipRanges) {
- this.ipRanges = ImmutableSet.copyOf(ipRanges);
- }
-
- @XmlElement(name = "IpRange")
- private Set<IpRange> ipRanges = Sets.newLinkedHashSet();
-
- public Set<IpRange> getIpRanges() {
- return Collections.unmodifiableSet(ipRanges);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpRanges that = IpRanges.class.cast(o);
- return equal(ipRanges, that.ipRanges);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(ipRanges);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("ipRanges", ipRanges).toString();
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
deleted file mode 100644
index ac53b38..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import com.google.common.base.Objects;
-
-/**
- * Specify network settings like gateway, network mask, DNS servers, IP ranges, etc.
- */
-@XmlRootElement(name = "IpScope")
-public class IpScope {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpScope(this);
- }
-
- public static class Builder {
-
- private boolean isInherited;
- private String gateway;
- private String netmask;
- private String dns1;
- private String dns2;
- private String dnsSuffix;
- private IpRanges ipRanges;
- private IpAddresses allocatedIpAddresses;
-
- /**
- * @see IpScope#isInherited()
- */
- public Builder isInherited(boolean isInherited) {
- this.isInherited = isInherited;
- return this;
- }
-
- /**
- * @see IpScope#getGateway()
- */
- public Builder gateway(String gateway) {
- this.gateway = gateway;
- return this;
- }
-
- /**
- * @see IpScope#getNetmask()
- */
- public Builder netmask(String netmask) {
- this.netmask = netmask;
- return this;
- }
-
- /**
- * @see IpScope#getDns1()
- */
- public Builder dns1(String dns1) {
- this.dns1 = dns1;
- return this;
- }
-
- /**
- * @see IpScope#getDns2()
- */
- public Builder dns2(String dns2) {
- this.dns2 = dns2;
- return this;
- }
-
- /**
- * @see IpScope#getDnsSuffix()
- */
- public Builder dnsSuffix(String dnsSuffix) {
- this.dnsSuffix = dnsSuffix;
- return this;
- }
-
- /**
- * @see IpScope#getIpRanges()
- */
- public Builder ipRanges(IpRanges ipRanges) {
- this.ipRanges = ipRanges;
- return this;
- }
-
- /**
- * @see IpScope#getAllocatedIpAddresses()
- */
- public Builder allocatedIpAddresses(IpAddresses allocatedIpAddresses) {
- this.allocatedIpAddresses = allocatedIpAddresses;
- return this;
- }
-
- public IpScope build() {
- return new IpScope(isInherited, gateway, netmask, dns1, dns2, dnsSuffix, ipRanges, allocatedIpAddresses);
- }
-
- public Builder fromIpScope(IpScope in) {
- return isInherited(in.isInherited()).gateway(in.getGateway())
- .netmask(in.getNetmask())
- .dns1(in.getDns1())
- .dns2(in.getDns2())
- .dnsSuffix(in.getDnsSuffix())
- .ipRanges(in.getIpRanges())
- .allocatedIpAddresses(in.getAllocatedIpAddresses());
- }
- }
-
- IpScope() {
- // For JAXB
- }
-
- public IpScope(boolean inherited, String gateway, String netmask, String dns1, String dns2, String dnsSuffix,
- IpRanges ipRanges, IpAddresses allocatedIpAddresses) {
- this.isInherited = inherited;
- this.gateway = gateway;
- this.netmask = netmask;
- this.dns1 = dns1;
- this.dns2 = dns2;
- this.dnsSuffix = dnsSuffix;
- this.ipRanges = ipRanges;
- this.allocatedIpAddresses = allocatedIpAddresses;
- }
-
-
- @XmlElement(name = "IsInherited")
- private boolean isInherited;
- @XmlElement(name = "Gateway")
- private String gateway;
- @XmlElement(name = "Netmask")
- private String netmask;
- @XmlElement(name = "Dns1")
- private String dns1;
- @XmlElement(name = "Dns2")
- private String dns2;
- @XmlElement(name = "DnsSuffix")
- private String dnsSuffix;
- @XmlElement(name = "IpRanges")
- private IpRanges ipRanges;
- @XmlElement(name = "AllocatedIpAddresses")
- private IpAddresses allocatedIpAddresses;
-
- /**
- * @return True if the IP scope is inherit from parent network.
- */
- public boolean isInherited() {
- return isInherited;
- }
-
- /**
- * @return Gateway of the network..
- */
- public String getGateway() {
- return gateway;
- }
-
- /**
- * @return Network mask.
- */
- public String getNetmask() {
- return netmask;
- }
-
- /**
- * @return Primary DNS server.
- */
- public String getDns1() {
- return dns1;
- }
-
- /**
- * @return Secondary DNS server.
- */
- public String getDns2() {
- return dns2;
- }
-
- /**
- * @return DNS suffix.
- */
- public String getDnsSuffix() {
- return dnsSuffix;
- }
-
- /**
- * @return IP ranges used for static pool allocation in the network.
- */
- public IpRanges getIpRanges() {
- return ipRanges;
- }
-
- /**
- * @return Read-only list of allocated IP addresses in the network.
- */
- public IpAddresses getAllocatedIpAddresses() {
- return allocatedIpAddresses;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpScope that = IpScope.class.cast(o);
- return equal(isInherited, that.isInherited) && equal(gateway, that.gateway) &&
- equal(netmask, that.netmask) &&
- equal(dns1, that.dns1) &&
- equal(dns2, that.dns2) &&
- equal(dnsSuffix, that.dnsSuffix) &&
- equal(ipRanges, that.ipRanges) &&
- equal(allocatedIpAddresses, that.allocatedIpAddresses);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(isInherited, gateway, netmask, dns1, dns2, dnsSuffix,
- ipRanges, allocatedIpAddresses);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("").add("isInherited", isInherited)
- .add("gateway", gateway)
- .add("netmask", netmask)
- .add("dns1", dns1)
- .add("dns2", dns2)
- .add("dnsSuffix", dnsSuffix)
- .add("ipRanges", ipRanges)
- .add("allocatedIpAddresses", allocatedIpAddresses).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java
deleted file mode 100644
index eaf5602..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnLocalPeer.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "IpsecVpnLocalPeer")
-public class IpsecVpnLocalPeer
- extends IpsecVpnManagedPeer<IpsecVpnLocalPeer>
-
-{
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnLocalPeer(this);
- }
-
- public static class Builder extends IpsecVpnManagedPeer.Builder<IpsecVpnLocalPeer> {
- public IpsecVpnLocalPeer build() {
- return new IpsecVpnLocalPeer(id, name);
- }
-
- @Override
- public Builder fromIpsecVpnManagedPeerType(IpsecVpnManagedPeer<IpsecVpnLocalPeer> in) {
- return Builder.class.cast(super.fromIpsecVpnManagedPeerType(in));
- }
-
- public Builder fromIpsecVpnLocalPeer(IpsecVpnLocalPeer in) {
- return fromIpsecVpnManagedPeerType(in);
- }
-
- @Override
- public Builder id(String id) {
- return Builder.class.cast(super.id(id));
- }
-
- @Override
- public Builder name(String name) {
- return Builder.class.cast(super.name(name));
- }
-
- }
-
- private IpsecVpnLocalPeer(String id, String name) {
- super(id, name);
- }
-
- private IpsecVpnLocalPeer() {
- // For JAXB
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
deleted file mode 100644
index 733fc1a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-import com.google.common.base.Objects;
-
-@XmlSeeAlso(
- IpsecVpnLocalPeer.class
-)
-public abstract class IpsecVpnManagedPeer<T extends IpsecVpnManagedPeer<T>> extends IpsecVpnPeer<T> {
-
- public abstract static class Builder<T extends IpsecVpnManagedPeer<T>> {
- protected String id;
- protected String name;
-
- /**
- * @see IpRange#getStartAddress()
- */
- public Builder<T> id(String id) {
- this.id = id;
- return this;
- }
-
- /**
- * @see IpRange#getEndAddress()
- */
- public Builder<T> name(String name) {
- this.name = name;
- return this;
- }
-
- public Builder<T> fromIpsecVpnManagedPeerType(IpsecVpnManagedPeer<T> in) {
- return id(in.getId())
- .name(in.getName());
- }
- }
-
- @XmlElement(name = "Id", required = true)
- protected String id;
- @XmlElement(name = "Name", required = true)
- protected String name;
-
- protected IpsecVpnManagedPeer(String id, String name) {
- this.id = id;
- this.name = name;
- }
-
- protected IpsecVpnManagedPeer() {
- // for JAXB
- }
-
- /**
- * @return id of peer network
- */
- public String getId() {
- return id;
- }
-
- /**
- * @return the name of the peer network
- */
- public String getName() {
- return name;
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(id, name);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpsecVpnManagedPeer<?> that = IpsecVpnManagedPeer.class.cast(o);
- return equal(id, that.id) && equal(name, that.name);
- }
-
- @Override
- public String toString() {
- return string().toString();
- }
-
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("id", id).add("name", name);
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeer.java
deleted file mode 100644
index 745097a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnPeer.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-@XmlSeeAlso({
- IpsecVpnLocalPeer.class,
- IpsecVpnRemotePeer.class,
- IpsecVpnThirdPartyPeer.class
-})
-public abstract class IpsecVpnPeer<T extends IpsecVpnPeer<T>> {
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
deleted file mode 100644
index 6642114..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlRootElement(name = "IpsecVpnRemotePeer")
-@XmlType(propOrder = {
- "vcdUrl",
- "vcdOrganization",
- "vcdUsername"
-})
-public class IpsecVpnRemotePeer extends IpsecVpnManagedPeer<IpsecVpnRemotePeer> {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnRemotePeer(this);
- }
-
- public static class Builder extends IpsecVpnManagedPeer.Builder<IpsecVpnRemotePeer> {
- private String vcdUrl;
- private String vcdOrganization;
- private String vcdUsername;
-
- /**
- * @see IpsecVpnRemotePeer#getVcdUrl()
- */
- public Builder vcdUrl(String vcdUrl) {
- this.vcdUrl = vcdUrl;
- return this;
- }
-
- /**
- * @see IpsecVpnRemotePeer#getVcdOrganization()
- */
- public Builder vcdOrganization(String vcdOrganization) {
- this.vcdOrganization = vcdOrganization;
- return this;
- }
-
- /**
- * @see IpsecVpnRemotePeer#getVcdUsername()
- */
- public Builder vcdUsername(String vcdUsername) {
- this.vcdUsername = vcdUsername;
- return this;
- }
-
- public IpsecVpnRemotePeer build() {
- return new IpsecVpnRemotePeer(id, name, vcdUrl, vcdOrganization, vcdUsername);
- }
-
- @Override
- public Builder fromIpsecVpnManagedPeerType(IpsecVpnManagedPeer<IpsecVpnRemotePeer> in) {
- return Builder.class.cast(super.fromIpsecVpnManagedPeerType(in));
- }
-
- public Builder fromIpsecVpnRemotePeer(IpsecVpnRemotePeer in) {
- return fromIpsecVpnManagedPeerType(in)
- .vcdUrl(in.getVcdUrl())
- .vcdOrganization(in.getVcdOrganization())
- .vcdUsername(in.getVcdUsername());
- }
-
-
- @Override
- public Builder id(String id) {
- return Builder.class.cast(super.id(id));
- }
-
- @Override
- public Builder name(String name) {
- return Builder.class.cast(super.name(name));
- }
-
- }
-
- private IpsecVpnRemotePeer(String id, String name, String vcdUrl, String vcdOrganization, String vcdUsername) {
- super(id, name);
- this.vcdUrl = vcdUrl;
- this.vcdOrganization = vcdOrganization;
- this.vcdUsername = vcdUsername;
- }
-
- private IpsecVpnRemotePeer() {
- // for JAXB
- }
-
- @XmlElement(name = "VcdUrl", required = true)
- protected String vcdUrl;
- @XmlElement(name = "VcdOrganization", required = true)
- protected String vcdOrganization;
- @XmlElement(name = "VcdUsername", required = true)
- protected String vcdUsername;
-
- /**
- * Gets the value of the vcdUrl property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVcdUrl() {
- return vcdUrl;
- }
-
- /**
- * Gets the value of the vcdOrganization property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVcdOrganization() {
- return vcdOrganization;
- }
-
- /**
- * Gets the value of the vcdUsername property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVcdUsername() {
- return vcdUsername;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpsecVpnRemotePeer that = IpsecVpnRemotePeer.class.cast(o);
- return super.equals(that)
- && equal(vcdUrl, that.vcdUrl)
- && equal(vcdOrganization, that.vcdOrganization)
- && equal(vcdUsername, that.vcdUsername);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(super.hashCode(),
- vcdUrl,
- vcdOrganization,
- vcdUsername);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("vcdUrl", vcdUrl)
- .add("vcdOrganization", vcdOrganization)
- .add("vcdUsername", vcdUsername);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
deleted file mode 100644
index 277ff23..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
+++ /dev/null
@@ -1,179 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-
-@XmlRootElement(name = "IpsecVpnService")
-@XmlType(propOrder = {
- "externalIpAddress",
- "publicIpAddress",
- "ipsecVpnTunnels"
-})
-public class IpsecVpnService extends NetworkService<IpsecVpnService> {
-
- public static Builder builder() {
- return new Builder();
- }
-
- @Override
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnService(this);
- }
-
- public static class Builder extends NetworkService.Builder<IpsecVpnService> {
-
- private String externalIpAddress;
- private String publicIpAddress;
- private List<IpsecVpnTunnel> ipsecVpnTunnels;
-
- /**
- * @see IpsecVpnService#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see IpsecVpnService#getPublicIpAddress()
- */
- public Builder publicIpAddress(String publicIpAddress) {
- this.publicIpAddress = publicIpAddress;
- return this;
- }
-
- /**
- * @see IpsecVpnService#getIpsecVpnTunnels()
- */
- public Builder ipsecVpnTunnels(List<IpsecVpnTunnel> ipsecVpnTunnels) {
- this.ipsecVpnTunnels = checkNotNull(ipsecVpnTunnels, "ipsecVpnTunnels");
- return this;
- }
-
- @Override
- public IpsecVpnService build() {
- return new IpsecVpnService(isEnabled, externalIpAddress, publicIpAddress, ipsecVpnTunnels);
- }
-
- @Override
- public Builder fromNetworkServiceType(NetworkService<IpsecVpnService> in) {
- return Builder.class.cast(super.fromNetworkServiceType(in));
- }
-
- public Builder fromIpsecVpnService(IpsecVpnService in) {
- return fromNetworkServiceType(in)
- .externalIpAddress(in.getExternalIpAddress())
- .publicIpAddress(in.getPublicIpAddress())
- .ipsecVpnTunnels(in.getIpsecVpnTunnels());
- }
-
- @Override
- public Builder enabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- return this;
- }
- }
-
- private IpsecVpnService(boolean enabled, String externalIpAddress, String publicIpAddress, List<IpsecVpnTunnel> ipsecVpnTunnel) {
- super(enabled);
- this.externalIpAddress = externalIpAddress;
- this.publicIpAddress = publicIpAddress;
- this.ipsecVpnTunnels = ImmutableList.copyOf(ipsecVpnTunnel);
- }
-
- private IpsecVpnService() {
- // for JAXB
- }
-
- @XmlElement(name = "ExternalIpAddress")
- protected String externalIpAddress;
- @XmlElement(name = "PublicIpAddress")
- protected String publicIpAddress;
- @XmlElement(name = "IpsecVpnTunnel")
- protected List<IpsecVpnTunnel> ipsecVpnTunnels = Lists.newArrayList();
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the publicIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getPublicIpAddress() {
- return publicIpAddress;
- }
-
- /**
- * Gets the value of the ipsecVpnTunnel property.
- */
- public List<IpsecVpnTunnel> getIpsecVpnTunnels() {
- return Collections.unmodifiableList(this.ipsecVpnTunnels);
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpsecVpnService that = IpsecVpnService.class.cast(o);
- return super.equals(that) &&
- equal(externalIpAddress, that.externalIpAddress) &&
- equal(publicIpAddress, that.publicIpAddress) &&
- equal(ipsecVpnTunnels, that.ipsecVpnTunnels);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(
- super.hashCode(),
- externalIpAddress,
- publicIpAddress,
- ipsecVpnTunnels);
- }
-
- @Override
- protected Objects.ToStringHelper string() {
- return super.string()
- .add("externalIpAddress", externalIpAddress)
- .add("publicIpAddress", publicIpAddress)
- .add("ipsecVpnTunnels", ipsecVpnTunnels);
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java
deleted file mode 100644
index 8168132..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnThirdPartyPeer.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement(name = "IpsecVpnThirdPartyPeer")
-public class IpsecVpnThirdPartyPeer extends IpsecVpnUnmanagedPeer<IpsecVpnThirdPartyPeer> {
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnThirdPartyPeer(this);
- }
-
- public static class Builder {
- public IpsecVpnThirdPartyPeer build() {
- return new IpsecVpnThirdPartyPeer();
- }
-
- public Builder fromIpsecVpnThirdPartyPeer(IpsecVpnThirdPartyPeer in) {
- return new Builder();
- }
- }
-
- private IpsecVpnThirdPartyPeer() {
- // for JAXB
- }
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
deleted file mode 100644
index c30e9f2..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
+++ /dev/null
@@ -1,365 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(name = "IpsecVpnTunnel", propOrder = {
- "name",
- "description",
- "ipsecVpnPeer",
- "peerIpAddress",
- "peerNetworkAddress",
- "peerNetworkMask",
- "sharedSecret",
- "encryptionProtocol",
- "mtu",
- "isEnabled",
- "isOperational",
- "errorDetails"
-})
-public class IpsecVpnTunnel {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromIpsecVpnTunnel(this);
- }
-
- public static class Builder {
-
- private String name;
- private String description;
- private IpsecVpnPeer<?> ipsecVpnPeer;
- private String peerIpAddress;
- private String peerNetworkAddress;
- private String peerNetworkMask;
- private String sharedSecret;
- private String encryptionProtocol;
- private int mtu;
- private boolean isEnabled;
- private Boolean isOperational;
- private String errorDetails;
-
- /**
- * @see IpsecVpnTunnel#getName()
- */
- public Builder name(String name) {
- this.name = name;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getDescription()
- */
- public Builder description(String description) {
- this.description = description;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getIpsecVpnPeer()
- */
- public Builder ipsecVpnPeer(IpsecVpnPeer<?> ipsecVpnPeer) {
- this.ipsecVpnPeer = ipsecVpnPeer;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getPeerIpAddress()
- */
- public Builder peerIpAddress(String peerIpAddress) {
- this.peerIpAddress = peerIpAddress;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getPeerNetworkAddress()
- */
- public Builder peerNetworkAddress(String peerNetworkAddress) {
- this.peerNetworkAddress = peerNetworkAddress;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getPeerNetworkMask()
- */
- public Builder peerNetworkMask(String peerNetworkMask) {
- this.peerNetworkMask = peerNetworkMask;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getSharedSecret()
- */
- public Builder sharedSecret(String sharedSecret) {
- this.sharedSecret = sharedSecret;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getEncryptionProtocol()
- */
- public Builder encryptionProtocol(String encryptionProtocol) {
- this.encryptionProtocol = encryptionProtocol;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getMtu()
- */
- public Builder mtu(int mtu) {
- this.mtu = mtu;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#isEnabled()
- */
- public Builder isEnabled(boolean isEnabled) {
- this.isEnabled = isEnabled;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#isOperational()
- */
- public Builder isOperational(Boolean isOperational) {
- this.isOperational = isOperational;
- return this;
- }
-
- /**
- * @see IpsecVpnTunnel#getErrorDetails()
- */
- public Builder errorDetails(String errorDetails) {
- this.errorDetails = errorDetails;
- return this;
- }
-
-
- public IpsecVpnTunnel build() {
- return new IpsecVpnTunnel
- (name, description, ipsecVpnPeer, peerIpAddress, peerNetworkAddress, peerNetworkMask, sharedSecret,
- encryptionProtocol, mtu, isEnabled, isOperational, errorDetails);
- }
-
-
- public Builder fromIpsecVpnTunnel(IpsecVpnTunnel in) {
- return name(in.getName())
- .description(in.getDescription())
- .peerIpAddress(in.getPeerIpAddress())
- .peerNetworkAddress(in.getPeerNetworkAddress())
- .peerNetworkMask(in.getPeerNetworkMask())
- .sharedSecret(in.getSharedSecret())
- .encryptionProtocol(in.getEncryptionProtocol())
- .mtu(in.getMtu())
- .isEnabled(in.isEnabled())
- .isOperational(in.isOperational())
- .errorDetails(in.getErrorDetails());
- }
- }
-
- private IpsecVpnTunnel(String name, String description, IpsecVpnPeer<?> ipsecVpnPeer, String peerIpAddress,
- String peerNetworkAddress, String peerNetworkMask, String sharedSecret, String encryptionProtocol, int mtu, boolean enabled, Boolean operational, String errorDetails) {
- this.name = name;
- this.description = description;
- this.ipsecVpnPeer = ipsecVpnPeer;
- this.peerIpAddress = peerIpAddress;
- this.peerNetworkAddress = peerNetworkAddress;
- this.peerNetworkMask = peerNetworkMask;
- this.sharedSecret = sharedSecret;
- this.encryptionProtocol = encryptionProtocol;
- this.mtu = mtu;
- isEnabled = enabled;
- isOperational = operational;
- this.errorDetails = errorDetails;
- }
-
- private IpsecVpnTunnel() {
- // for JAXB
- }
-
- @XmlElement(name = "Name", required = true)
- protected String name;
- @XmlElement(name = "Description")
- protected String description;
- @XmlElementRef
- protected IpsecVpnPeer<?> ipsecVpnPeer;
- @XmlElement(name = "PeerIpAddress", required = true)
- protected String peerIpAddress;
- @XmlElement(name = "PeerNetworkAddress", required = true)
- protected String peerNetworkAddress;
- @XmlElement(name = "PeerNetworkMask", required = true)
- protected String peerNetworkMask;
- @XmlElement(name = "SharedSecret", required = true)
- protected String sharedSecret;
- @XmlElement(name = "EncryptionProtocol", required = true)
- protected String encryptionProtocol;
- @XmlElement(name = "Mtu")
- protected int mtu;
- @XmlElement(name = "IsEnabled")
- protected boolean isEnabled;
- @XmlElement(name = "IsOperational")
- protected Boolean isOperational;
- @XmlElement(name = "ErrorDetails")
- protected String errorDetails;
-
- /**
- * Gets the value of the name property.
- */
- public String getName() {
- return name;
- }
-
- /**
- * Gets the value of the description property.
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Details about the peer network.
- */
- public IpsecVpnPeer<?> getIpsecVpnPeer() {
- return ipsecVpnPeer;
- }
-
- /**
- * Gets the value of the peerIpAddress property.
- */
- public String getPeerIpAddress() {
- return peerIpAddress;
- }
-
- /**
- * Gets the value of the peerNetworkAddress property.
- */
- public String getPeerNetworkAddress() {
- return peerNetworkAddress;
- }
-
- /**
- * Gets the value of the peerNetworkMask property.
- */
- public String getPeerNetworkMask() {
- return peerNetworkMask;
- }
-
- /**
- * Gets the value of the sharedSecret property.
- */
- public String getSharedSecret() {
- return sharedSecret;
- }
-
- /**
- * Gets the value of the encryptionProtocol property.
- */
- public String getEncryptionProtocol() {
- return encryptionProtocol;
- }
-
- /**
- * Gets the value of the mtu property.
- */
- public int getMtu() {
- return mtu;
- }
-
- /**
- * Gets the value of the isEnabled property.
- */
- public boolean isEnabled() {
- return isEnabled;
- }
-
- /**
- * Gets the value of the isOperational property.
- */
- public Boolean isOperational() {
- return isOperational;
- }
-
- /**
- * Gets the value of the errorDetails property.
- */
- public String getErrorDetails() {
- return errorDetails;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- IpsecVpnTunnel that = IpsecVpnTunnel.class.cast(o);
- return equal(name, that.name) &&
- equal(description, that.description) &&
- equal(peerIpAddress, that.peerIpAddress) &&
- equal(peerNetworkAddress, that.peerNetworkAddress) &&
- equal(peerNetworkMask, that.peerNetworkMask) &&
- equal(sharedSecret, that.sharedSecret) &&
- equal(encryptionProtocol, that.encryptionProtocol) &&
- equal(mtu, that.mtu) &&
- equal(isEnabled, that.isEnabled) &&
- equal(isOperational, that.isOperational) &&
- equal(errorDetails, that.errorDetails);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(name,
- description,
- peerIpAddress,
- peerNetworkAddress,
- peerNetworkMask,
- sharedSecret,
- encryptionProtocol,
- mtu,
- isEnabled,
- isOperational,
- errorDetails);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("name", name)
- .add("description", description)
- .add("peerIpAddress", peerIpAddress)
- .add("peerNetworkAddress", peerNetworkAddress)
- .add("peerNetworkMask", peerNetworkMask)
- .add("sharedSecret", sharedSecret)
- .add("encryptionProtocol", encryptionProtocol)
- .add("mtu", mtu)
- .add("isEnabled", isEnabled)
- .add("isOperational", isOperational)
- .add("errorDetails", errorDetails).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeer.java
deleted file mode 100644
index d098e6a..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnUnmanagedPeer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import javax.xml.bind.annotation.XmlSeeAlso;
-
-@XmlSeeAlso(
- IpsecVpnThirdPartyPeer.class
-)
-public abstract class IpsecVpnUnmanagedPeer<T extends IpsecVpnUnmanagedPeer<T>> extends IpsecVpnPeer<T> {
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
deleted file mode 100644
index bd65b0e..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents the NAT basic rule for one to one mapping of internal
- * and external IP addresses from a network.
- */
-@XmlType(name = "NatOneToOneBasicRule", propOrder = {
- "mappingMode",
- "externalIpAddress",
- "internalIpAddress"
-})
-public class NatOneToOneBasicRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNatOneToOneBasicRule(this);
- }
-
- public static class Builder {
-
- private String mappingMode;
- private String externalIpAddress;
- private String internalIpAddress;
-
- /**
- * @see NatOneToOneBasicRule#getMappingMode()
- */
- public Builder mappingMode(String mappingMode) {
- this.mappingMode = mappingMode;
- return this;
- }
-
- /**
- * @see NatOneToOneBasicRule#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see NatOneToOneBasicRule#getInternalIpAddress()
- */
- public Builder internalIpAddress(String internalIpAddress) {
- this.internalIpAddress = internalIpAddress;
- return this;
- }
-
- public NatOneToOneBasicRule build() {
- return new NatOneToOneBasicRule(mappingMode, externalIpAddress, internalIpAddress);
- }
-
- public Builder fromNatOneToOneBasicRule(NatOneToOneBasicRule in) {
- return mappingMode(in.getMappingMode())
- .externalIpAddress(in.getExternalIpAddress())
- .internalIpAddress(in.getInternalIpAddress());
- }
- }
-
- private NatOneToOneBasicRule(String mappingMode, String externalIpAddress, String internalIpAddress) {
- this.mappingMode = mappingMode;
- this.externalIpAddress = externalIpAddress;
- this.internalIpAddress = internalIpAddress;
- }
-
- private NatOneToOneBasicRule() {
- // For JAXB
- }
-
-
- @XmlElement(name = "MappingMode", required = true)
- protected String mappingMode;
- @XmlElement(name = "ExternalIpAddress", required = true)
- protected String externalIpAddress;
- @XmlElement(name = "InternalIpAddress", required = true)
- protected String internalIpAddress;
-
- /**
- * Gets the value of the mappingMode property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getMappingMode() {
- return mappingMode;
- }
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the internalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getInternalIpAddress() {
- return internalIpAddress;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatOneToOneBasicRule that = NatOneToOneBasicRule.class.cast(o);
- return equal(mappingMode, that.mappingMode) &&
- equal(externalIpAddress, that.externalIpAddress) &&
- equal(internalIpAddress, that.internalIpAddress);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(mappingMode,
- externalIpAddress,
- internalIpAddress);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("mappingMode", mappingMode)
- .add("externalIpAddress", externalIpAddress)
- .add("internalIpAddress", internalIpAddress).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
deleted file mode 100644
index f64a361..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents the NAT rule for one to one mapping of VM NIC and
- * external IP addresses from a network.
- */
-@XmlType(name = "NatOneToOneVmRule", propOrder = {
- "mappingMode",
- "externalIpAddress",
- "vAppScopedVmId",
- "vmNicId"
-})
-public class NatOneToOneVmRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNatOneToOneVmRule(this);
- }
-
- public static class Builder {
-
- private String mappingMode;
- private String externalIpAddress;
- private String vAppScopedVmId;
- private int vmNicId;
-
- /**
- * @see NatOneToOneVmRule#getMappingMode()
- */
- public Builder mappingMode(String mappingMode) {
- this.mappingMode = mappingMode;
- return this;
- }
-
- /**
- * @see NatOneToOneVmRule#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see NatOneToOneVmRule#getVAppScopedVmId()
- */
- public Builder vAppScopedVmId(String vAppScopedVmId) {
- this.vAppScopedVmId = vAppScopedVmId;
- return this;
- }
-
- /**
- * @see NatOneToOneVmRule#getVmNicId()
- */
- public Builder vmNicId(int vmNicId) {
- this.vmNicId = vmNicId;
- return this;
- }
-
- public NatOneToOneVmRule build() {
- return new NatOneToOneVmRule(mappingMode, externalIpAddress, vAppScopedVmId, vmNicId);
- }
-
- public Builder fromNatOneToOneVmRule(NatOneToOneVmRule in) {
- return mappingMode(in.getMappingMode())
- .externalIpAddress(in.getExternalIpAddress())
- .vAppScopedVmId(in.getVAppScopedVmId())
- .vmNicId(in.getVmNicId());
- }
- }
-
- private NatOneToOneVmRule(String mappingMode, String externalIpAddress, String vAppScopedVmId, int vmNicId) {
- this.mappingMode = mappingMode;
- this.externalIpAddress = externalIpAddress;
- this.vAppScopedVmId = vAppScopedVmId;
- this.vmNicId = vmNicId;
- }
-
- private NatOneToOneVmRule() {
- // For JAXB
- }
-
- @XmlElement(name = "MappingMode", required = true)
- protected String mappingMode;
- @XmlElement(name = "ExternalIpAddress")
- protected String externalIpAddress;
- @XmlElement(name = "VAppScopedVmId", required = true)
- protected String vAppScopedVmId;
- @XmlElement(name = "VmNicId")
- protected int vmNicId;
-
- /**
- * Gets the value of the mappingMode property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getMappingMode() {
- return mappingMode;
- }
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the vAppScopedVmId property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getVAppScopedVmId() {
- return vAppScopedVmId;
- }
-
- /**
- * Gets the value of the vmNicId property.
- */
- public int getVmNicId() {
- return vmNicId;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatOneToOneVmRule that = NatOneToOneVmRule.class.cast(o);
- return equal(mappingMode, that.mappingMode) &&
- equal(externalIpAddress, that.externalIpAddress) &&
- equal(vAppScopedVmId, that.vAppScopedVmId) &&
- equal(vmNicId, that.vmNicId);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(mappingMode,
- externalIpAddress,
- vAppScopedVmId,
- vmNicId);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("mappingMode", mappingMode)
- .add("externalIpAddress", externalIpAddress)
- .add("vAppScopedVmId", vAppScopedVmId)
- .add("vmNicId", vmNicId).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
deleted file mode 100644
index 11d2fdc..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-
-/**
- * Represents the NAT rule for port forwarding between internal
- * IP/port and external IP/port.
- */
-@XmlType(name = "NatPortForwardingRule", propOrder = {
- "externalIpAddress",
- "externalPort",
- "internalIpAddress",
- "internalPort",
- "protocol"
-})
-public class NatPortForwardingRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNatPortForwardingRule(this);
- }
-
- public static class Builder {
-
- private String externalIpAddress;
- private int externalPort;
- private String internalIpAddress;
- private int internalPort;
- private String protocol;
-
- /**
- * @see NatPortForwardingRule#getExternalIpAddress()
- */
- public Builder externalIpAddress(String externalIpAddress) {
- this.externalIpAddress = externalIpAddress;
- return this;
- }
-
- /**
- * @see NatPortForwardingRule#getExternalPort()
- */
- public Builder externalPort(int externalPort) {
- this.externalPort = externalPort;
- return this;
- }
-
- /**
- * @see NatPortForwardingRule#getInternalIpAddress()
- */
- public Builder internalIpAddress(String internalIpAddress) {
- this.internalIpAddress = internalIpAddress;
- return this;
- }
-
- /**
- * @see NatPortForwardingRule#getInternalPort()
- */
- public Builder internalPort(int internalPort) {
- this.internalPort = internalPort;
- return this;
- }
-
- /**
- * @see NatPortForwardingRule#getProtocol()
- */
- public Builder protocol(String protocol) {
- this.protocol = protocol;
- return this;
- }
-
- public NatPortForwardingRule build() {
- return new NatPortForwardingRule(externalIpAddress, externalPort, internalIpAddress, internalPort, protocol);
- }
-
- public Builder fromNatPortForwardingRule(NatPortForwardingRule in) {
- return externalIpAddress(in.getExternalIpAddress())
- .externalPort(in.getExternalPort())
- .internalIpAddress(in.getInternalIpAddress())
- .internalPort(in.getInternalPort())
- .protocol(in.getProtocol());
- }
- }
-
- private NatPortForwardingRule(String externalIpAddress, int externalPort, String internalIpAddress, int internalPort, String protocol) {
- this.externalIpAddress = externalIpAddress;
- this.externalPort = externalPort;
- this.internalIpAddress = internalIpAddress;
- this.internalPort = internalPort;
- this.protocol = protocol;
- }
-
- private NatPortForwardingRule() {
- // For JAXB
- }
-
- @XmlElement(name = "ExternalIpAddress", required = true)
- protected String externalIpAddress;
- @XmlElement(name = "ExternalPort")
- protected int externalPort;
- @XmlElement(name = "InternalIpAddress", required = true)
- protected String internalIpAddress;
- @XmlElement(name = "InternalPort")
- protected int internalPort;
- @XmlElement(name = "Protocol", required = true)
- protected String protocol;
-
- /**
- * Gets the value of the externalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getExternalIpAddress() {
- return externalIpAddress;
- }
-
- /**
- * Gets the value of the externalPort property.
- */
- public int getExternalPort() {
- return externalPort;
- }
-
- /**
- * Gets the value of the internalIpAddress property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getInternalIpAddress() {
- return internalIpAddress;
- }
-
- /**
- * Gets the value of the internalPort property.
- */
- public int getInternalPort() {
- return internalPort;
- }
-
- /**
- * Gets the value of the protocol property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getProtocol() {
- return protocol;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatPortForwardingRule that = NatPortForwardingRule.class.cast(o);
- return equal(externalIpAddress, that.externalIpAddress) &&
- equal(externalPort, that.externalPort) &&
- equal(internalIpAddress, that.internalIpAddress) &&
- equal(internalPort, that.internalPort) &&
- equal(protocol, that.protocol);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(externalIpAddress,
- externalPort,
- internalIpAddress,
- internalPort,
- protocol);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("externalIpAddress", externalIpAddress)
- .add("externalPort", externalPort)
- .add("internalIpAddress", internalIpAddress)
- .add("internalPort", internalPort)
- .add("protocol", protocol).toString();
- }
-
-}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/775b89fd/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
deleted file mode 100644
index 489c0b5..0000000
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.jclouds.vcloud.director.v1_5.domain.network;
-
-import static com.google.common.base.Objects.equal;
-
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-import com.google.common.base.Objects;
-
-@XmlType(name = "NatRule", propOrder = {
- "description",
- "oneToOneBasicRule",
- "oneToOneVmRule",
- "portForwardingRule",
- "vmRule"
-})
-public class NatRule {
-
- public static Builder builder() {
- return new Builder();
- }
-
- public Builder toBuilder() {
- return new Builder().fromNatRule(this);
- }
-
- public static class Builder {
- private String description;
- private NatOneToOneBasicRule oneToOneBasicRule;
- private NatOneToOneVmRule oneToOneVmRule;
- private NatPortForwardingRule portForwardingRule;
- private NatVmRule vmRule;
-
- /**
- * @see NatRule#getDescription()
- */
- public Builder description(String description) {
- this.description = description;
- return this;
- }
-
- /**
- * @see NatRule#getOneToOneBasicRule()
- */
- public Builder oneToOneBasicRule(NatOneToOneBasicRule oneToOneBasicRule) {
- this.oneToOneBasicRule = oneToOneBasicRule;
- return this;
- }
-
- /**
- * @see NatRule#getOneToOneVmRule()
- */
- public Builder oneToOneVmRule(NatOneToOneVmRule oneToOneVmRule) {
- this.oneToOneVmRule = oneToOneVmRule;
- return this;
- }
-
- /**
- * @see NatRule#getPortForwardingRule()
- */
- public Builder portForwardingRule(NatPortForwardingRule portForwardingRule) {
- this.portForwardingRule = portForwardingRule;
- return this;
- }
-
- /**
- * @see NatRule#getVmRule()
- */
- public Builder vmRule(NatVmRule vmRule) {
- this.vmRule = vmRule;
- return this;
- }
-
- public NatRule build() {
- return new NatRule(description, oneToOneBasicRule, oneToOneVmRule, portForwardingRule, vmRule);
- }
-
- public Builder fromNatRule(NatRule in) {
- return description(in.getDescription())
- .oneToOneBasicRule(in.getOneToOneBasicRule())
- .oneToOneVmRule(in.getOneToOneVmRule())
- .portForwardingRule(in.getPortForwardingRule())
- .vmRule(in.getVmRule());
- }
- }
-
- public NatRule(String description, NatOneToOneBasicRule oneToOneBasicRule, NatOneToOneVmRule oneToOneVmRule,
- NatPortForwardingRule portForwardingRule, NatVmRule vmRule) {
- this.description = description;
- this.oneToOneBasicRule = oneToOneBasicRule;
- this.oneToOneVmRule = oneToOneVmRule;
- this.portForwardingRule = portForwardingRule;
- this.vmRule = vmRule;
- }
-
- NatRule() {
- // for JAXB
- }
-
- @XmlElement(name = "Description")
- protected String description;
- @XmlElement(name = "OneToOneBasicRule")
- protected NatOneToOneBasicRule oneToOneBasicRule;
- @XmlElement(name = "OneToOneVmRule")
- protected NatOneToOneVmRule oneToOneVmRule;
- @XmlElement(name = "PortForwardingRule")
- protected NatPortForwardingRule portForwardingRule;
- @XmlElement(name = "VmRule")
- protected NatVmRule vmRule;
-
- /**
- * Gets the value of the description property.
- *
- * @return possible object is
- * {@link String }
- */
- public String getDescription() {
- return description;
- }
-
- /**
- * Gets the value of the oneToOneBasicRule property.
- *
- * @return possible object is
- * {@link NatOneToOneBasicRule }
- */
- public NatOneToOneBasicRule getOneToOneBasicRule() {
- return oneToOneBasicRule;
- }
-
-
- /**
- * Gets the value of the oneToOneVmRule property.
- *
- * @return possible object is
- * {@link NatOneToOneVmRule }
- */
- public NatOneToOneVmRule getOneToOneVmRule() {
- return oneToOneVmRule;
- }
-
- /**
- * Gets the value of the portForwardingRule property.
- *
- * @return possible object is
- * {@link NatPortForwardingRule }
- */
- public NatPortForwardingRule getPortForwardingRule() {
- return portForwardingRule;
- }
-
- /**
- * Gets the value of the vmRule property.
- *
- * @return possible object is
- * {@link NatVmRule }
- */
- public NatVmRule getVmRule() {
- return vmRule;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- NatRule that = NatRule.class.cast(o);
- return equal(description, that.description) &&
- equal(oneToOneBasicRule, that.oneToOneBasicRule) &&
- equal(oneToOneVmRule, that.oneToOneVmRule) &&
- equal(portForwardingRule, that.portForwardingRule) &&
- equal(vmRule, that.vmRule);
- }
-
- @Override
- public int hashCode() {
- return Objects.hashCode(description,
- oneToOneBasicRule,
- oneToOneVmRule,
- portForwardingRule,
- vmRule);
- }
-
- @Override
- public String toString() {
- return Objects.toStringHelper("")
- .add("description", description)
- .add("oneToOneBasicRule", oneToOneBasicRule)
- .add("oneToOneVmRule", oneToOneVmRule)
- .add("portForwardingRule", portForwardingRule)
- .add("vmRule", vmRule).toString();
- }
-
-}