From 3a175fa637df17a44202deffd207707487a080d8 Mon Sep 17 00:00:00 2001 From: javier Date: Mon, 16 Jun 2014 17:55:03 +0200 Subject: [PATCH] SLA plugin updated --- .../queryupdater/static/js/queryupdater.js | 296 ++++++++++++------ plugins/sladialog/static/js/sladialog.js | 59 +--- plugins/sladialog/templates/sladialog.html | 30 +- .../fed4fire_widget-slice-sections.html | 3 +- sla/slicetabsla.py | 7 +- 5 files changed, 234 insertions(+), 161 deletions(-) diff --git a/plugins/queryupdater/static/js/queryupdater.js b/plugins/queryupdater/static/js/queryupdater.js index ab6465c4..bf650bb4 100644 --- a/plugins/queryupdater/static/js/queryupdater.js +++ b/plugins/queryupdater/static/js/queryupdater.js @@ -35,6 +35,7 @@ var self = this; this.initial = Array(); + this.selected_resources = Array(); this.table = this.elmt('table').dataTable({ // the original querytable layout was @@ -43,7 +44,7 @@ sDom: "<'row'<'col-xs-5'l><'col-xs-1'r><'col-xs-6'f>>t>", // so this does not matter anymore now that the pagination area is turned off // sPaginationType: 'bootstrap', - bAutoWidth: true, + bAutoWidth: true, // bJQueryUI : true, // bRetrieve : true, // sScrollX : '100%', // Horizontal scrolling @@ -74,61 +75,200 @@ do_checksla: function(e) { var username = e.data.options.username; var urn = data.value; + var arrayselectedresources = data.selected_resources; + + var accepted_sla = Array(); + var count = 0; // XXX check that the query is not disabled console.log("DATA VALUE: " + data.value); + + //

SLA description

+ //

Testbed guarantees 0.99 Uptime rate for 0.99 rate of the VirtualWall resources during the sliver lifetime

+ //

SLA description

+ //

Testbed guarantees 0.99 Uptime rate for 0.99 rate of the WiLab2 resources during the sliver lifetime

+ var promt = $('#modal-body'); + + // id="myModalLabel" + var flagVW = false; + var flagWi = false; + + var wilabForm = ""; + var wimessage = '

SLA description

to be deployed

'; + for(var iter = 0; iter < arrayselectedresources.length; iter++){ + var list = '

'+arrayselectedresources[iter].toLowerCase()+'


'; + - if (data.value.toLowerCase().indexOf("iminds") >= 0){ + if (arrayselectedresources[iter].toLowerCase().indexOf("wilab2") >= 0){ - $('#sla_dialog').show(); - $('#slamodal').modal('show'); + accepted_sla.push({"wilab2":false}); + wilabForm += list; + flagWi = true; + + } + + } + + //var wallmessage = '

SLA description

Testbed guarantees 0.99 Uptime rate for 0.99 rate of the VirtualWall resources during the sliver lifetime

'; + + var wallForm = ""; + for(var iter = 0; iter < arrayselectedresources.length; iter++){ + var list = ''+arrayselectedresources[iter].toLowerCase()+'


'; - $(document).ready(function() { - $("#accept_sla").click(function(){ - console.log("SLA ACCEPTED"); - console.log("With username: " + username); - if(urn.toLowerCase().indexOf("wall2") >= 0){ - $.post("/sla/agreements/simplecreate", - { "template_id": "iMindsServiceVirtualwall", - "user": username, - "expiration_time": new Date() // jgarcia: FIXME - }); - } else if(urn.toLowerCase().indexOf("wilab2") >= 0){ - $.post("/sla/agreements/simplecreate", - { "template_id":"iMindsServiceWiLab2", - "user":username, - "expiration_time": new Date() // jgarcia: FIXME - }); - } - $('#slamodal').modal('hide'); - self.spin(); - console.log("Executing do_update after sending SLA"); - // XXX check that the query is not disabled - manifold.raise_event(self.options.query_uuid, RUN_UPDATE); - - // how to stop the spinning after the event? - // this should be triggered by some on_updatequery_done ? - }); - }); - - $(document).ready(function() { - $("#dismiss_sla").click(function(){ - console.log("SLA NOT ACCEPTED"); - $('#slamodal').modal('hide'); - }); - }); + if (arrayselectedresources[iter].toLowerCase().indexOf("wall2") >= 0){ - } else { - self.spin(); - console.log("do_update"); - // XXX check that the query is not disabled - manifold.raise_event(self.options.query_uuid, RUN_UPDATE); + accepted_sla.push({"wall2":false}); + wallForm += list; + flagVW = true; + + } - // how to stop the spinning after the event? - // this should be triggered by some on_updatequery_done ? } + promt.append(wimessage); + var flagDouble = false; + if(flagWi) + { + flagDouble = true; + promt.append(wilabForm); + } + if(flagVW) + { + //promt.append(wallmessage); + flagDouble = true; + promt.append(wallForm); + } + + + // var wimessage = '

SLA description

Testbed guarantees 0.99 Uptime rate for 0.99 rate of the VirtualWall resources during the sliver lifetime

' + + $('#sla_dialog').show(); + $('#slamodal-wilab2').modal('show'); + + + $("#accept_sla_wilab2").click(function(){ + console.log("SLA ACCEPTED"); + console.log("With username: " + username); + + // var promt = $('#modal-body'); + // var notchecked = true; + // for (var i=0;i<50;i++) + // { + // var wielement = $('#wi'+i); + // var wallElement = $('#wall'+i); + // if(wielement != null && !wielement.checked) + // { + // notchecked = false; + // } + // if(wallElement!= null && !wallElement.checked) + // { + // notchecked = false; + // } + // } + + + if(flagDouble) + { + $.post("/sla/agreements/simplecreate", + { "template_id": "iMindsServiceWiLab2", + "user": username, + "expiration_time": new Date().toISOString() + }); + $.post("/sla/agreements/simplecreate", + { "template_id": "iMindsServiceVirtualwall", + "user": username, + "expiration_time": new Date().toISOString() + }); + + $('#slamodal-wilab2').modal('hide'); + accepted_sla["wilab2"] = true; + + //this.do_update(e); + } + }); + + $("#dismiss_sla_wilab2").click(function(){ + console.log("SLA NOT ACCEPTED"); + $('#slamodal-wilab2').modal('hide'); + }); + + // for(var iter = 0; iter < arrayselectedresources.length; iter++){ + // var list = ''+arrayselectedresources[iter].toLowerCase()+'
'; + // promt.append(list); + // if (arrayselectedresources[iter].toLowerCase().indexOf("wall2") >= 0){ + + + + // accepted_sla.push({"wall2":false}); + + // $('#sla_dialog').show(); + // $('#slamodal-virtualwall').modal('show'); + + + // $("#accept_sla_vwall").click(function(){ + // console.log("SLA ACCEPTED"); + // console.log("With username: " + username); + + // $.post("/sla/agreements/simplecreate", + // { "template_id": "iMindsServiceVirtualwall", + // "user": username, + // "expiration_time": new Date() + // }); + + // $('#slamodal-virtualwall').modal('hide'); + // accepted_sla["wall2"] = true; + // }); + + // $("#dismiss_sla_vwall").click(function(){ + // console.log("SLA NOT ACCEPTED"); + // $('#slamodal-vir').modal('hide'); + // }); + + // } + + // if (arrayselectedresources[iter].toLowerCase().indexOf("wilab2") >= 0){ + + // accepted_sla.push({"wilab2":false}); + + // $('#sla_dialog').show(); + // $('#slamodal-wilab2').modal('show'); + + + // $("#accept_sla_wilab2").click(function(){ + // console.log("SLA ACCEPTED"); + // console.log("With username: " + username); + + // $.post("/sla/agreements/simplecreate", + // { "template_id": "iMindsServiceWiLab2", + // "user": username, + // "expiration_time": new Date() + // }); + + // $('#slamodal-wilab2').modal('hide'); + // accepted_sla["wilab2"] = true; + // }); + + // $("#dismiss_sla_wilab2").click(function(){ + // console.log("SLA NOT ACCEPTED"); + // $('#slamodal-wilab2').modal('hide'); + // }); + + + // } + + // } + + // for(var sla in accepted_sla){ + // if(accepted_sla[sla] == true){ + // count += 1; + // } + // } + + // if(count == accepted_sla.length){ + // this.do_update(e); + // } }, + do_update: function(e) { var self = e.data; @@ -136,57 +276,13 @@ var urn = data.value; // XXX check that the query is not disabled - console.log("DATA VALUE: " + data.value); - - if (data.value.toLowerCase().indexOf("iminds") >= 0){ - - $('#sla_dialog').show(); - $('#slamodal').modal('show'); - - $(document).ready(function() { - $("#accept_sla").click(function(){ - console.log("SLA ACCEPTED"); - console.log("With username: " + username); - if(urn.toLowerCase().indexOf("wall2") >= 0){ - $.post("/sla/agreements/simplecreate", - { "template_id": "iMindsServiceVirtualwall", - "user": username, - "expiration_time": new Date() // jgarcia: FIXME - }); - } else if(urn.toLowerCase().indexOf("wilab2") >= 0){ - $.post("/sla/agreements/simplecreate", - { "template_id":"iMindsServiceWiLab2", - "user":username, - "expiration_time": new Date() // jgarcia: FIXME - }); - } - $('#slamodal').modal('hide'); - self.spin(); - console.log("Executing do_update after sending SLA"); - // XXX check that the query is not disabled - manifold.raise_event(self.options.query_uuid, RUN_UPDATE); - - // how to stop the spinning after the event? - // this should be triggered by some on_updatequery_done ? - }); - }); - - $(document).ready(function() { - $("#dismiss_sla").click(function(){ - console.log("SLA NOT ACCEPTED"); - $('#slamodal').modal('hide'); - }); - }); - - } else { - self.spin(); - console.log("do_update"); - // XXX check that the query is not disabled - manifold.raise_event(self.options.query_uuid, RUN_UPDATE); + self.spin(); + console.log("do_update"); + // XXX check that the query is not disabled + //manifold.raise_event(self.options.query_uuid, RUN_UPDATE); - // how to stop the spinning after the event? - // this should be triggered by some on_updatequery_done ? - } + // how to stop the spinning after the event? + // this should be triggered by some on_updatequery_done ? }, @@ -295,6 +391,7 @@ // XXX it's not just about adding lines, but sometimes removing some // XXX how do we handle status reset ? data.value = JSON.stringify(data.value); + data.selected_resources = this.selected_resources; row = this.find_row(data.value); newline = [ action, @@ -451,6 +548,15 @@ { console.log("on_field_state_changed"); console.log(result); + if(result.request == FIELD_REQUEST_ADD){ + this.selected_resources.push(result.value); + } else if(result.request == FIELD_REQUEST_REMOVE_RESET){ + var i = this.selected_resources.indexOf(result.value); + if(i != -1){ + this.selected_resources.splice(i,1); + } + } + console.log("Resources: " + self.selected_resources); messages.debug(result) /* this.set_state(result.request, result.key, result.value, result.status); */ this.set_state(result); diff --git a/plugins/sladialog/static/js/sladialog.js b/plugins/sladialog/static/js/sladialog.js index 89d1ab0d..1098e2ef 100644 --- a/plugins/sladialog/static/js/sladialog.js +++ b/plugins/sladialog/static/js/sladialog.js @@ -79,64 +79,7 @@ // how to raise manifold events set_state: function(data, username) { - var action; - var msg; - var button = ''; - var username = username; - - var uncheck = false; - - switch(data.request) { - case FIELD_REQUEST_ADD_RESET: - case FIELD_REQUEST_REMOVE_RESET: - $('#sla_dialog').hide(); - // find line and delete it - // row = this.find_row(data.value); - // if (row) - // this.table.fnDeleteRow(row.nTr); - // $("#badge-pending").data('number', $("#badge-pending").data('number') - 1 ); - // $("#badge-pending").text($("#badge-pending").data('number')); - return; - case FIELD_REQUEST_CHANGE: - action = 'UPDATE'; - break; - case FIELD_REQUEST_ADD: - action = 'ADD'; - - if (data.value.toLowerCase().indexOf("iminds") >= 0){ - - $('#sla_dialog').show(); - $('#slamodal').modal('show'); - - $(document).ready(function() { - $("#accept_sla").click(function(){ - console.log("SLA ACCEPTED"); - console.log("With username: " + username); - $.post("/sla/agreements/simplecreate", {"template_id":"iMindsServiceTemplate","user":username}); - $('#slamodal').modal('hide'); - }); - }); - - $(document).ready(function() { - $("#dismiss_sla").click(function(){ - console.log("SLA NOT ACCEPTED"); - // FIX ME: This is not a good solution to prevent the checkbox click - var chkbox = document.getElementById((data.value).replace(/"/g,'')); - if(chkbox.checked){ - chkbox.click(); - } - $('#slamodal').modal('hide'); - - }); - }); - - } - - break; - case FIELD_REQUEST_REMOVE: - action = 'REMOVE'; - break; - } + }, post_agreement: function() diff --git a/plugins/sladialog/templates/sladialog.html b/plugins/sladialog/templates/sladialog.html index 08604000..ce27c2e4 100644 --- a/plugins/sladialog/templates/sladialog.html +++ b/plugins/sladialog/templates/sladialog.html @@ -1,20 +1,38 @@
- diff --git a/portal/templates/fed4fire/fed4fire_widget-slice-sections.html b/portal/templates/fed4fire/fed4fire_widget-slice-sections.html index f223736e..c7bd719a 100644 --- a/portal/templates/fed4fire/fed4fire_widget-slice-sections.html +++ b/portal/templates/fed4fire/fed4fire_widget-slice-sections.html @@ -4,6 +4,7 @@
  • Resources
  • Users
    • +
  • SLA
    • - +
  • SLA