You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2014/10/02 22:48:02 UTC
[6/6] git commit: Ports the Neutron LBaaS PR to 1.8.x and java 1.6
Ports the Neutron LBaaS PR to 1.8.x and java 1.6
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/b2197b80
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/b2197b80
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/b2197b80
Branch: refs/heads/1.8.x
Commit: b2197b80a829dcabc59989622b4704dfd5ce518e
Parents: 50e02c8
Author: Zack Shoylev <za...@rackspace.com>
Authored: Thu Oct 2 15:46:51 2014 -0500
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Thu Oct 2 15:46:51 2014 -0500
----------------------------------------------------------------------
.../openstack/neutron/v2/config/NeutronHttpApiModule.java | 1 +
.../openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java | 3 +--
.../neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java | 5 ++---
.../jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java | 3 +--
.../org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java | 3 +--
.../openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java | 5 ++---
.../neutron/v2/domain/lbaas/v1/SessionPersistence.java | 5 ++---
.../org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java | 3 +--
.../neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java | 4 ++--
9 files changed, 13 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/b2197b80/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/config/NeutronHttpApiModule.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/config/NeutronHttpApiModule.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/config/NeutronHttpApiModule.java
index 338acd7..90c59f2 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/config/NeutronHttpApiModule.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/config/NeutronHttpApiModule.java
@@ -32,6 +32,7 @@ import org.jclouds.openstack.neutron.v2.NeutronApi;
import org.jclouds.openstack.neutron.v2.handlers.NeutronErrorHandler;
import org.jclouds.openstack.v2_0.domain.Extension;
import org.jclouds.openstack.v2_0.functions.PresentWhenExtensionAnnotationNamespaceEqualsAnyNamespaceInExtensionsSet;
+import org.jclouds.openstack.neutron.v2.extensions.ExtensionNamespaces;
import org.jclouds.rest.ConfiguresHttpApi;
import org.jclouds.rest.config.HttpApiModule;
import org.jclouds.rest.functions.ImplicitOptionalConverter;
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/b2197b80/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java
index 29ec991..593690d 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java
@@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
@@ -226,7 +225,7 @@ public class HealthMonitor {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("type", type)
+ return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("type", type)
.add("delay", delay).add("timeout", timeout).add("maxRetries", maxRetries).add("httpMethod", httpMethod)
.add("urlPath", urlPath).add("expectedCodes", expectedCodes).add("pools", pools)
.add("adminStateUp", adminStateUp).add("status", status).add("statusDescription", statusDescription)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/b2197b80/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java
index ad8d468..64e3aea 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java
@@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -88,8 +87,8 @@ public class HealthMonitorStatus {
&& Objects.equal(this.statusDescription, that.statusDescription);
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("id", id).add("status", status)
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper(this).add("id", id).add("status", status)
.add("statusDescription", statusDescription);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/b2197b80/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java
index bff6cfe..da53e23 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java
@@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -179,7 +178,7 @@ public class Member {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("poolId", poolId)
+ return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("poolId", poolId)
.add("address", address).add("protocolPort", protocolPort).add("weight", weight)
.add("adminStateUp", adminStateUp).add("status", status).add("statusDescription", statusDescription)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/b2197b80/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java
index 5139141..c1aa88d 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java
@@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -258,7 +257,7 @@ public class Pool {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("vipId", vipId)
+ return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("vipId", vipId)
.add("name", name).add("description", description).add("subnetId", subnetId).add("protocol", protocol)
.add("provider", provider).add("lbMethod", lbMethod).add("healthMonitors", healthMonitors)
.add("healthMonitorsStatus", healthMonitorsStatus).add("members", members)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/b2197b80/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java
index 07989e7..869eb81 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java
@@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -88,8 +87,8 @@ public class PoolStatus {
&& Objects.equal(this.statusDescription, that.statusDescription);
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("id", id).add("status", status)
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper(this).add("id", id).add("status", status)
.add("statusDescription", statusDescription);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/b2197b80/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java
index c984ac4..b1c49dd 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java
@@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -74,8 +73,8 @@ public class SessionPersistence {
return Objects.equal(this.type, that.type) && Objects.equal(this.cookieName, that.cookieName);
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("type", type).add("cookieName", cookieName);
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper(this).add("type", type).add("cookieName", cookieName);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/b2197b80/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java
index d3539a9..ae62625 100644
--- a/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java
+++ b/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java
@@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -251,7 +250,7 @@ public class VIP {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("name", name)
+ return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("name", name)
.add("description", description).add("subnetId", subnetId).add("address", address).add("portId", portId)
.add("protocol", protocol).add("protocolPort", protocolPort).add("poolId", poolId)
.add("sessionPersistence", sessionPersistence).add("connectionLimit", connectionLimit)
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/b2197b80/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java
index 64275e0..0665906 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java
+++ b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/lbaas/v1/LBaaSApiLiveTest.java
@@ -84,8 +84,8 @@ public class LBaaSApiLiveTest extends BaseNeutronApiLiveTest {
@BeforeClass
public void createSubnets() {
- networks = new HashMap<>();
- subnets = new HashMap<>();
+ networks = new HashMap<String, Network>();
+ subnets = new HashMap<String, Subnet>();
for (String region : api.getConfiguredRegions()) {
Optional<LBaaSApi> lbaasApiExtension = api.getLBaaSApi(region);
if (!lbaasApiExtension.isPresent()) {