From: Javier García <javier.garcial.external@atos.net>
Date: Mon, 1 Dec 2014 12:03:09 +0000 (+0100)
Subject: Merge branch 'fed4fire' into onelab
X-Git-Tag: myslice-1.1~27
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=3aae671a1ca0cef870a268b88ddcde8d520d7621

Merge branch 'fed4fire' into onelab

Conflicts:
	plugins/queryupdater/static/js/queryupdater.js
	portal/templates/base.html
---

3aae671a1ca0cef870a268b88ddcde8d520d7621
diff --cc plugins/queryupdater/static/js/queryupdater.js
index f3ba672d,2e736293..f1d6b322
--- a/plugins/queryupdater/static/js/queryupdater.js
+++ b/plugins/queryupdater/static/js/queryupdater.js
@@@ -56,19 -72,146 +56,121 @@@
  
          /***************************** GUI EVENTS *****************************/
  
-         /************************** GUI MANIPULATION **************************/
+         do_checksla: function(e) {
+             var username = e.data.options.username;
+             var urn = data.value;
+             var arraySelectedResources = data.selected_resources;
+ 
+             var accepted_sla = [];
+             var count = 0;
+             var self = e.data;
+             // var testbedsWithSLA = ["iminds", "fuseco", "netmode"];
+             var testbedsWithSLA;
+             
+             var sliverPattern = /IDN\+(.+)\+(node|channel)\+/;
+             var list = [];
+ 
+             var promt = $('#sla-table-body');
+             
+             $.get("/sla/testbeds/", function(data) {
+                 testbedsWithSLA = data;
+ 
+                 console.log("Testbeds with SLA: " + testbedsWithSLA);
+ 
+                 $(arraySelectedResources).each(function () {
+                     var sliverMatch = sliverPattern.exec(this);
+                     var sliverId = sliverMatch[1];
+                     for (var i = 0; i < testbedsWithSLA.length; i++) {
+                         if(this.indexOf(testbedsWithSLA[i].toLowerCase()) >= 0){ // If it has SLA
+                             if (list.indexOf(sliverId) == -1) { // If it is not in the list
+                                 list.push(sliverId);
+                             }
+                         }
+                     }
+                 });
+ 
+                 if (list.length > 0) {
+                     for (var i = 0; i < list.length; i++) {
+                         var element = $('<tr>');
+                         element.append(
+                             $('<td>').append(list[i]),
+                             $('<td>').append('99% of Uptime for 99% of resources'),
+                             $('<td align="center">').append('<input type="checkbox" name="slaaccept" value="' + list[i] + '"/> <br />')
+                         );
+                         promt.append(element);
+                     }
+ 
+                     $('#sla_dialog').show();
+                     $('#slamodal').modal('show');
+                 } else {
+                     //manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
+                 }
+             
+             });
+                     
+             $("#submit_sla").unbind().click(function(){
+                 console.log("With username: " + username);
+ 
+                 var notChecked = $("input[name='slaaccept']:not(:checked)");
+                 
+                 if (notChecked.length > 0) {
+                     for (var i = 0; i < notChecked.length; i++) {
+                          console.log("SLA not accepted: " + notChecked[i].value);
+                     }    
+ 
+                     alert("All SLAs have to be accepted to continue with the reservation");
+ 
+                 } else {
+                     // $(list).each(function () {
+                     //     var date = new Date();
+                     //     date.setYear(date.getFullYear() + 1);
+ 
+                     //     $.post("/sla/agreements/simplecreate", 
+                     //         { "template_id": this.toString(),
+                     //           "user": username,
+                     //           "expiration_time": date.toISOString()
+                     //         });
+ 
+                         
+                     // });
+ 
+                     $.ajax({
+                         url: "/sla/agreements/simplecreate", 
+                         data: { testbeds: list,
+                           user: username,
+                           resources: arraySelectedResources,
+                           slice: main_query.filters.slice()[0][2]
+                         },
+                         type: "post",
+                         traditional: true
+                     });
+ 
+                     console.log(main_query.filters.slice()[0][2]);
+                       
+                     $('#slamodal').modal('hide');
+                     $('#sla-table-body').empty();
+                     //manifold.raise_event(self.options.query_uuid, RUN_UPDATE);
+                 }
 -            }); 
 -        
 -            $("#cancel_sla").unbind().click(function(){
++            });
++
++        	$("#cancel_sla").unbind().click(function(){
+                 $('#slamodal').modal('hide');
+                 $('#sla-table-body').empty();
+             }); 
+         },
++		/************************** GUI MANIPULATION **************************/
  
 -     
 -        do_update: function(e) {
 -            var self = e.data;
 -
 -            var username = e.data.options.username;
 -            var urn = data.value;
 -            // XXX check that the query is not disabled
 -
 -            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 ?
 -
 -        },
 -
 -	// related buttons are also disabled in the html template
 -        do_refresh: function(e)
 -        {
 -            throw 'resource_selected.do_refresh Not implemented';
 -        },
 -
 -        do_reset: function(e)
 +        populate_table: function()
          {
 -            throw 'queryupdater.do_reset Not implemented';
 -        },
 +            var state;
  
 -        do_clear_annotations: function(e)
 -        {
 -            throw 'queryupdater.do_clear_annotations Not implemented';
 +            // Loop over records and display pending ones
 +            manifold.query_store.iter_records(this.options.query_uuid, function (record_key, record) {
 +                state = manifold.query_store.get_record_state(this.options.query_uuid, null, STATE_SET);
 +            
 +            });
          },
          
 -        /************************** GUI MANIPULATION **************************/
 -
 -        
          set_button_state: function(name, state)
          {
              this.elmt(name).attr('disabled', state ? false : 'disabled');