shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-30 22:50:10 +03:00
Code Releases Wiki Activity

B #4844: Refactor sched & elasticity policies table headers

Browse Source
This commit is contained in:
Carlos Martín 2016-10-05 18:46:34 +02:00
parent 5556cfa7ba
commit c9c41f2f02
4 changed files with 101 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/roleInfo.hbs
View File

@ -77,39 +77,7 @@
<br>
{{#if role.elasticity_policies}}
<table class="dataTable policies_table">
<thead style="background:#dfdfdf">
<tr>
<th colspan="7">{{tr "Elasticity policies"}}</th>
</tr>
</thead>
<thead>
<tr>
<th class="has-tip" title="{{tr "Type of adjustment."}}<br><br>
{{tr "CHANGE: Add/subtract the given number of VMs."}}<br>
{{tr "CARDINALITY: Set the cardinality to the given number."}}<br>
{{tr "PERCENTAGE_CHANGE: Add/subtract the given percentage to the current cardinality."}}
" style="width:14%">{{tr "Type"}}
</th>
<th class="has-tip" title="{{tr "Positive or negative adjustment. Its meaning depends on 'type'"}}<br><br>
{{tr "CHANGE: -2, will subtract 2 VMs from the role"}}<br>
{{tr "CARDINALITY: 8, will set cardinality to 8"}}<br>
{{tr "PERCENTAGE_CHANGE: 20, will increment cardinality by 20%"}}" style="width:12%">{{tr "Adjust"}}
</th>
<th class="has-tip" title="{{tr "Optional parameter for PERCENTAGE_CHANGE adjustment type."}}<br>
{{tr " If present, the policy will change the cardinality by at least the number of VMs set in this attribute."}}" style="width:9%">{{tr "Min"}}
</th>
<th class="has-tip" title="{{tr "Expression to trigger the elasticity"}}<br><br>
{{tr "Example: ATT < 20"}}" style="width:30%">{{tr "Expression"}}
</th>
<th class="has-tip" title="{{tr "Number of periods that the expression must be true before the elasticity is triggered"}}" style="width:8%">#
</th>
<th class="has-tip" title="{{tr "Duration, in seconds, of each period in '# Periods'"}}" style="width:9%">{{tr "Period"}}
</th>
<th class="has-tip" title="{{tr "Cooldown period duration after a scale operation, in seconds"}}" style="width:15%">{{tr "Cooldown"}}
</th>
<th style="width:3%"></th>
</tr>
</thead>
{{> tabs/oneflow-templates-tab/utils/role-tab/elasticity-thead}}
<tbody>
{{#each role.elasticity_policies}}
<tr>
@ -138,35 +106,7 @@
<br>
{{#if role.scheduled_policies}}
<table class="dataTable policies_table">
<thead style="background:#dfdfdf">
<tr>
<th colspan="5">{{tr "Scheduled policies"}}</th>
</tr>
</thead>
<thead>
<tr>
<th class="has-tip" title="{{tr "Type of adjustment."}}
{{tr "CHANGE: Add/subtract the given number of VMs."}}
{{tr "CARDINALITY: Set the cardinality to the given number."}}
{{tr "PERCENTAGE_CHANGE: Add/subtract the given percentage to the current cardinality."}}" style="width:14%">{{tr "Type"}}
</th>
<th class="has-tip" title="{{tr "Positive or negative adjustment. Its meaning depends on 'type'"}}
{{tr "CHANGE: -2, will subtract 2 VMs from the role"}}
{{tr "CARDINALITY: 8, will set cardinality to 8"}}
{{tr "PERCENTAGE_CHANGE: 20, will increment cardinality by 20%"}}" style="width:12%">{{tr "Adjust"}}
</th>
<th class="has-tip" title="{{tr "Optional parameter for PERCENTAGE_CHANGE adjustment type. If present, the policy will change the cardinality by at least the number of VMs set in this attribute."}}" style="width:9%">{{tr "Min"}}
</th>
<th class="has-tip" title="{{tr "Recurrence: Time for recurring adjustments. Time is specified with the Unix cron syntax"}}
{{tr "Start time: Exact time for the adjustment"}}" style="width:28%">{{tr "Time format"}}
</th>
<th class="has-tip" title="{{tr "Time expression depends on the the time format selected"}}
{{tr "Recurrence: Time for recurring adjustments. Time is specified with the Unix cron syntax"}}
{{tr "Start time: Exact time for the adjustment"}}" style="width:33%">{{tr "Time expression"}}
</th>
<th style="width:3%"></th>
</tr>
</thead>
{{> tabs/oneflow-templates-tab/utils/role-tab/sched-thead}}
<tbody>
{{#each role.scheduled_policies}}
<tr>

50
src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/elasticity-thead.hbs Normal file
View File

@ -0,0 +1,50 @@
{{! -------------------------------------------------------------------------- }}
{{! Copyright 2002-2016, OpenNebula Project, OpenNebula Systems }}
{{! }}
{{! Licensed under the Apache License, Version 2.0 (the "License"); you may }}
{{! not use this file except in compliance with the License. You may obtain }}
{{! a copy of the License at }}
{{! }}
{{! http://www.apache.org/licenses/LICENSE-2.0 }}
{{! }}
{{! Unless required by applicable law or agreed to in writing, software }}
{{! distributed under the License is distributed on an "AS IS" BASIS, }}
{{! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. }}
{{! See the License for the specific language governing permissions and }}
{{! limitations under the License. }}
{{! -------------------------------------------------------------------------- }}
<thead style="background:#dfdfdf">
<tr>
<th colspan="8">
{{tr "Elasticity policies"}}
</th>
</tr>
</thead>
<thead>
<tr>
<th class="has-tip" title="{{tr "Type of adjustment."}}
{{tr "CHANGE: Add/subtract the given number of VMs."}}
{{tr "CARDINALITY: Set the cardinality to the given number."}}
{{tr "PERCENTAGE_CHANGE: Add/subtract the given percentage to the current cardinality."}}" style="width:14%">{{tr "Type"}}
</th>
<th class="has-tip" title="{{tr "Positive or negative adjustment. Its meaning depends on 'type'"}}
{{tr "CHANGE: -2, will subtract 2 VMs from the role"}}
{{tr "CARDINALITY: 8, will set cardinality to 8"}}
{{tr "PERCENTAGE_CHANGE: 20, will increment cardinality by 20%"}}" style="width:12%">{{tr "Adjust"}}
</th>
<th class="has-tip" title="{{tr "Optional parameter for PERCENTAGE_CHANGE adjustment type."}}
{{tr " If present, the policy will change the cardinality by at least the number of VMs set in this attribute."}}" style="width:9%">{{tr "Min"}}
</th>
<th class="has-tip" title="{{tr "Expression to trigger the elasticity"}}
{{tr "Example: ATT < 20"}}" style="width:30%">{{tr "Expression"}}
</th>
<th class="has-tip" title="{{tr "Number of periods that the expression must be true before the elasticity is triggered"}}" style="width:8%">#
</th>
<th class="has-tip" title="{{tr "Duration, in seconds, of each period in '# Periods'"}}" style="width:9%">{{tr "Period"}}
</th>
<th class="has-tip" title="{{tr "Cooldown period duration after a scale operation, in seconds"}}" style="width:15%">{{tr "Cooldown"}}
</th>
<th style="width:3%"></th>
</tr>
</thead>

68
src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/html.hbs
View File

@ -93,41 +93,7 @@
<div class="row">
<div class="large-12 columns">
<table id="elasticity_policies_table" class="policies_table dataTable">
<thead style="background:#dfdfdf">
<tr>
<th colspan="8" style="font-size: 16px !important">
{{tr "Elasticity policies"}}
</th>
</tr>
</thead>
<thead>
<tr>
<th class="has-tip" title="{{tr "Type of adjustment."}}
{{tr "CHANGE: Add/subtract the given number of VMs."}}
{{tr "CARDINALITY: Set the cardinality to the given number."}}
{{tr "PERCENTAGE_CHANGE: Add/subtract the given percentage to the current cardinality."}}
" style="width:14%">{{tr "Type"}}
</th>
<th class="has-tip" title="{{tr "Positive or negative adjustment. Its meaning depends on 'type'"}}
{{tr "CHANGE: -2, will subtract 2 VMs from the role"}}
{{tr "CARDINALITY: 8, will set cardinality to 8"}}
{{tr "PERCENTAGE_CHANGE: 20, will increment cardinality by 20%"}}" style="width:12%">{{tr "Adjust"}}
</th>
<th class="has-tip" title="{{tr "Optional parameter for PERCENTAGE_CHANGE adjustment type."}}
{{tr " If present, the policy will change the cardinality by at least the number of VMs set in this attribute."}}" style="width:9%">{{tr "Min"}}
</th>
<th class="has-tip" title="{{tr "Expression to trigger the elasticity"}}
{{tr "Example: ATT < 20"}}" style="width:30%">{{tr "Expression"}}
</th>
<th class="has-tip" title="{{tr "Number of periods that the expression must be true before the elasticity is triggered"}}" style="width:8%">#
</th>
<th class="has-tip" title="{{tr "Duration, in seconds, of each period in '# Periods'"}}" style="width:9%">{{tr "Period"}}
</th>
<th class="has-tip" title="{{tr "Cooldown period duration after a scale operation, in seconds"}}" style="width:15%">{{tr "Cooldown"}}
</th>
<th style="width:3%"></th>
</tr>
</thead>
{{> ./elasticity-thead}}
<tbody id="elasticity_policies_tbody">
</tbody>
<tfoot>
@ -144,37 +110,7 @@
<div class="row">
<div class="large-12 columns">
<table id="scheduled_policies_table" class="policies_table dataTable">
<thead style="background:#dfdfdf">
<tr>
<th colspan="6" style="font-size: 16px !important">
{{tr "Scheduled policies"}}
</th>
</tr>
</thead>
<thead>
<tr>
<th class="has-tip" title="{{tr "Type of adjustment."}}
{{tr "CHANGE: Add/subtract the given number of VMs."}}
{{tr "CARDINALITY: Set the cardinality to the given number."}}
{{tr "PERCENTAGE_CHANGE: Add/subtract the given percentage to the current cardinality."}}" style="width:14%">{{tr "Type"}}
</th>
<th class="has-tip" title="{{tr "Positive or negative adjustment. Its meaning depends on 'type'"}}
{{tr "CHANGE: -2, will subtract 2 VMs from the role"}}
{{tr "CARDINALITY: 8, will set cardinality to 8"}}
{{tr "PERCENTAGE_CHANGE: 20, will increment cardinality by 20%"}}" style="width:12%">{{tr "Adjust"}}
</th>
<th class="has-tip" title="{{tr "Optional parameter for PERCENTAGE_CHANGE adjustment type. If present, the policy will change the cardinality by at least the number of VMs set in this attribute."}}" style="width:9%">{{tr "Min"}}
</th>
<th class="has-tip" title="{{tr "Recurrence: Time for recurring adjustments. Time is specified with the Unix cron syntax"}}
{{tr "Start time: Exact time for the adjustment"}}" style="width:28%">{{tr "Time format"}}
</th>
<th class="has-tip" title="{{tr "Time expression depends on the the time format selected"}}
{{tr "Recurrence: Time for recurring adjustments. Time is specified with the Unix cron syntax"}}
{{tr "Start time: Exact time for the adjustment"}}" style="width:33%">{{tr "Time expression"}}
</th>
<th style="width:3%"></th>
</tr>
</thead>
{{> ./sched-thead}}
<tbody id="scheduled_policies_tbody">
</tbody>
<tfoot>

47
src/sunstone/public/app/tabs/oneflow-templates-tab/utils/role-tab/sched-thead.hbs Normal file
View File

@ -0,0 +1,47 @@
{{! -------------------------------------------------------------------------- }}
{{! Copyright 2002-2016, OpenNebula Project, OpenNebula Systems }}
{{! }}
{{! Licensed under the Apache License, Version 2.0 (the "License"); you may }}
{{! not use this file except in compliance with the License. You may obtain }}
{{! a copy of the License at }}
{{! }}
{{! http://www.apache.org/licenses/LICENSE-2.0 }}
{{! }}
{{! Unless required by applicable law or agreed to in writing, software }}
{{! distributed under the License is distributed on an "AS IS" BASIS, }}
{{! WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. }}
{{! See the License for the specific language governing permissions and }}
{{! limitations under the License. }}
{{! -------------------------------------------------------------------------- }}
<thead style="background:#dfdfdf">
<tr>
<th colspan="6">
{{tr "Scheduled policies"}}
</th>
</tr>
</thead>
<thead>
<tr>
<th class="has-tip" title="{{tr "Type of adjustment."}}
{{tr "CHANGE: Add/subtract the given number of VMs."}}
{{tr "CARDINALITY: Set the cardinality to the given number."}}
{{tr "PERCENTAGE_CHANGE: Add/subtract the given percentage to the current cardinality."}}" style="width:14%">{{tr "Type"}}
</th>
<th class="has-tip" title="{{tr "Positive or negative adjustment. Its meaning depends on 'type'"}}
{{tr "CHANGE: -2, will subtract 2 VMs from the role"}}
{{tr "CARDINALITY: 8, will set cardinality to 8"}}
{{tr "PERCENTAGE_CHANGE: 20, will increment cardinality by 20%"}}" style="width:12%">{{tr "Adjust"}}
</th>
<th class="has-tip" title="{{tr "Optional parameter for PERCENTAGE_CHANGE adjustment type. If present, the policy will change the cardinality by at least the number of VMs set in this attribute."}}" style="width:9%">{{tr "Min"}}
</th>
<th class="has-tip" title="{{tr "Recurrence: Time for recurring adjustments. Time is specified with the Unix cron syntax"}}
{{tr "Start time: Exact time for the adjustment"}}" style="width:28%">{{tr "Time format"}}
</th>
<th class="has-tip" title="{{tr "Time expression depends on the the time format selected"}}
{{tr "Recurrence: Time for recurring adjustments. Time is specified with the Unix cron syntax"}}
{{tr "Start time: Exact time for the adjustment"}}" style="width:33%">{{tr "Time expression"}}
</th>
<th style="width:3%"></th>
</tr>
</thead>