Repository: incubator-stratos Updated Branches: refs/heads/master 866d93360 -> 42fec6c33
Adding autoscalePolicy and depolymentPolicy for MT cartridges Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/c83d233a Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/c83d233a Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/c83d233a Branch: refs/heads/master Commit: c83d233ae832cce1609f32ff911762ee5c76f11a Parents: b186401 Author: Chanaka Jayasena <[email protected]> Authored: Mon Mar 31 19:19:57 2014 +0530 Committer: Chanaka Jayasena <[email protected]> Committed: Mon Mar 31 19:19:57 2014 +0530 ---------------------------------------------------------------------- .../console/subscribe_cartridge.jag | 4 ++++ .../console/themes/theme1/partials/subscribe_cartridge.hbs | 7 +++++-- .../console/themes/theme1/renderers/subscribe_cartridge.js | 1 + .../console/util/utility.jag | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c83d233a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag index bdf2ef2..72dfacf 100644 --- a/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag +++ b/components/org.apache.stratos.manager.console/console/subscribe_cartridge.jag @@ -6,6 +6,7 @@ var utils = require('/util/utility.jag'); var type = request.getParameter('cartridgeType'); var autoScalePolicies = utils.consoleAppUtil.getAutoScalePolicies(); var deploymentPolicies = utils.consoleAppUtil.getApplicableDeploymentPolicies(type); +var mtServiceInfo = utils.consoleAppUtil.getServiceInfo(type); var cartridge = utils.consoleAppUtil.getSingleTenantCartridgeInfo(type); if(autoScalePolicies.Error != undefined ){ @@ -14,6 +15,8 @@ if(autoScalePolicies.Error != undefined ){ error.push(deploymentPolicies.Error); }if(cartridge.Error != undefined ){ error.push(cartridge.Error); +}if(mtServiceInfo.Error != undefined ){ + error.push(mtServiceInfo.Error); } @@ -21,6 +24,7 @@ caramel.render({ cartridge:cartridge, autoScalePolicies:autoScalePolicies, deploymentPolicies:deploymentPolicies, + mtServiceInfo:mtServiceInfo, error:error }); %> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c83d233a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs index 0cd3518..492c289 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/subscribe_cartridge.hbs @@ -67,7 +67,10 @@ {{/ifCond}} - {{#unless cartridge.multiTenant}} + {{#if cartridge.multiTenant}} + <input type="hidden" value="{{autoscalingPolicyName}}" name="autoscalePolicy" /> + <input type="hidden" value="{{deploymentPolicyName}}" name="deploymentPolicy" /> + {{else}} <div class="form-group"> <label class="required">Autoscale Policy:</label> <div class="form-inline"> @@ -115,7 +118,7 @@ </div> </div> - {{/unless}} + {{/if}} {{#if cartridge.persistence.persistanceRequired}} {{#unless cartridge.multiTenant}} http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c83d233a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js index 5f7fc07..f87adcf 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/subscribe_cartridge.js @@ -11,6 +11,7 @@ var render = function (theme, data, meta, require) { context: { autoScalePolicies:data.autoScalePolicies.autoscalePolicy, deploymentPolicies:data.deploymentPolicies.deploymentPolicy, + mtServiceInfo:data.mtServiceInfo.serviceDefinitionBean, cartridge:cartridge, cartridgeType:meta.request.getParameter('cartridgeType') } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/c83d233a/components/org.apache.stratos.manager.console/console/util/utility.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/util/utility.jag b/components/org.apache.stratos.manager.console/console/util/utility.jag index 3502bb5..8597271 100755 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -170,6 +170,10 @@ consoleAppUtil = new function(){ return this.sendReceive("GET","/cartridge/available/info/" + cartridgeType,{}).data; }; + this.getServiceInfo = function(cartridgeType){ + return this.sendReceive("GET","/service/" + cartridgeType,{}).data; + }; + this.getPolicyAutoScale = function(){ return this.sendReceive("GET","/policy/autoscale",{}).data; };
