New drop-down menu to choose LB domains when creating a new LB

Daniel Vega · Daniel Vega · commit 700a017eea51 · 2015-01-19T16:56:41.000-02:00
diff --git a/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/api/GloboNetworkCapabilitiesResponse.java b/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/api/GloboNetworkCapabilitiesResponse.java
@@ -18,6 +18,8 @@
 
 import org.apache.cloudstack.api.BaseResponse;
 
+import java.util.List;
+
 import com.cloud.serializer.Param;
 import com.google.gson.annotations.SerializedName;
 
@@ -35,6 +37,10 @@ public class GloboNetworkCapabilitiesResponse extends BaseResponse {
     @Param(description = "is GloboNetwork provider enabled in any zone")
     private Boolean enabled;
 
+    @SerializedName("allowedLbSuffixes")
+    @Param(description = "allowed domain suffixes for load balancers in GloboNetwork")
+    private List<String> allowedLbSuffixes;
+
     public String getDomainSuffix() {
         return domainSuffix;
     }
@@ -55,4 +61,12 @@ public void setEnabled(boolean enabled) {
         this.enabled = enabled;
     }
 
+    public List<String> getAllowedLbSuffixes() {
+        return allowedLbSuffixes;
+    }
+
+    public void setAllowedLbSuffixes(List<String> allowedLbSuffixes) {
+        this.allowedLbSuffixes = allowedLbSuffixes;
+    }
+
 }
diff --git a/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/api/ListGloboNetworkCapabilitiesCmd.java b/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/api/ListGloboNetworkCapabilitiesCmd.java
@@ -45,6 +45,7 @@ public void execute() {
         response.setDomainSuffix(_globoNetworkService.getDomainSuffix());
         response.setSupportCustomNetworkDomain(_globoNetworkService.isSupportedCustomNetworkDomain());
         response.setEnabled(enabledInZones != null && !enabledInZones.isEmpty());
+        response.setAllowedLbSuffixes(_globoNetworkService.listAllowedLbSuffixes());
         response.setObjectName("globoNetworkCapability");
         response.setResponseName(getCommandName());
         this.setResponseObject(response);
diff --git a/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/manager/GloboNetworkManager.java b/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/manager/GloboNetworkManager.java
@@ -2215,4 +2215,21 @@ public List<DataCenter> getAllZonesThatProviderAreEnabled() {
         }
         return zonesEnabled;
     }
+
+    @Override
+    public List<String> listAllowedLbSuffixes() {
+        String allowedDomainsOpt = GloboNetworkLBAllowedSuffixes.value();
+        List<String> allowedDomains = new ArrayList<String>();
+
+        for (String allowedDomain : allowedDomainsOpt.split(",")) {
+            // Remove any whitespaces
+            allowedDomain = allowedDomain.trim();
+            if (allowedDomainsOpt != null && !allowedDomainsOpt.equals("")) {
+                // Insert the '.' before the domain, if it's not there yet
+                allowedDomain = allowedDomain.startsWith(".") ? allowedDomain : "." + allowedDomain;
+                allowedDomains.add(allowedDomain);
+            }
+        }
+        return allowedDomains;
+    }
 }
diff --git a/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/manager/GloboNetworkService.java b/plugins/network-elements/globonetwork/src/com/globo/globonetwork/cloudstack/manager/GloboNetworkService.java
@@ -213,6 +213,8 @@ public Network validateNic(NicProfile nicProfile, VirtualMachineProfile vm, Netw
 
     public List<DataCenter> getAllZonesThatProviderAreEnabled();
 
+    public List<String> listAllowedLbSuffixes();
+
     public boolean destroyGloboNetwork(long networkId, boolean forced);
 
     /**
diff --git a/ui/scripts/loadbalancer.js b/ui/scripts/loadbalancer.js
@@ -760,11 +760,37 @@
                     createForm: {
                         fields: {
                             name: {
-                                label: 'label.fqdn',
+                                label: 'label.name',
                                 validation: {
                                     required: true
                                 }
                             },
+                            lbdomain: {
+                                label: 'LB Domain',
+                                validation: {
+                                    required: true
+                                },
+                                select: function(args) {
+                                    var lbdomains = [];
+                                    $.ajax({
+                                        url: createURL("listGloboNetworkCapabilities"),
+                                        dataType: "json",
+                                        async: false,
+                                        success: function(json) {
+                                            var response = json.listglobonetworkcapabilitiesresponse;
+                                            $(json.listglobonetworkcapabilitiesresponse.globoNetworkCapability.allowedLbSuffixes).each(function() {
+                                                lbdomains.push({id: this.valueOf(), description: this.valueOf()});
+                                            });
+                                        },
+                                        error: function(json) {
+                                            args.response.error(parseXMLHttpResponse(json));
+                                        }
+                                    });
+                                    args.response.success({
+                                        data: lbdomains
+                                    });
+                                }
+                            },
                             publicport: {
                                 label: 'label.public.port',
                                 validation: {
@@ -1042,7 +1068,7 @@
 
                                 var data = {
                                     algorithm: args.data.algorithm,
-                                    name: args.data.name,
+                                    name: args.data.name + args.data.lbdomain,
                                     privateport: args.data.privateport,
                                     publicport: args.data.publicport,
                                     openfirewall: false,
