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/26 04:12:31 UTC
[1/2] git commit: refs/heads/master - CLOUDSTACK-1332: Add ip6dns to
zone and domainrouter response
CLOUDSTACK-1332: Add ip6dns to zone and domainrouter response
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cf90b6cd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cf90b6cd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cf90b6cd
Branch: refs/heads/master
Commit: cf90b6cd10050e58c2444b0c3e6ea437d01d71f4
Parents: 596e940
Author: Sheng Yang <sh...@citrix.com>
Authored: Mon Feb 25 16:55:47 2013 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Mon Feb 25 19:12:09 2013 -0800
----------------------------------------------------------------------
.../api/response/DomainRouterResponse.java | 22 +++++++++++++++
.../cloudstack/api/response/ZoneResponse.java | 22 +++++++++++++++
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 2 +
.../api/query/dao/DomainRouterJoinDaoImpl.java | 3 ++
.../com/cloud/api/query/vo/DataCenterJoinVO.java | 22 +++++++++++++++
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 20 +++++++++++++
setup/db/db/schema-40to410.sql | 4 +++
7 files changed, 95 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf90b6cd/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
index c9aa197..274e7a5 100644
--- a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java
+++ b/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;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf90b6cd/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java b/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
index ab99e2d..2ebb15a 100644
--- a/api/src/org/apache/cloudstack/api/response/ZoneResponse.java
+++ b/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;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf90b6cd/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
index 667d855..4c8b545 100644
--- a/server/src/com/cloud/api/query/dao/DataCenterJoinDaoImpl.java
+++ b/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());
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf90b6cd/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 22e3bad..cdb859e 100644
--- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
+++ b/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
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf90b6cd/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java b/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
index 67a3f27..84becf2 100644
--- a/server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
+++ b/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;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf90b6cd/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 606ec15..b04120a 100644
--- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java
+++ b/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;
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cf90b6cd/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index 7c11c56..59b2a7d 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/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,