CLOUDSTACK-1332: Add ip6dns to zone and domainrouter response

api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java

@@ -47,6 +47,12 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView
     @SerializedName(ApiConstants.DNS2) @Param(description="the second DNS for the router")
     private String dns2;
 
+    @SerializedName(ApiConstants.IP6_DNS1) @Param(description="the first IPv6 DNS for the router")
+    private String ip6Dns1;
+
+    @SerializedName(ApiConstants.IP6_DNS2) @Param(description="the second IPv6 DNS for the router")
+    private String ip6Dns2;
+
     @SerializedName("networkdomain") @Param(description="the network domain for the router")
     private String networkDomain;
 
@@ -338,4 +344,20 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView
     public void addNic(NicResponse nic) {
         this.nics.add(nic);
     }
+    
+	public String getIp6Dns1() {
+		return ip6Dns1;
+	}
+
+	public void setIp6Dns1(String ip6Dns1) {
+		this.ip6Dns1 = ip6Dns1;
+	}
+
+	public String getIp6Dns2() {
+		return ip6Dns2;
+	}
+
+	public void setIp6Dns2(String ip6Dns2) {
+		this.ip6Dns2 = ip6Dns2;
+	}
 }

api/src/org/apache/cloudstack/api/response/ZoneResponse.java

@@ -44,6 +44,12 @@ public class ZoneResponse extends BaseResponse {
     @SerializedName(ApiConstants.DNS2) @Param(description="the second DNS for the Zone")
     private String dns2;
 
+    @SerializedName(ApiConstants.IP6_DNS1) @Param(description="the first IPv6 DNS for the Zone")
+    private String ip6Dns1;
+
+    @SerializedName(ApiConstants.IP6_DNS2) @Param(description="the second IPv6 DNS for the Zone")
+    private String ip6Dns2;
+
     @SerializedName(ApiConstants.INTERNAL_DNS1) @Param(description="the first internal DNS for the Zone")
     private String internalDns1;
 
@@ -176,4 +182,20 @@ public class ZoneResponse extends BaseResponse {
     public void setLocalStorageEnabled(boolean localStorageEnabled) {
         this.localStorageEnabled = localStorageEnabled;
     }
+
+	public String getIp6Dns1() {
+		return ip6Dns1;
+	}
+
+	public void setIp6Dns1(String ip6Dns1) {
+		this.ip6Dns1 = ip6Dns1;
+	}
+
+	public String getIp6Dns2() {
+		return ip6Dns2;
+	}
+
+	public void setIp6Dns2(String ip6Dns2) {
+		this.ip6Dns2 = ip6Dns2;
+	}
 }

server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java

@@ -70,6 +70,8 @@ public class DataCenterJoinDaoImpl extends GenericDaoBase<DataCenterJoinVO, Long
         if ((account == null) || (account.getType() == Account.ACCOUNT_TYPE_ADMIN)) {
             zoneResponse.setDns1(dataCenter.getDns1());
             zoneResponse.setDns2(dataCenter.getDns2());
+            zoneResponse.setIp6Dns1(dataCenter.getIp6Dns1());
+            zoneResponse.setIp6Dns2(dataCenter.getIp6Dns2());
             zoneResponse.setInternalDns1(dataCenter.getInternalDns1());
             zoneResponse.setInternalDns2(dataCenter.getInternalDns2());
             // FIXME zoneResponse.setVlan(dataCenter.get.getVnet());

server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java

@@ -151,6 +151,9 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase<DomainRouterJoinVO,
         routerResponse.setDns1(router.getDns1());
         routerResponse.setDns2(router.getDns2());
 
+        routerResponse.setIp6Dns1(router.getIp6Dns1());
+        routerResponse.setIp6Dns2(router.getIp6Dns2());
+
         routerResponse.setVpcId(router.getVpcUuid());
 
         // set async job

server/src/com/cloud/api/query/vo/DataCenterJoinVO.java

@@ -55,6 +55,12 @@ public class DataCenterJoinVO extends BaseViewVO implements InternalIdentity, Id
     @Column(name="dns2")
     private String dns2 = null;
 
+    @Column(name="ip6_dns1")
+    private String ip6Dns1 = null;
+
+    @Column(name="ip6_dns2")
+    private String ip6Dns2 = null;
+
     @Column(name="internal_dns1")
     private String internalDns1 = null;
 
@@ -280,5 +286,21 @@ public class DataCenterJoinVO extends BaseViewVO implements InternalIdentity, Id
         this.domainPath = domainPath;
     }
 
+	public String getIp6Dns1() {
+		return ip6Dns1;
+	}
+
+	public void setIp6Dns1(String ip6Dns1) {
+		this.ip6Dns1 = ip6Dns1;
+	}
+
+	public String getIp6Dns2() {
+		return ip6Dns2;
+	}
+
+	public void setIp6Dns2(String ip6Dns2) {
+		this.ip6Dns2 = ip6Dns2;
+	}
+
 
 }

server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java

@@ -107,6 +107,11 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
     @Column(name="dns2")
     private String dns2 = null;
 
+    @Column(name="ip6_dns1")
+    private String ip6Dns1 = null;
+
+    @Column(name="ip6_dns2")
+    private String ip6Dns2 = null;
 
     @Column(name="host_id", updatable=true, nullable=true)
     private long hostId;
@@ -971,4 +976,19 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti
 	}
 
 
+	public String getIp6Dns1() {
+		return ip6Dns1;
+	}
+
+	public void setIp6Dns1(String ip6Dns1) {
+		this.ip6Dns1 = ip6Dns1;
+	}
+
+	public String getIp6Dns2() {
+		return ip6Dns2;
+	}
+
+	public void setIp6Dns2(String ip6Dns2) {
+		this.ip6Dns2 = ip6Dns2;
+	}
 }

setup/db/db/schema-40to410.sql

@@ -691,6 +691,8 @@ CREATE VIEW `cloud`.`domain_router_view` AS
         data_center.name data_center_name,
         data_center.dns1 dns1,
         data_center.dns2 dns2,
+        data_center.ip6_dns1 ip6_dns1,
+        data_center.ip6_dns2 ip6_dns2,
         host.id host_id,
         host.uuid host_uuid,
         host.name host_name,
@@ -1617,6 +1619,8 @@ CREATE VIEW `cloud`.`data_center_view` AS
         data_center.description,
         data_center.dns1,
         data_center.dns2,
+        data_center.ip6_dns1,
+        data_center.ip6_dns2,
         data_center.internal_dns1,
         data_center.internal_dns2,
         data_center.guest_network_cidr,