From da75e4ac8addb1464ff602136336123e9347ec52 Mon Sep 17 00:00:00 2001
From: Sheng Yang <sheng.yang@citrix.com>
Date: Tue, 19 Feb 2013 15:04:34 -0800
Subject: [PATCH] IPv6: Add IPv6 for domain router view

---
 .../query/dao/DomainRouterJoinDaoImpl.java    |  6 +++
 .../api/query/vo/DomainRouterJoinVO.java      | 51 +++++++++++++++++++
 setup/db/db/schema-40to410.sql                |  3 ++
 3 files changed, 60 insertions(+)

diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
index 3b780ee83ef..22e3badabac 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());
             }
diff --git a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
index a9c04586a92..606ec15fcbc 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;
+	}
+
+
 }
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index 82688714bd2..fa0a17977a0 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -727,6 +727,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,