Updated Branches: refs/heads/4.1 f900d0bc7 -> 81db0c207
IPv6: Add IPv6 for domain router 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/f3dae81d Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f3dae81d Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f3dae81d Branch: refs/heads/4.1 Commit: f3dae81daa5f19f31a2d0d4e09159bf268dd4876 Parents: f900d0b Author: Sheng Yang <[email protected]> Authored: Tue Feb 19 15:04:34 2013 -0800 Committer: Sheng Yang <[email protected]> Committed: Tue Feb 19 15:49:24 2013 -0800 ---------------------------------------------------------------------- .../api/query/dao/DomainRouterJoinDaoImpl.java | 6 ++ .../com/cloud/api/query/vo/DomainRouterJoinVO.java | 51 +++++++++++++++ setup/db/create-schema-view.sql | 5 +- setup/db/db/schema-40to410.sql | 3 + 4 files changed, 64 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f3dae81d/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java index 3b780ee..22e3bad 100644 --- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java @@ -116,6 +116,9 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO, nicResponse.setNetworkid(router.getNetworkUuid()); nicResponse.setNetworkName(router.getNetworkName()); nicResponse.setMacAddress(router.getMacAddress()); + nicResponse.setIp6Address(router.getIp6Address()); + nicResponse.setIp6Gateway(router.getIp6Gateway()); + nicResponse.setIp6Cidr(router.getIp6Cidr()); if (router.getBroadcastUri() != null) { nicResponse.setBroadcastUri(router.getBroadcastUri().toString()); } @@ -171,6 +174,9 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO, nicResponse.setNetmask(vr.getNetmask()); nicResponse.setNetworkid(vr.getNetworkUuid()); nicResponse.setMacAddress(vr.getMacAddress()); + nicResponse.setIp6Address(vr.getIp6Address()); + nicResponse.setIp6Gateway(vr.getIp6Gateway()); + nicResponse.setIp6Cidr(vr.getIp6Cidr()); if (vr.getBroadcastUri() != null) { nicResponse.setBroadcastUri(vr.getBroadcastUri().toString()); } http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f3dae81d/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java index a9c0458..606ec15 100644 --- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java @@ -157,6 +157,15 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti @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; @@ -920,4 +929,46 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti } + + + 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/f3dae81d/setup/db/create-schema-view.sql ---------------------------------------------------------------------- diff --git a/setup/db/create-schema-view.sql b/setup/db/create-schema-view.sql index f68a6ca..ae62b7c 100644 --- a/setup/db/create-schema-view.sql +++ b/setup/db/create-schema-view.sql @@ -222,6 +222,9 @@ CREATE VIEW `cloud`.`domain_router_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, @@ -1133,4 +1136,4 @@ CREATE VIEW `cloud`.`data_center_view` AS from `cloud`.`data_center` left join - `cloud`.`domain` ON data_center.domain_id = domain.id; \ No newline at end of file + `cloud`.`domain` ON data_center.domain_id = domain.id; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f3dae81d/setup/db/db/schema-40to410.sql ---------------------------------------------------------------------- diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql index 8734812..404e175 100644 --- a/setup/db/db/schema-40to410.sql +++ b/setup/db/db/schema-40to410.sql @@ -358,6 +358,9 @@ CREATE VIEW `cloud`.`domain_router_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,
