Updated Branches: refs/heads/master cc335e7e0 -> a11dec225
fixing tenant management issues and configuration wizard issues Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a11dec22 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a11dec22 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a11dec22 Branch: refs/heads/master Commit: a11dec225a8125f8ce2356f4bf87e0fa7c87ee14 Parents: cc335e7 Author: rekathiru <[email protected]> Authored: Fri Feb 7 17:09:58 2014 +0530 Committer: rekathiru <[email protected]> Committed: Fri Feb 7 17:09:58 2014 +0530 ---------------------------------------------------------------------- .../console/controllers/checkAvailability.jag | 11 + .../partials/configure_stratos_wizard.hbs | 205 +++++++++++++++++-- .../themes/theme1/partials/tenant_new.hbs | 8 +- .../console/themes/theme1/ui/css/main.css | 50 +++-- .../themes/theme1/ui/js/tenant_management.js | 16 ++ .../console/util/utility.jag | 4 + 6 files changed, 249 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a11dec22/components/org.apache.stratos.manager.console/console/controllers/checkAvailability.jag ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/controllers/checkAvailability.jag b/components/org.apache.stratos.manager.console/console/controllers/checkAvailability.jag new file mode 100644 index 0000000..e2a66ba --- /dev/null +++ b/components/org.apache.stratos.manager.console/console/controllers/checkAvailability.jag @@ -0,0 +1,11 @@ +<% +var log = new Log("controller.manage.tenants"); +var utils = require('/util/utility.jag'); +var domain = request.getParameter("domain").trim(); +var available = utils.consoleAppUtil.checkAvailability(domain); +if(!available) { + print(available); +} else { + print(available); +} +%> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a11dec22/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 25a130c..d00b344 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 @@ -67,7 +67,26 @@ <i class="icons-help icons-small-size"></i> Add at least one {{title}}. <div style="clear: both"></div> - <label for="policy" class="required" style="margin-top:10px;">Policy Configuration</label> + {{#ifCond step "==" 1}} + <label for="policy" class="required" style="margin-top:10px;">Partition Configuration</label> + {{/ifCond}} + + {{#ifCond step "==" 2}} + <label for="policy" class="required" style="margin-top:10px;">Auto Scale Policy Configuration</label> + {{/ifCond}} + + {{#ifCond step "==" 3}} + <label for="policy" class="required" style="margin-top:10px;">Deployment Policy Configuration</label> + {{/ifCond}} + + {{#ifCond step "==" 4}} + <label for="policy" class="required" style="margin-top:10px;">LB cartridge Configuration</label> + {{/ifCond}} + + {{#ifCond step "==" 5}} + <label for="policy" class="required" style="margin-top:10px;">Cartridge Configuration</label> + {{/ifCond}} + <div class="container"> <div class="row"> <div class="col-md-6 padding-remover-left"> @@ -85,26 +104,172 @@ <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> {{/if}} </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" + {{#ifCond step "==" 1}} + <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> + {{/ifCond}} + + {{#ifCond step "==" 2}} + <div class="col-md-6"> + <i class="icons-help"></i> + Example configuration: + <pre> + {"autoscalePolicy": { + "id": "economyPolicy", + "loadThresholds": { + "requestsInFlight": { + "average": "40", + "gradient": "0", + "secondDerivative": "0", + "scaleDownMarginOfGradient": "1.0", + "scaleDownMarginOfSecondDerivative": "0.2" + }, + "memoryConsumption": { + "average": "100", + "gradient": "0", + "secondDerivative": "0", + "scaleDownMarginOfGradient": "1.0", + "scaleDownMarginOfSecondDerivative": "0.2" + }, + "loadAverage": { + "average": "100", + "gradient": "0", + "secondDerivative": "0", + "scaleDownMarginOfGradient": "1.0", + "scaleDownMarginOfSecondDerivative": "0.2" } - ], - "partitionMin": "1", - "partitionMax": "3" - } - } - </pre> - </div> + } + } + } + </pre> + </div> + {{/ifCond}} + + {{#ifCond step "==" 3}} + <div class="col-md-6"> + <i class="icons-help"></i> + Example configuration: + <pre> + {"deploymentPolicy": { + "id": "economyDep", + "partitionGroup": { + "id": "ec2", + "partitionAlgo": "one-after-another", + "partition": [ + { + "id": "P2", + "partitionMax": "3", + "partitionMin": "1" + } + ] + } + } + } + </pre> + </div> + {{/ifCond}} + + {{#ifCond step "==" 4}} + <div class="col-md-6"> + <i class="icons-help"></i> + Example configuration: + <pre> + {"cartridgeDefinitionBean":{ + "type": "lb", + "provider": "apache", + "displayName": "Lb", + "description": "Lb Cartridge", + "version": "1.0", + "host": "stratos.apache.org", + "defaultAutoscalingPolicy": "economyPolicy", + "defaultDeploymentPolicy": "depexp", + "multiTenant": "false", + "portMapping": [ + { + "protocol": "http", + "port": "22", + "proxyPort": "8280" + } + ], + "deployment": { + }, + "iaasProvider": [ + { + "type": "openstack", + "imageId": "RegionOne/9865ed3f-724b-44e1-874f-f759aeceb9ef", + "property": [ + { + "name": "instanceType", + "value": "RegionOne/2" + } + ] + } + ] + } + } + </pre> + </div> + {{/ifCond}} + + {{#ifCond step "==" 5}} + <div class="col-md-6"> + <i class="icons-help"></i> + Example configuration: + <pre> + { "cartridgeDefinitionBean": + { + "type": "php", + "provider": "apache", + "host": "stratos.com", + "displayName": "PHP", + "description": "PHP Cartridge", + "version": "7", + "multiTenant": "false", + "portMapping": [ + { + "protocol": "http", + "port": "80", + "proxyPort": "8280" + } + ], + "deployment": { + }, + "iaasProvider": + [ + { + "type": "openstack", + "imageId": "RegionOne/9865ed3f-724b-44e1-874f-f759aeceb9ef", + "property": [ + { + "name": "instanceType", + "value": "RegionOne/2" + } + ] + } + ] + } + } + </pre> + </div> + {{/ifCond}} </div> <!-- row --> </div> <!-- container --> </form> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a11dec22/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs index 743738e..fed17e3 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/partials/tenant_new.hbs @@ -11,13 +11,15 @@ <form method="post" action="{{url "/controllers/newTenantSubmit.jag" }}"> <div class="h2-wrapper"><h2>Domain Information</h2></div> <label class="required">Domain:</label> - <div class="form-inline"><input name="tenantDomain" type="text" placeholder="example.com"/> <button class="btn btn-default">Check Availability</button></div> + <div class="form-inline"><input name="tenantDomain" id="tenantDomain" type="text" placeholder="example.com"/> <button class="btn btn-default" onclick="checkAvailability()" type="button">Check Availability</button></div> + <div id="domainMessage"></div> <label><input type="checkbox"/> Validate the domain now (Optional)</label> <div class="h2-wrapper"><h2>Usage Plan Information</h2></div> <label class="required">Select usage plan:</label> <select> <option>Enterprise</option> + <option>Demo</option> </select> <a>More Info</a> @@ -38,11 +40,11 @@ <div class="col-md-3 padding-remover-left"> <label class="required">Admin Password:</label> - <input name="adminPassword" type="password"/> + <input name="adminPassword" type="text"/> </div> <div class="col-md-3"> <label class="required">Admin Password (Repeat):</label> - <input type="password"/> + <input type="text"/> </div> <div class="clearfix"></div> http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a11dec22/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css index 66800d9..28e1a3d 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/css/main.css @@ -87,7 +87,7 @@ h2.login-sub-title{ padding-left:40px; } .login-button-wrapper{ - margin:34px 10px 20px; + margin:34px 10px 20px; } div.username-wrapper input.input-username{ height:60px; @@ -321,8 +321,8 @@ h4{ height: 55px; } .sub-menu li.active a{ - background: #f45b00; - color:#fff; + background: #f45b00; + color:#fff; } .sub-menu li span{ display:block; @@ -356,14 +356,14 @@ h4{ background: #ffae00; color:#fff; } -.sub-menu-wizard li a{ - background: #444444; - color:#fff; -} -.non-wizard li a{ - border-left:solid 1px #444; - border-right:solid 1px #efefef; -} +.sub-menu-wizard li a{ + background: #444444; + color:#fff; +} +.non-wizard li a{ + border-left:solid 1px #444; + border-right:solid 1px #efefef; +} .sub-menu-wizard li span{ display:block; padding:15px 10px; @@ -482,15 +482,21 @@ li.dropdown ul.dropdown-menu li a i{ .sub-menu{ font-size: 11px; } -} -label.error{ - color: #be0000; - padding-bottom: 10px; -} -.loginError{ - color: #BE0000; - margin-top: -27px; - position: absolute; - text-align: center; - width: 395px; +} +label.error{ + color: #be0000; + padding-bottom: 10px; +} +.loginError{ + color: #BE0000; + margin-top: -27px; + position: absolute; + text-align: center; + width: 395px; +} +.hasDomain{ + color:green; +} +.noDomain{ + color:red; } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a11dec22/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js index f3b8457..86b94ac 100644 --- a/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js +++ b/components/org.apache.stratos.manager.console/console/themes/theme1/ui/js/tenant_management.js @@ -43,4 +43,20 @@ function manage_one(action,obj){ $('#state').val(action); $('#manageTenantsForm').submit(); } +} + +function checkAvailability() { + var domain = $('#tenantDomain').val(); + console.info(domain); + $.ajax({ + data:{domain:domain}, + url:"/console/controllers/checkAvailability.jag", + success:function(data){ + if(data=="false"){ + $('#domainMessage').show().html('Domain is not available').addClass('noDomain').removeClass('hasDomain'); + }else{ + $('#domainMessage').show().html('Domain is available').addClass('hasDomain').removeClass('noDomain'); + } + } + }) } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a11dec22/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 aa42396..d8785dd 100644 --- a/components/org.apache.stratos.manager.console/console/util/utility.jag +++ b/components/org.apache.stratos.manager.console/console/util/utility.jag @@ -113,6 +113,10 @@ consoleAppUtil = new function(){ return this.send("DELETE","/tenant/" + tenantDomain,{}).data; }; + this.checkAvailability = function(tenantDomain){ + return this.send("POST","/tenant/availability/" + tenantDomain,{}).data; + }; + this.deployPartitionDefinition = function(partitionDefinition){ return this.send("POST","/policy/deployment/partition",partitionDefinition).data; };
