Updated Branches: refs/heads/master 9a271063a -> f50cf4ab6
policy deployment integration Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/f50cf4ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/f50cf4ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/f50cf4ab Branch: refs/heads/master Commit: f50cf4ab6726cb46b9832675df487800d663a5cf Parents: 9a27106 Author: Pradeep Fernando <[email protected]> Authored: Mon Jan 20 15:09:00 2014 +0530 Committer: Pradeep Fernando <[email protected]> Committed: Mon Jan 20 15:09:00 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/policyDefinitionSubmit.jag | 9 +++++++++ .../console/themes/theme1/partials/policy_deployments.hbs | 6 +++--- .../console/util/utility.jag | 7 ++++++- 3 files changed, 18 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f50cf4ab/components/org.apache.stratos.manager.console/console/controllers/policyDefinitionSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/policyDefinitionSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/policyDefinitionSubmit.jag index a47d468..538bdf2 100644 --- a/components/org.apache.stratos.manager.console/console/controllers/policyDefinitionSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/policyDefinitionSubmit.jag @@ -3,6 +3,15 @@ var log = new Log("controller.policyDefinitionSubmit"); var utils = require('/util/utility.jag'); var policyDefinition = request.getParameter("policy-definition").trim(); + var policyType = request.getParameter("policyType").trim(); + if(policyType == "autoscale-policy"){ + utils.consoleAppUtil.deployAutoscalePolicyDefinition(policyDefinition); + }else if(policyType == "deployment-policy"){ + utils.consoleAppUtil.deployDeploymentPolicyDefinition(policyDefinition); + }else{ + // exception + } + utils.consoleAppUtil.deployPolicyDefinition(policyDefinition); response.sendRedirect(request.getContextPath() + '/policy_deployments.jag'); }()); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f50cf4ab/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs index e70039a..d0f3919 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/policy_deployments.hbs @@ -9,7 +9,7 @@ <div class="row"> <div class="col-md-12"> <h2>Deploy New Policy</h2> - <form method="post" role="form" action="{{url "/controllers/partitionDefintionSubmit.jag"}}"> + <form method="post" role="form" action="{{url "/controllers/policyDefintionSubmit.jag"}}"> <div class="container"> @@ -20,10 +20,10 @@ <div class="form-inline" style="padding-bottom: 10px;"> <div class="radio"> <label style="padding-right: 20px;"> - <input name="policyType" type="radio" checked="checked"> Auto scale + <input name="policyType" value="autoscale-policy" type="radio" checked="checked"> Auto scale </label> <label> - <input name="policyType" type="radio"> Deployment + <input name="policyType" value="deployment-policy" type="radio"> Deployment </label> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/f50cf4ab/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 abed6d8..87384e1 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -105,10 +105,15 @@ consoleAppUtil = new function(){ return this.send("POST","/policy/deployment/partition",partitionDefinition).data; }; - this.deployPolicyDefinition = function(policyDefinition){ + this.deployDeploymentPolicyDefinition = function(policyDefinition){ return this.send("POST","/policy/deployment",policyDefinition).data; }; + this.deployAutoscalePolicyDefinition = function(policyDefinition){ + return this.send("POST","/policy/autoscale",policyDefinition).data; + }; + + this.subscribeToCartridge = function(cartridgeBeanInfo){ return this.sendReceive("POST","/cartridge/subscribe", cartridgeBeanInfo).data; }
