Updated Branches: refs/heads/master a4d4eb409 -> 3bea80658
STRATOS-437 Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/3bea8065 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/3bea8065 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/3bea8065 Branch: refs/heads/master Commit: 3bea806589aaf87622d6f751d72c9b4af678196f Parents: a4d4eb4 Author: Chanaka <chanaka@chanaka-TECRA-M11.(none)> Authored: Wed Feb 12 14:05:52 2014 +0530 Committer: Isuru <[email protected]> Committed: Wed Feb 12 14:42:11 2014 +0530 ---------------------------------------------------------------------- .../console/configure_stratos.jag | 5 +- .../console/configure_stratos_wizard.jag | 3 +- .../console/controllers/wizardSubmit.jag | 3 + .../console/lbs.jag | 20 ----- .../partials/configure_stratos_wizard.hbs | 90 +++++++++++++++----- .../console/themes/theme1/partials/header.hbs | 80 +++-------------- .../console/themes/theme1/partials/lbs.hbs | 88 ------------------- .../theme1/renderers/cartridge_deployments.js | 45 ---------- .../console/themes/theme1/renderers/lbs.js | 47 ---------- .../theme1/renderers/mt_service_deployments.js | 48 ----------- .../theme1/renderers/partition_deployments.js | 46 ---------- .../theme1/renderers/policy_deployments.js | 46 ---------- .../console/util/utility.jag | 8 ++ .../stratos/rest/endpoint/mock/MockContext.java | 10 +++ .../rest/endpoint/mock/StratosTestAdmin.java | 26 +++++- 15 files changed, 133 insertions(+), 432 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/configure_stratos.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_stratos.jag b/components/org.apache.stratos.manager.console/console/configure_stratos.jag index 0c900a3..3fae742 100644 --- a/components/org.apache.stratos.manager.console/console/configure_stratos.jag +++ b/components/org.apache.stratos.manager.console/console/configure_stratos.jag @@ -46,8 +46,9 @@ if(wizard.step == 1){ step_data.splice(i,1); } } -}else if(wizard.step == 6) { - step_data = require('data/mt_service_deployments.json'); +}else if(wizard.step == 6){ + step_data = utils.consoleAppUtil.getServices(); + step_data = step_data.serviceDefinitionBean; } caramel.render({ step_data:step_data, http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag index 4143aed..a612ca3 100644 --- a/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag +++ b/components/org.apache.stratos.manager.console/console/configure_stratos_wizard.jag @@ -39,7 +39,8 @@ if(wizard.step == 1){ } } }else if(wizard.step == 6){ - step_data = require('data/mt_service_deployments.json'); + step_data = utils.consoleAppUtil.getServices(); + step_data = step_data.serviceDefinitionBean; } caramel.render({ step_data:step_data, http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag index 68d434e..42e607e 100755 --- a/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag +++ b/components/org.apache.stratos.manager.console/console/controllers/wizardSubmit.jag @@ -23,6 +23,9 @@ if(parseInt(thisStep) == 5 && policy != "" ){ utils.consoleAppUtil.deployCartridgeDefinition(policy); } + if(parseInt(thisStep) == 6 && policy != "" ){ + utils.consoleAppUtil.deployServiceDefinition(policy); + } } var configuring = session.get("configuring"); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/lbs.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/lbs.jag b/components/org.apache.stratos.manager.console/console/lbs.jag deleted file mode 100644 index b1989c6..0000000 --- a/components/org.apache.stratos.manager.console/console/lbs.jag +++ /dev/null @@ -1,20 +0,0 @@ -<% -var caramel = require('caramel'); -var lbs = require('/data/lbs.json'); -var config_status = require('/data/config_status.json'); - -var utils = require('/util/utility.jag'); -var cartridge_deployments = utils.consoleAppUtil.getCartridges(); -cartridge_deployments = cartridge_deployments.cartridge; -for(var i=0;i<cartridge_deployments.length;i++){ - if(cartridge_deployments[i].cartridgeType != "lb"){ - cartridge_deployments.splice(i,1); - } -} - -caramel.render({ - lbs:lbs, - config_status:config_status, - cartridge_deployments:cartridge_deployments -}); -%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs index 3c303bc..1a888f8 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/configure_stratos_wizard.hbs @@ -37,7 +37,7 @@ </div> {{/if}} {{else}} -{{#ifCond step "==" 6}} +{{#ifCond step "==" 7}} <div class="container content-starter"> <div class="row"> <div class="col-lg-12"> @@ -92,6 +92,10 @@ <label for="policy" class="required" style="margin-top:10px;">Cartridge Configuration</label> {{/ifCond}} + {{#ifCond step "==" 6}} + <label for="policy" class="required" style="margin-top:10px;">MT Service Configuration</label> + {{/ifCond}} + <div class="container"> <div class="row"> <div class="col-md-6 padding-remover-left"> @@ -105,9 +109,9 @@ <button data-step="{{step}}" type="button" class="btn btn-primary" id="wizardNext">Deploy</button> {{else}} <button data-step="{{step}}" type="button" class="btn btn-default" {{#unless wizard_on_2}} disabled="disabled" {{/unless}} id="wizardBack"><< Back</button> - <button data-step="{{step}}" type="button" class="btn {{#unless wizard_on_5}}{{#unless wizard_on_4}}btn-primary{{else}}btn-default{{/unless}}{{else}}btn-default{{/unless}}" id="wizardNext" {{#if wizard_on_5}} disabled="disabled" {{/if}}>Next >></button> + <button data-step="{{step}}" type="button" class="btn {{#unless wizard_on_6}}{{#unless wizard_on_4}}btn-primary{{else}}btn-default{{/unless}}{{else}}btn-default{{/unless}}" id="wizardNext" {{#if wizard_on_6}} disabled="disabled" {{/if}}>Next >></button> {{#ifCond step "==" 4}}<button data-step="{{step}}" type="button" class="btn btn-primary" id="wizardSkip">Skip >></button>{{/ifCond}} - <button data-step="{{step}}" type="button" class="btn {{#if wizard_on_5}}btn-primary{{else}}btn-default{{/if}}" id="wizardFinish" {{#unless wizard_on_5}} disabled="disabled" {{/unless}}>Finish</button> + <button data-step="{{step}}" type="button" class="btn {{#if wizard_on_6}}btn-primary{{else}}btn-default{{/if}}" id="wizardFinish" {{#unless wizard_on_6}} disabled="disabled" {{/unless}}>Finish</button> {{/if}} </div> {{#ifCond step "==" 1}} @@ -276,6 +280,26 @@ </pre> </div> {{/ifCond}} + + + {{#ifCond step "==" 6}} + <div class="col-md-6"> + <i class="icons-help"></i> + Example configuration: + <pre> + { "serviceDefinitionBean": { + "serviceName": "appserver", + "cartridgeType": "as", + "deploymentPolicyName": "isuruh-ec2", + "autoscalingPolicyName": "economyPolicy", + "clusterDomain": "as.isuruh.domain", + "clusterSubDomain": "subdomain", + "tenantRange": "*" + } + } + </pre> + </div> + {{/ifCond}} </div> <!-- row --> </div> <!-- container --> </form> @@ -308,10 +332,9 @@ </div> </div> {{/each}} - {{/ifCond}} - - {{#ifCond step "==" 5}} - {{#each step_data}} + {{else}} + {{#ifCond step "==" 5}} + {{#each step_data}} <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> @@ -326,25 +349,48 @@ </div> </div> </div> - {{/each}} + {{/each}} {{else}} - {{#each step_data}} - <div class="panel panel-default"> - <div class="panel-heading"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{id}}"> - {{id}} - </a> - </h4> + {{#ifCond step "==" 6 }} + {{#each step_data}} + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{serviceName}}"> + {{serviceName}} + </a> + </h4> + </div> + <div id="collapse{{serviceName}}" class="panel-collapse collapse"> + <div class="panel-body"> + <pre>{{json_string}}</pre> + </div> + </div> </div> - <div id="collapse{{id}}" class="panel-collapse collapse"> - <div class="panel-body"> - <pre>{{json_string}}</pre> + {{/each}} + {{else}} + {{#each step_data}} + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{id}}"> + {{id}} + </a> + </h4> + </div> + <div id="collapse{{id}}" class="panel-collapse collapse"> + <div class="panel-body"> + <pre>{{json_string}}</pre> + </div> </div> </div> - </div> - {{/each}} - {{/ifCond}} + {{/each}} + {{/ifCond}} + + {{/ifCond}} + {{/ifCond}} + + </div> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs index 9edce6e..6729e5b 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/header.hbs @@ -87,21 +87,12 @@ </a> </li> - - <li {{#ifCond step "==" 2 }}class="active"{{/ifCond}}> <a href="{{url "/configure_stratos.jag?step=2" }}"> <div class="wizard-number">2</div> <div>Auto scale Policies</div> </a> </li> - <!--li> - <div class="in-active-wizard-item"> - <div class="wizard-number">2</div> - <div>Auto scale Policies</div> - </div> - </li --> - <li {{#ifCond step "==" 3 }}class="active"{{/ifCond}}> <a href="{{url "/configure_stratos.jag?step=3" }}"> @@ -109,12 +100,7 @@ <div>Deployments Policies</div> </a> </li> - <!--li> - <div class="in-active-wizard-item"> - <div class="wizard-number">3</div> - <div>Deployments Policies</div> - </div> - </li--> + <li {{#ifCond step "==" 4 }}class="active"{{/ifCond}}> @@ -123,12 +109,7 @@ <div>LBs</div> </a> </li> - <!--li> - <div class="in-active-wizard-item"> - <div class="wizard-number">4</div> - <div>LBs</div> - </div> - </li--> + <li {{#ifCond step "==" 5 }}class="active"{{/ifCond}}> @@ -137,50 +118,22 @@ <div>Cartridges</div> </a> </li> - <!--li> - <div class="in-active-wizard-item"> - <div class="wizard-number">5</div> - <div>Cartridges</div> - </div> - </li --> - - <!-- - ************************************** - UNCOMMENT WHEN THIS FEATURE IS NEEDED - - Remember to add fix the classes - ************************************* - {{#if wizard_on_6}} - <li class="active"> - <a href="{{url "/configure_stratos_wizard.jag?step=5" }}"> - <div class="wizard-number">6</div> - <div>Multi-Tenant Services</div> - </a> - </li> - <li class="sub-menu-wizard-pointer active-pointer no-background"></li> - {{else}} - <li> - <div class="in-active-wizard-item"> - <div class="wizard-number">6</div> - <div>Multi-Tenant Services</div> - </div> - </li> - <li class="sub-menu-wizard-pointer no-background"></li> - {{/if}} - --> - - </ul> - - </div> - - {{/if}} + <li {{#ifCond step "==" 6 }}class="active"{{/ifCond}}> + <a href="{{url "/configure_stratos.jag?step=6" }}"> + <div class="wizard-number">6</div> + <div>Multi-Tenant Services</div> + </a> + </li> + </ul> + </div> + {{/if}} {{#if wizard_on}} @@ -261,7 +214,7 @@ <div>Cartridges</div> </a> </li> - <li class="sub-menu-wizard-pointer active-pointer no-background"></li> + <li class="sub-menu-wizard-pointer active-pointer {{#unless wizard_on_6}}active-no-background{{/unless}}"></li> {{else}} <li> <div class="in-active-wizard-item"> @@ -269,15 +222,10 @@ <div>Cartridges</div> </div> </li> - <li class="sub-menu-wizard-pointer no-background"></li> + <li class="sub-menu-wizard-pointer"></li> {{/if}} - <!-- - ************************************** - UNCOMMENT WHEN THIS FEATURE IS NEEDED - Remember to add fix the classes - ************************************* {{#if wizard_on_6}} <li class="active"> <a href="{{url "/configure_stratos_wizard.jag?step=6" }}"> @@ -295,7 +243,7 @@ </li> <li class="sub-menu-wizard-pointer no-background"></li> {{/if}} - --> + </ul> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/themes/theme1/partials/lbs.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/lbs.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/lbs.hbs deleted file mode 100644 index a1e4501..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/lbs.hbs +++ /dev/null @@ -1,88 +0,0 @@ -<div class="container content-starter"> - <div class="row"> - <div class="col-lg-12"> - <h1>{{title}}</h1> - </div> - </div> -</div> -<div class="container" id="addItemSection"> - <div class="row"> - <div class="col-md-12"> - <form id="jsonForm" method="post" role="form" action="{{url "/controllers/lbDefinitionSubmit.jag"}}"> - <label for="policy" class="required">LB Configuration</label> - - <div class="container"> - <div class="row"> - <div class="col-md-6 padding-remover-left"> - <textarea name="lb-definition" class="form-control required" rows="11" id="policy"></textarea> - <button type="submit" class="btn btn-primary" id="deployPolicy">Add New LB</button> - </div> - <div class="col-md-6"> - <i class="icons-help"></i> - Example configuration: - <pre> - { - "partition":{ - "id": "P1", - "provider": "ec2", - "property": [ - { - "name": "region", - "value": "ap-southeast-1" - } - ], - "partitionMin": "1", - "partitionMax": "3" - } - } - </pre> - </div> - </div> - - </div> - - - </form> - - </div> - </div> -</div> - -<div class="container"> - - <div class="row"> - <div class="col-md-12"> - - - <div class="panel-group" id="accordion"> - - - {{#each cartridge_deployments }} - <div class="panel panel-default"> - <div class="panel-heading"> - <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#collapse{{key}}"> - {{displayName}} - </a> - </h4> - </div> - <div id="collapse{{key}}" class="panel-collapse collapse"> - <div class="panel-body"> - <pre>{{policy}}</pre> - <textarea style="display:none" class="jsonEditor">{{policy}}</textarea> - <button class="btn btn-primary js_jsonEdit">Edit</button> - <button class="btn btn-primary js_jsonSave" style="display:none">Save</button> - <a class="js_jsonCancel" style="display:none">Cancel</a> - </div> - </div> - </div> - {{/each}} - - - - </div> - </div> - </div> -</div> -<script src="{{url "/themes/theme1/ui/js/utils.js"}}"></script> -<script src="{{url "/themes/theme1/ui/js/configure_stratos.js"}}"></script> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_deployments.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_deployments.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_deployments.js deleted file mode 100644 index 17a5fcf..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/cartridge_deployments.js +++ /dev/null @@ -1,45 +0,0 @@ -var render = function (theme, data, meta, require) { - var create_btn_class = 'btn-important js_handle_click'; - var title = 'Configure Stratos - Partition Deployments'; - if(data.config_status.first_use){ - create_btn_class = "btn-default js_handle_click"; - title = 'Configure Stratos'; - } - theme('index', { - body: [ - { - partial: 'cartridge_deployments', - context: { - title:title, - cartridge_deployments:data.cartridge_deployments, - config_status:data.config_status - } - } - ], - header: [ - { - partial: 'header', - context:{ - title:'Configure Stratos', - button:{ - link:'/', - name:'Deploy New Cartridge', - class_name:create_btn_class - }, - has_help:false, - cartridge_deployments:true, - configure_stratos:true, - config_status:data.config_status - } - } - ], - title:[ - { - partial:'title', - context:{ - title:title - } - } - ] - }); -}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/lbs.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/lbs.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/lbs.js deleted file mode 100644 index 2928b4a..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/lbs.js +++ /dev/null @@ -1,47 +0,0 @@ -var render = function (theme, data, meta, require) { - - var create_btn_class = 'btn-important js_handle_click'; - var title = 'Configure Stratos - LBs'; - if(data.config_status.first_use){ - create_btn_class = "btn-default js_handle_click"; - title = 'Configure Stratos'; - } - theme('index', { - body: [ - { - partial: 'lbs', - context: { - title:title, - lbs:data.lbs, - config_status:data.config_status, - cartridge_deployments:data.cartridge_deployments - } - } - ], - header: [ - { - partial: 'header', - context:{ - title:'Configure Stratos', - button:{ - link:'/', - name:'New LB', - class_name:create_btn_class - }, - has_help:false, - lbs:true, - configure_stratos:true, - config_status:data.config_status - } - } - ], - title:[ - { - partial:'title', - context:{ - title:title - } - } - ] - }); -}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/mt_service_deployments.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/mt_service_deployments.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/mt_service_deployments.js deleted file mode 100644 index df5bfce..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/mt_service_deployments.js +++ /dev/null @@ -1,48 +0,0 @@ -var render = function (theme, data, meta, require) { - for(var i=0;i<data.mt_service_deployments.length;i++){ - data.mt_service_deployments[i].key = data.mt_service_deployments[i].name.replace(/ /g,''); - } - var create_btn_class = 'btn-important js_handle_click'; - var title = 'Configure Stratos - Multi-Tenant Service Deployments'; - if(data.config_status.first_use){ - create_btn_class = "btn-default js_handle_click"; - title = 'Configure Stratos'; - } - theme('index', { - body: [ - { - partial: 'mt_service_deployments', - context: { - title:title, - mt_service_deployments:data.mt_service_deployments, - config_status:data.config_status - } - } - ], - header: [ - { - partial: 'header', - context:{ - title:'Configure Stratos', - button:{ - link:'/', - name:'Deploy New Multi-Tenant Service', - class_name:create_btn_class - }, - has_help:false, - mt_service_deployments:true, - configure_stratos:true, - config_status:data.config_status - } - } - ], - title:[ - { - partial:'title', - context:{ - title:title - } - } - ] - }); -}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/partition_deployments.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/partition_deployments.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/partition_deployments.js deleted file mode 100644 index 77b8ae5..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/partition_deployments.js +++ /dev/null @@ -1,46 +0,0 @@ -var render = function (theme, data, meta, require) { - - var create_btn_class = 'btn-important js_handle_click'; - var title = 'Configure Stratos - Partition Deployments'; - if(data.config_status.first_use){ - create_btn_class = "btn-default js_handle_click"; - title = 'Configure Stratos'; - } - theme('index', { - body: [ - { - partial: 'partition_deployments', - context: { - title:title, - partition_deployments:data.partition_deployments, - config_status:data.config_status - } - } - ], - header: [ - { - partial: 'header', - context:{ - title:'Configure Stratos', - button:{ - link:'/', - name:'Deploy New Partition', - class_name:create_btn_class - }, - has_help:false, - partition_deployments:true, - configure_stratos:true, - config_status:data.config_status - } - } - ], - title:[ - { - partial:'title', - context:{ - title:title - } - } - ] - }); -}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/policy_deployments.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/policy_deployments.js b/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/policy_deployments.js deleted file mode 100644 index f87f250..0000000 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/renderers/policy_deployments.js +++ /dev/null @@ -1,46 +0,0 @@ -var render = function (theme, data, meta, require) { - var create_btn_class = 'btn-important'; - var title = 'Configure Stratos - Policy Deployments'; - if(data.config_status.first_use){ - create_btn_class = "btn-default js_handle_click"; - title = 'Configure Stratos'; - } - theme('index', { - body: [ - { - partial: 'policy_deployments', - context: { - title:title, - policy_deployments:data.policy_deployments, - policy_autoscale:data.policy_autoscale, - config_status:data.config_status - } - } - ], - header: [ - { - partial: 'header', - context:{ - title:'Configure Stratos', - button:{ - link:'/', - name:'Deploy New Policy', - class_name:create_btn_class - }, - has_help:false, - policy_deployments:true, - configure_stratos:true, - config_status:data.config_status - } - } - ], - title:[ - { - partial:'title', - context:{ - title:title - } - } - ] - }); -}; \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/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 6b390f3..58a4004 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -93,10 +93,18 @@ consoleAppUtil = new function(){ return this.sendReceive("GET","/tenant/list",{}).data; }; + this.getServices = function(){ + return this.sendReceive("GET","/service",{}).data; + }; + this.deployCartridgeDefinition = function(cartridgeDefinition){ return this.send("POST","/cartridge/definition",cartridgeDefinition).data; }; + this.deployServiceDefinition = function(serviceDefinition){ + return this.send("POST","/service/definition",serviceDefinition).data; + }; + this.deployLbDefinition = function(lbDefinition){ return this.send("POST","/cartridge/definition",lbDefinition).data; }; http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java index 65ca093..daafc91 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/MockContext.java @@ -25,6 +25,7 @@ import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean; +import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean; import org.apache.stratos.rest.endpoint.exception.RestAPIException; import java.util.*; @@ -39,6 +40,7 @@ public class MockContext { private Map<String,Partition> partitionMap = new HashMap<String, Partition>(); private Map<String,AutoscalePolicy> autoscalePolicyMap = new HashMap<String, AutoscalePolicy>(); private Map<String,DeploymentPolicy> deploymentPolicyMap = new HashMap<String, DeploymentPolicy>(); + private Map<String,ServiceDefinitionBean> serviceDefinitionMap = new HashMap<String, ServiceDefinitionBean>(); private Set<Cartridge> temp = new HashSet<Cartridge>(); @@ -226,6 +228,14 @@ public class MockContext { public DeploymentPolicy getDeploymentPolicies(String deploymentPolicyId) { return deploymentPolicyMap.get(deploymentPolicyId); } + public boolean deployService(ServiceDefinitionBean serviceDefinitionBean) { + serviceDefinitionMap.put(serviceDefinitionBean.getCartridgeType(),serviceDefinitionBean); + return true; + + } + public ServiceDefinitionBean[] getServices() { + return serviceDefinitionMap.values().toArray(new ServiceDefinitionBean[0]); + } public Partition[] getPartitions(String deploymentPolicyId, String partitionGroupId) { DeploymentPolicy deploymentPolicy = deploymentPolicyMap.get(deploymentPolicyId); http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/3bea8065/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java index 491a424..16ab8d5 100644 --- a/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java +++ b/components/org.apache.stratos.rest.endpoint/src/main/java/org/apache/stratos/rest/endpoint/mock/StratosTestAdmin.java @@ -34,6 +34,7 @@ import org.apache.stratos.rest.endpoint.bean.autoscaler.partition.PartitionGroup import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.autoscale.AutoscalePolicy; import org.apache.stratos.rest.endpoint.bean.autoscaler.policy.deployment.DeploymentPolicy; import org.apache.stratos.rest.endpoint.bean.cartridge.definition.CartridgeDefinitionBean; +import org.apache.stratos.rest.endpoint.bean.cartridge.definition.ServiceDefinitionBean; import org.apache.stratos.rest.endpoint.exception.RestAPIException; import javax.servlet.http.HttpServletRequest; @@ -197,6 +198,29 @@ public class StratosTestAdmin { MockContext.getInstance().deactivateTenant(tenantDomain); } + @POST + @Path("/service/definition") + @Produces("application/json") + @Consumes("application/json") + @AuthorizationAction("/permission/protected/manage/monitor/tenants") + @SuperTenantService(true) + public boolean deployService(ServiceDefinitionBean serviceDefinitionBean) + throws RestAPIException { + + log.info("Service definition request.. : " + serviceDefinitionBean.getServiceName()); + return MockContext.getInstance().deployService(serviceDefinitionBean); + } + @GET + @Path("/service") + @Produces("application/json") + @Consumes("application/json") + @AuthorizationAction("/permission/protected/manage/monitor/tenants") + public ServiceDefinitionBean[] getServices () throws RestAPIException { + return MockContext.getInstance().getServices(); + + } + + @POST @Path("/cartridge/definition/") @Produces("application/json") @@ -291,7 +315,7 @@ public class StratosTestAdmin { @AuthorizationAction("/permission/protected/manage/monitor/tenants") public Partition[] getPartitions (@PathParam("deploymentPolicyId") String deploymentPolicyId, @PathParam("partitionGroupId") String partitionGroupId) throws RestAPIException { - return MockContext.getInstance().getPartitions(deploymentPolicyId,partitionGroupId); + return MockContext.getInstance().getPartitions(deploymentPolicyId, partitionGroupId); }
