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/81db0c20 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/81db0c20 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/81db0c20 Branch: refs/heads/4.1 Commit: 81db0c20760fa2ce7f100d2f9dac7d1be88dd9d6 Parents: f3dae81 Author: Sheng Yang <[email protected]> Authored: Tue Feb 19 15:16:50 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Tue Feb 19 15:49:24 2013 -0800 ---------------------------------------------------------------------- .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 6 ++ .../src/com/cloud/api/query/vo/UserVmJoinVO.java | 47 +++++++++++++++ setup/db/create-schema-view.sql | 3 + setup/db/db/schema-40to410.sql | 3 + 4 files changed, 59 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/81db0c20/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/81db0c20/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/81db0c20/setup/db/create-schema-view.sql ---------------------------------------------------------------------- diff --git a/setup/db/create-schema-view.sql b/setup/db/create-schema-view.sql index ae62b7c..6bab5e2 100644 --- a/setup/db/create-schema-view.sql +++ b/setup/db/create-schema-view.sql @@ -93,6 +93,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, http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/81db0c20/setup/db/db/schema-40to410.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql index 404e175..3b03f6e 100644 --- a/setup/db/db/schema-40to410.sql +++ b/setup/db/db/schema-40to410.sql @@ -229,6 +229,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,
