remove LB definition from configuration section
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/0d807d9c Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/0d807d9c Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/0d807d9c Branch: refs/heads/4.1.0-test Commit: 0d807d9c1e85a64710fe7bc673631992cae50113 Parents: 6f20cbe Author: Dakshika Jayathilaka <[email protected]> Authored: Wed Dec 10 16:42:23 2014 +0530 Committer: Dakshika Jayathilaka <[email protected]> Committed: Wed Dec 10 16:42:23 2014 +0530 ---------------------------------------------------------------------- .../console/configure_form.jag | 15 --------------- .../controllers/configure/configure_requests.jag | 3 --- .../console/controllers/rest/rest_calls.jag | 12 ------------ 3 files changed, 30 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/0d807d9c/components/org.apache.stratos.manager.console/console/configure_form.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_form.jag b/components/org.apache.stratos.manager.console/console/configure_form.jag index 4464298..58b0651 100644 --- a/components/org.apache.stratos.manager.console/console/configure_form.jag +++ b/components/org.apache.stratos.manager.console/console/configure_form.jag @@ -85,21 +85,6 @@ switch (formtype) { } break; - case "loadbalancer": - list_data = util.RESTCalls.getLbCartridges(); - if (list_data.cartridge && list_data.cartridge.length === 0) { - list_data = null; - }else{ - formDataEdit = list_data.cartridge; - for (specNumber in list_data.cartridge) { - if (list_data.cartridge[specNumber].cartridgeType == elements.action) { - formDataEdit = list_data.cartridge[specNumber]; - } - - } - } - break; - case "cartridges": list_data = util.RESTCalls.getCartridges(); http://git-wip-us.apache.org/repos/asf/stratos/blob/0d807d9c/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag index feb01cd..38717dc 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/configure/configure_requests.jag @@ -33,9 +33,6 @@ try { case "autoscalingpolicies": formSubmit = util.RESTCalls.deployAutoscalePolicyDefinition(formPayload); break; - case "loadbalancer": - formSubmit = util.RESTCalls.deployLbDefinition(formPayload); - break; case "cartridges": formSubmit = util.RESTCalls.deployCartridgeDefinition(formPayload); break; http://git-wip-us.apache.org/repos/asf/stratos/blob/0d807d9c/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag index 77cce58..cfc8fac 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/rest/rest_calls.jag @@ -51,10 +51,6 @@ RESTCalls = new function(){ return this.send("POST","/service/definition",serviceDefinition); }; - this.deployLbDefinition = function(lbDefinition){ - return this.send("POST","/cartridge/definition",lbDefinition); - }; - this.activateTenant = function(tenantDomain){ return this.send("POST","/tenant/activate/" + tenantDomain,{}); }; @@ -146,10 +142,6 @@ RESTCalls = new function(){ return this.sendReceive("GET","/cartridge/available/list",{}); }; - this.getLbCartridges = function(){ - return this.sendReceive("GET","/cartridge/lb",{}); - }; - this.getGroups = function(){ return this.sendReceive("GET","/groups",{}); }; @@ -166,10 +158,6 @@ RESTCalls = new function(){ return this.sendReceive("GET","/cluster/clusterId/" + clusterId,{}); }; - this.getLBClusterInfo = function(){ - return this.sendReceive("GET","/cluster/lb",{}); - }; - this.getClusterInfoWithAlias = function(cartridgeType, alias){ return this.sendReceive("GET","/cluster/" + cartridgeType + "/" + alias,{}); };
