You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ya...@apache.org on 2013/02/20 00:51:16 UTC
[2/2] git commit: refs/heads/master - IPv6: Add ipv6 for user vm view
Updated Branches:
refs/heads/master 8296d41b5 -> 817548bac
IPv6: Add ipv6 for user vm view
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/817548ba
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/817548ba
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/817548ba
Branch: refs/heads/master
Commit: 817548bac1dc69b6bb9e8d891a656b0fa2c9d19b
Parents: da75e4a
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Feb 19 15:16:50 2013 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Tue Feb 19 15:50:55 2013 -0800
----------------------------------------------------------------------
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 ++
.../src/com/cloud/api/query/vo/UserVmJoinVO.java | 47 +++++++++++++++
setup/db/db/schema-40to410.sql | 3 +
3 files changed, 56 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/817548ba/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index 4a5ac33..f561449 100644
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -186,6 +186,9 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
nicResponse.setNetmask(userVm.getNetmask());
nicResponse.setNetworkid(userVm.getNetworkUuid());
nicResponse.setMacAddress(userVm.getMacAddress());
+ nicResponse.setIp6Address(userVm.getIp6Address());
+ nicResponse.setIp6Gateway(userVm.getIp6Gateway());
+ nicResponse.setIp6Cidr(userVm.getIp6Cidr());
if (userVm.getBroadcastUri() != null) {
nicResponse.setBroadcastUri(userVm.getBroadcastUri().toString());
}
@@ -244,6 +247,9 @@ public class UserVmJoinDaoImpl extends GenericDaoBase<UserVmJoinVO, Long> implem
nicResponse.setNetmask(uvo.getNetmask());
nicResponse.setNetworkid(uvo.getNetworkUuid());
nicResponse.setMacAddress(uvo.getMacAddress());
+ nicResponse.setIp6Address(uvo.getIp6Address());
+ nicResponse.setIp6Gateway(uvo.getIp6Gateway());
+ nicResponse.setIp6Cidr(uvo.getIp6Cidr());
if (uvo.getBroadcastUri() != null) {
nicResponse.setBroadcastUri(uvo.getBroadcastUri().toString());
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/817548ba/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
index 025db47..d723822 100644
--- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
+++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java
@@ -269,6 +269,15 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
@Column(name = "netmask")
private String netmask;
+ @Column(name = "ip6_address")
+ private String ip6Address;
+
+ @Column(name = "ip6_gateway")
+ private String ip6Gateway;
+
+ @Column(name = "ip6_cidr")
+ private String ip6Cidr;
+
@Column(name = "mac_address")
private String macAddress;
@@ -1611,4 +1620,42 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity {
return toString;
}
+ public String getIp6Address() {
+ return ip6Address;
+ }
+
+
+
+
+ public void setIp6Address(String ip6Address) {
+ this.ip6Address = ip6Address;
+ }
+
+
+
+
+ public String getIp6Gateway() {
+ return ip6Gateway;
+ }
+
+
+
+
+ public void setIp6Gateway(String ip6Gateway) {
+ this.ip6Gateway = ip6Gateway;
+ }
+
+
+
+
+ public String getIp6Cidr() {
+ return ip6Cidr;
+ }
+
+
+
+
+ public void setIp6Cidr(String ip6Cidr) {
+ this.ip6Cidr = ip6Cidr;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/817548ba/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index fa0a179..e1ab815 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -598,6 +598,9 @@ CREATE VIEW `cloud`.`user_vm_view` AS
nics.uuid nic_uuid,
nics.network_id network_id,
nics.ip4_address ip_address,
+ nics.ip6_address ip6_address,
+ nics.ip6_gateway ip6_gateway,
+ nics.ip6_cidr ip6_cidr,
nics.default_nic is_default_nic,
nics.gateway gateway,
nics.netmask netmask,