You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ah...@apache.org on 2013/05/20 20:47:24 UTC
[09/50] [abbrv] git commit: updated refs/heads/vmsync to 05cb734
CLOUDSTACK-2529: GlobalLoadBalancerResponse should have the full FQDN
for the global load balanced service
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d2d0398e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d2d0398e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d2d0398e
Branch: refs/heads/vmsync
Commit: d2d0398e3321b819756a537c0b1fab0491e5a3e6
Parents: 565d829
Author: Murali Reddy <mu...@gmail.com>
Authored: Thu May 16 14:45:49 2013 +0530
Committer: Murali Reddy <mu...@gmail.com>
Committed: Thu May 16 15:19:41 2013 +0530
----------------------------------------------------------------------
server/src/com/cloud/api/ApiDBUtils.java | 5 +++++
server/src/com/cloud/api/ApiResponseHelper.java | 3 ++-
2 files changed, 7 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2d0398e/server/src/com/cloud/api/ApiDBUtils.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java
index 94c873e..1afedac 100755
--- a/server/src/com/cloud/api/ApiDBUtils.java
+++ b/server/src/com/cloud/api/ApiDBUtils.java
@@ -1668,4 +1668,9 @@ public class ApiDBUtils {
public static List<? extends LoadBalancer> listSiteLoadBalancers(long gslbRuleId) {
return _gslbService.listSiteLoadBalancers(gslbRuleId);
}
+
+ public static String getDnsNameConfiguredForGslb() {
+ String providerDnsName = _configDao.getValue(Config.CloudDnsName.key());
+ return providerDnsName;
+ }
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2d0398e/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 9a70d95..482594d 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -787,7 +787,8 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setAlgorithm(globalLoadBalancerRule.getAlgorithm());
response.setStickyMethod(globalLoadBalancerRule.getPersistence());
response.setServiceType(globalLoadBalancerRule.getServiceType());
- response.setServiceDomainName(globalLoadBalancerRule.getGslbDomain());
+ response.setServiceDomainName(globalLoadBalancerRule.getGslbDomain() + "."
+ + ApiDBUtils.getDnsNameConfiguredForGslb());
response.setName(globalLoadBalancerRule.getName());
response.setDescription(globalLoadBalancerRule.getDescription());
response.setRegionIdId(globalLoadBalancerRule.getRegion());