You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2013/11/21 23:32:33 UTC
git commit: Fix issue in the cloudsigma2 provider when ip fields are
parsed as String instead of IP.
Updated Branches:
refs/heads/master adee43e95 -> df08c741e
Fix issue in the cloudsigma2 provider when ip fields are parsed as String instead of IP.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/df08c741
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/df08c741
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/df08c741
Branch: refs/heads/master
Commit: df08c741e74c2856b2f43c0de62edb781ed42b11
Parents: adee43e
Author: Vladimir Shevchenko <sh...@gmail.com>
Authored: Wed Nov 20 17:50:24 2013 +0700
Committer: Ignasi Barrera <na...@apache.org>
Committed: Thu Nov 21 23:17:45 2013 +0100
----------------------------------------------------------------------
.../java/org/jclouds/cloudsigma2/domain/IP.java | 2 +
.../jclouds/cloudsigma2/domain/NICStats.java | 10 ++--
.../test/resources/server-detail-last-page.json | 56 +++++++++++++++++++-
3 files changed, 61 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/df08c741/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IP.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IP.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IP.java
index de7891a..7f74e5b 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IP.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/IP.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.cloudsigma2.domain;
+import com.google.inject.name.Named;
import org.jclouds.javax.annotation.Nullable;
import java.beans.ConstructorProperties;
@@ -101,6 +102,7 @@ public class IP {
protected final Owner owner;
protected final String uuid;
protected final Server server;
+ @Named("resource_uri")
protected final URI resourceUri;
@ConstructorProperties({
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/df08c741/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/NICStats.java
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/NICStats.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/NICStats.java
index 601c3bb..0dd2947 100644
--- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/NICStats.java
+++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/NICStats.java
@@ -29,15 +29,15 @@ public class NICStats {
@Named("io")
private final IOStats ioStats;
@Named("ip_v4")
- private final String ipV4;
+ private final IP ipV4;
@Named("ip_v6")
- private final String ipV6;
+ private final IP ipV6;
private final String mac;
@ConstructorProperties({
"interface_type", "io", "ip_v4", "ip_v6", "mac"
})
- public NICStats(InterfaceType interfaceType, IOStats ioStats, String ipV4, String ipV6, String mac) {
+ public NICStats(InterfaceType interfaceType, IOStats ioStats, IP ipV4, IP ipV6, String mac) {
this.interfaceType = interfaceType;
this.ioStats = ioStats;
this.ipV4 = ipV4;
@@ -62,14 +62,14 @@ public class NICStats {
/**
* @return Public IPv4 configuration
*/
- public String getIpV4() {
+ public IP getIpV4() {
return ipV4;
}
/**
* @return Public IPv6 configuration
*/
- public String getIpV6() {
+ public IP getIpV6() {
return ipV6;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/df08c741/cloudsigma2/src/test/resources/server-detail-last-page.json
----------------------------------------------------------------------
diff --git a/cloudsigma2/src/test/resources/server-detail-last-page.json b/cloudsigma2/src/test/resources/server-detail-last-page.json
index 9c450ff..e6889de 100644
--- a/cloudsigma2/src/test/resources/server-detail-last-page.json
+++ b/cloudsigma2/src/test/resources/server-detail-last-page.json
@@ -15,14 +15,66 @@
"mem": 536870912,
"meta": {},
"name": "test_server_1",
- "nics": [],
+ "nics": [
+ {
+ "boot_order": null,
+ "firewall_policy": {
+ "resource_uri": "/api/2.0/fwpolicies/8f822be5-f44b-40bf-bff8-83caa9af253d/",
+ "uuid": "8f822be5-f44b-40bf-bff8-83caa9af253d"
+ },
+ "ip_v4_conf": {
+ "conf": "static",
+ "ip": {
+ "resource_uri": "/api/2.0/ips/185.12.5.11/",
+ "uuid": "185.12.5.11"
+ }
+ },
+ "ip_v6_conf": null,
+ "mac": "22:18:a8:6d:88:b0",
+ "model": "virtio",
+ "runtime": {
+ "interface_type": "public",
+ "io": {
+ "bytes_recv": "1277397",
+ "bytes_sent": "2645643754",
+ "packets_recv": "10875",
+ "packets_sent": "36574091"
+ },
+ "ip_v4": {
+ "resource_uri": "/api/2.0/ips/185.12.5.11/",
+ "uuid": "185.12.5.11"
+ },
+ "ip_v6": null
+ },
+ "vlan": null
+ }
+ ],
"owner": {
"resource_uri": "/api/2.0/user/5b4a69a3-8e78-4c45-a8ba-8b13f0895e23/",
"uuid": "5b4a69a3-8e78-4c45-a8ba-8b13f0895e23"
},
"requirements": [],
"resource_uri": "/api/2.0/servers/33e71c37-0d0a-4a3a-a1ea-dc7265c9a154/",
- "runtime": null,
+ "runtime": {
+ "active_since": "2013-11-15T10:14:27+00:00",
+ "nics": [
+ {
+ "interface_type": "public",
+ "io": {
+ "bytes_recv": "1277397",
+ "bytes_sent": "2645643754",
+ "packets_recv": "10875",
+ "packets_sent": "36574091"
+ },
+ "ip_v4": {
+ "resource_uri": "/api/2.0/ips/185.12.5.11/",
+ "uuid": "185.12.5.11"
+ },
+ "ip_v6": null,
+ "mac": "22:18:a8:6d:88:b0"
+ }
+ ]
+ },
"smp": 1,
"status": "stopped",
"tags": [],