SLA plugin: template integration with SLA Dashboard

diff --git a/manifoldapi/static/js/manifold.js b/manifoldapi/static/js/manifold.js
index d6f0932..7b2d54c 100644 (file)
--- a/manifoldapi/static/js/manifold.js
+++ b/manifoldapi/static/js/manifold.js
@@ -1690,6 +1690,8 @@ case TYPE_LIST_OF_VALUES:
 
         query = query_ext.query;
 
 
         query = query_ext.query;
 

+        var testbeds_with_sla = localStorage.getItem("sla_testbeds").split(",");
+

         switch(query.object) {
 
             case 'resource':
         switch(query.object) {
 
             case 'resource':


@@ -1735,9 +1737,9 @@ case TYPE_LIST_OF_VALUES:
                     }
                 }
 
                     }
                 }
 

-                /*var urn_regexp = /\+(.*?)\+/;
+                var urn_regexp = /\+(.*?)\+/;

                 var testbed_urn = urn_regexp.exec(record.urn)[1];
                 var testbed_urn = urn_regexp.exec(record.urn)[1];

-                var has_sla = $.inArray(testbed_urn, localStorage.getItem("sla_testbeds").split(",")) != -1;
+                var has_sla = $.inArray(testbed_urn, testbeds_with_sla) != -1;

 
                 if (has_sla) {
                     // var warnings = manifold.query_store.get_record_state(query.query_uuid, record_key, STATE_WARNINGS);
 
                 if (has_sla) {
                     // var warnings = manifold.query_store.get_record_state(query.query_uuid, record_key, STATE_WARNINGS);


@@ -1748,7 +1750,7 @@ case TYPE_LIST_OF_VALUES:
                     } else {
                         delete warnings[CONSTRAINT_SLA];
                     }
                     } else {
                         delete warnings[CONSTRAINT_SLA];
                     }

-                }*/
+                }

 
                 manifold.query_store.set_record_state(query.query_uuid, record_key, STATE_WARNINGS, warnings);
                 // Signal the change to plugins (even if the constraint does not apply, so that the plugin can display a checkmark)
 
                 manifold.query_store.set_record_state(query.query_uuid, record_key, STATE_WARNINGS, warnings);
                 // Signal the change to plugins (even if the constraint does not apply, so that the plugin can display a checkmark)

diff --git a/plugins/sladialog/static/js/sladialog.js b/plugins/sladialog/static/js/sladialog.js
index 2773df0..8ea38dc 100644 (file)
--- a/plugins/sladialog/static/js/sladialog.js
+++ b/plugins/sladialog/static/js/sladialog.js
@@ -1,13 +1,10 @@
 /**
 /**

- * MyPlugin:    demonstration plugin
- * Version:     0.1
- * Description: Template for writing new plugins and illustrating the different
- *              possibilities of the plugin API.
- *              This file is part of the Manifold project 
+ * SlaDialog
+ * Description: Plugin to allow SLA acceptance and creation to MySlice portal
+ *              in Fed4FIRE

  * Requires:    js/plugin.js
  * Requires:    js/plugin.js

- * URL:         http://www.myslice.info
- * Author:      Jordan Augé <jordan.auge@lip6.fr>
- * Copyright:   Copyright 2012-2013 UPMC Sorbonne Universités
+ * Author:      Javier García Lloreda <javier.garcial.external@atos.net>
+ * Copyright:   Copyright Atos Spain S.A.

  * License:     GPLv3
  */
 
  * License:     GPLv3
  */
 


@@ -18,17 +15,8 @@
         accepted_slas: {},
         queries: [],
 
         accepted_slas: {},
         queries: [],
 

-        /** XXX to check
-         * @brief Plugin constructor
-         * @param options : an associative array of setting values
-         * @param element : 
-         * @return : a jQuery collection of objects on which the plugin is
-         *     applied, which allows to maintain chainability of calls
-         */

         init: function(options, element) {
         init: function(options, element) {

-           // for debugging tools
-           this.classname="SlaDialog";
-            // Call the parent constructor, see FAQ when forgotten
+               this.classname = "SlaDialog";

             this._super(options, element);
 
             /* Member variables */
             this._super(options, element);
 
             /* Member variables */


@@ -36,22 +24,19 @@
             /* Plugin events */
 
             /* Setup query and record handlers */
             /* Plugin events */
 
             /* Setup query and record handlers */

-
-            // Explain this will allow query events to be handled
-            // What happens when we don't define some events ?
-            // Some can be less efficient

             this.listen_query(options.query_uuid);
             
             /* GUI setup and event binding */
             this.listen_query(options.query_uuid);
             
             /* GUI setup and event binding */

+

             // call function
             this.button_binding();
 
             // Get testbeds with sla and store them in localStorage
             // call function
             this.button_binding();
 
             // Get testbeds with sla and store them in localStorage

-            //this.get_testbeds_with_sla();
-
+            this.get_testbeds_with_sla();

         },
 
         get_testbeds_with_sla: function () {
         },
 
         get_testbeds_with_sla: function () {

+            var self = this;

             return $.get('/sla/testbeds/', function(data) {
                 if (typeof(Storage) !== "undefined") {
                     if (!localStorage.getItem("sla_testbeds")) {
             return $.get('/sla/testbeds/', function(data) {
                 if (typeof(Storage) !== "undefined") {
                     if (!localStorage.getItem("sla_testbeds")) {


@@ -59,24 +44,44 @@
                         localStorage.setItem("sla_testbeds", testbeds);
                     }
                 }
                         localStorage.setItem("sla_testbeds", testbeds);
                     }
                 }

+            }).done(function(data) {
+                self.get_sla_templates(data);
+                alert("sla templates recovered: " + data);

             });
         },
 
             });
         },
 

-        find_row: function(key)
-        {
-            // key in third position, column id = 2
-            var KEY_POS = 2;
+        get_sla_templates: function (testbeds) {

 
 

-            var cols = $.grep(this.table.fnSettings().aoData, function(col) {
-                return (col._aData[KEY_POS] == key);
-            } );
+            testbeds.forEach(function(testbed, index, array) {

 
 

-            if (cols.length == 0)
-                return null;
-            if (cols.length > 1)
-                throw "Too many same-key rows in ResourceSelected plugin";
+                if(testbed!="omf:netmode") { return } // TODO: remove

 
 

-            return cols[0];
+                $.get('/sla/agreements/templates/' + testbed, function(slo) {
+
+                    $(".modal-body #sla_template").append(slo);
+
+                    var content =
+                    "<div id=" + testbed + " class='row' data-urns='[]' style='display: none'>" +
+                        "<div class='col-md-6'>" +
+                            "<p>Testbed <span class='provider'>" + testbed + "</span> offers the following SLA for its resources</p>" +
+                        "/div>" +
+                        "<div class='col-md-1'>" +
+                            "<button class='sla-info-button btn btn-default' data-toggle='modal' data-target='#sla_template_modal'>" +
+                            "<span class='glyphicon glyphicon-info-sign'></span>" +
+                                "Details" +
+                            "</button>" +
+                        "</div>" +
+                        "<div class='col-md-1'>" +
+                            "<button class='sla-accept-button btn btn-default' data-complete-text='Accepted' autocomplete='off'>" +
+                            "<span class='glyphicon glyphicon-ok'></span>" +
+                                "Accept" +
+                            "</button>" +
+                        "</div>" +
+                    "</div>";
+
+                    $("#sla_offers").append(content);
+                });
+            });

         },
 
         check_template_status: function() {
         },
 
         check_template_status: function() {


@@ -88,8 +93,6 @@
         },
 
         /* PLUGIN EVENTS */
         },
 
         /* PLUGIN EVENTS */

-        // on_show like in querytable
-

 
         /* GUI EVENTS */
 
 
         /* GUI EVENTS */
 


@@ -107,7 +110,16 @@
 
                 if (is_ok) {
                     // remove warnings
 
                 if (is_ok) {
                     // remove warnings

-                    // var warnings = manifold.query_store.get_record_state(resource_query.query_uuid, resource_key, STATE_WARNINGS);
+                    $('#' + id).data("urns").forEach(function (urn, index, array) {
+                        data = {
+                            state: STATE_SET,
+                            key  : "resource",
+                            op   : STATE_SET_REMOVE,
+                            value: urn
+                        }
+
+                        manifold.raise_event(self.query_uuid, STATUS_REMOVE_WARNING, data);
+                    });

                 }
             });
 
                 }
             });
 


@@ -131,7 +143,7 @@
 
                 var data = {
                     "SLIVER_INFO_AGGREGATE_URN": record.resource[0].component_manager_id,
 
                 var data = {
                     "SLIVER_INFO_AGGREGATE_URN": record.resource[0].component_manager_id,

-                    "SLIVER_INFO_EXPIRATION": record.lease[0].end_time,     // FIXME: only working with leases
+                    "SLIVER_INFO_EXPIRATION": record.lease[0].end_time,  // FIXME: only working with leases

                     "SLIVER_INFO_SLICE_URN": record.slice_urn,
                     "SLIVER_INFO_CREATOR_URN": record.users[0],
                     "SLIVER_INFO_URN": urns,
                     "SLIVER_INFO_SLICE_URN": record.slice_urn,
                     "SLIVER_INFO_CREATOR_URN": record.users[0],
                     "SLIVER_INFO_URN": urns,


@@ -155,43 +167,6 @@
 //            });
         },
 
 //            });
         },
 

-        // a function to bind events here: click change
-        // how to raise manifold events
-        set_state: function(data, username)
-        {
-            
-        },
-
-        post_agreement: function()
-        {
-            console.log(this.options.user);
-        },
-
-        /* GUI MANIPULATION */
-
-        // We advise you to write function to change behaviour of the GUI
-        // Will use naming helpers to access content _inside_ the plugin
-        // always refer to these functions in the remaining of the code
-
-        show_hide_button: function() 
-        {
-            // this.id, this.el, this.cl, this.elts
-            // same output as a jquery selector with some guarantees
-        },
-
-        /* TEMPLATES */
-
-        // see in the html template
-        // How to load a template, use of mustache
-
-        /* QUERY HANDLERS */
-
-        // How to make sure the plugin is not desynchronized
-        // He should manifest its interest in filters, fields or records
-        // functions triggered only if the proper listen is done
-
-        // no prefix
-

         on_filter_added: function(filter)
         {
 
         on_filter_added: function(filter)
         {
 


@@ -200,6 +175,10 @@
         on_field_state_changed: function(data)
         {
             var self = this;
         on_field_state_changed: function(data)
         {
             var self = this;

+            self.query_uuid = self.options.query_uuid;
+
+            var testbeds = localStorage.getItem("sla_testbeds").split(",");
+            var urn_regexp = /\+(.*?)\+/;

             // this.set_state(result, this.options.username);
 
              switch(data.state) {
             // this.set_state(result, this.options.username);
 
              switch(data.state) {


@@ -208,48 +187,40 @@
                         case STATE_SET_IN_PENDING:
                             if (typeof(data.value) == 'string') {
                                 // data.value = urn
                         case STATE_SET_IN_PENDING:
                             if (typeof(data.value) == 'string') {
                                 // data.value = urn

-                                this._supports_sla(data.value)
-                                    .done( function(testbeds) {
-                                        var urn_regexp = /\+(.*?)\+/;
-                                        var urn = urn_regexp.exec(data.value)[1];
-                                        var pos = $.inArray(urn, testbeds);
-                                        if ( pos != -1) {
-                                            var id_ref = testbeds[pos].replace(/\.|:/g, "-");
-                                            $("#" + id_ref).data("urns").push(data.value);
-                                            $("#" + id_ref).show();
-                                            self.accepted_slas[id_ref] = false;
-                                            //$( "#sla_offers_list" ).append(
-                                            //    $("<li>").text("Testbed " + testbeds[pos] + " offers SLA for its resources")
-                                            //);
-                                        }
-                                    });
+                                var urn = urn_regexp.exec(data.value)[1];
+                                var pos = $.inArray(urn, testbeds);
+                                if ( pos != -1) {
+                                    var id_ref = testbeds[pos].replace(/\.|:/g, "-");
+                                    $("#" + id_ref).data("urns").push(data.value);
+                                    $("#" + id_ref).show();
+                                    self.accepted_slas[id_ref] = false;
+                                    //$( "#sla_offers_list" ).append(
+                                    //    $("<li>").text("Testbed " + testbeds[pos] + " offers SLA for its resources")
+                                    //);
+                                }

                             }
                             break;
                         case STATE_SET_OUT:
                             // data.value = urn
                             if (typeof(data.value) == 'string') {
                                 // data.value = urn
                             }
                             break;
                         case STATE_SET_OUT:
                             // data.value = urn
                             if (typeof(data.value) == 'string') {
                                 // data.value = urn

-                                this._supports_sla(data.value)
-                                    .done( function(testbeds) {
-                                        var urn_regexp = /\+(.*?)\+/;
-                                        var urn = urn_regexp.exec(data.value)[1];
-                                        var pos = $.inArray(urn, testbeds);
-                                        if ( pos != -1) {
-                                            var id_ref = testbeds[pos].replace(/\.|:/g, "-");
-                                            var array = $("#" + id_ref).data("urns");
-                                            array.splice(array.indexOf(data.value), 1);
-
-                                            if ($("#" + id_ref).data("urns").length == 0) {
-                                                $("#" + id_ref).hide();
-                                                delete self.accepted_slas[id_ref];
-                                                $(".sla-accept-button").button("reset");
-                                                $(".sla-accept-button").prop("disabled", false);
-                                            }
-                                            //$( "#sla_offers_list" ).append(
-                                            //    $("<li>").text("Testbed " + testbeds[pos] + " offers SLA for its resources")
-                                            //);
-                                        }
-                                    });
+                                var urn = urn_regexp.exec(data.value)[1];
+                                var pos = $.inArray(urn, testbeds);
+                                if ( pos != -1) {
+                                    var id_ref = testbeds[pos].replace(/\.|:/g, "-");
+                                    var array = $("#" + id_ref).data("urns");
+                                    array.splice(array.indexOf(data.value), 1);
+
+                                    if ($("#" + id_ref).data("urns").length == 0) {
+                                        $("#" + id_ref).hide();
+                                        delete self.accepted_slas[id_ref];
+                                        $(".sla-accept-button").button("reset");
+                                        $(".sla-accept-button").prop("disabled", false);
+                                    }
+                                    //$( "#sla_offers_list" ).append(
+                                    //    $("<li>").text("Testbed " + testbeds[pos] + " offers SLA for its resources")
+                                    //);
+                                }

                             }
                             break;
                     }
                             }
                             break;
                     }


@@ -264,8 +235,6 @@
              }
         }, 
 
              }
         }, 
 

-        // ... be sure to list all events here
-

         /* RECORD HANDLERS */
         on_all_new_record: function(record)
         {
         /* RECORD HANDLERS */
         on_all_new_record: function(record)
         {


@@ -278,16 +247,11 @@
         },
 
         /* INTERNAL FUNCTIONS */
         },
 
         /* INTERNAL FUNCTIONS */

-        _dummy: function() {
-            // only convention, not strictly enforced at the moment
-        },

 
         _supports_sla: function(resource_urn) {
             return $.ajax("/sla/testbeds/");
         },
 
 
         _supports_sla: function(resource_urn) {
             return $.ajax("/sla/testbeds/");
         },
 

-
-

         _getUUID: function() {
             return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
                 var r = Math.random()*16|0, v = c === 'x' ? r : (r&0x3|0x8);
         _getUUID: function() {
             return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
                 var r = Math.random()*16|0, v = c === 'x' ? r : (r&0x3|0x8);


@@ -300,6 +264,4 @@
     /* Plugin registration */
     $.plugin('SlaDialog', SlaDialog);
 
     /* Plugin registration */
     $.plugin('SlaDialog', SlaDialog);
 

-    // TODO Here use cases for instanciating plugins in different ways like in the pastie.
-

 })(jQuery);
 })(jQuery);

diff --git a/plugins/sladialog/templates/sladialog.html b/plugins/sladialog/templates/sladialog.html
index b1a9ab2..8886ae3 100644 (file)
--- a/plugins/sladialog/templates/sladialog.html
+++ b/plugins/sladialog/templates/sladialog.html
@@ -8,7 +8,7 @@
                 </div>
                 <div class="modal-body">
                     <p>Testbed offers:</p>
                 </div>
                 <div class="modal-body">
                     <p>Testbed offers:</p>

-                    <p>99% availability for 99% of the selected resources</p>
+                    <p id="sla_template"></p>

                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>


@@ -22,74 +22,5 @@
             <strong>Accepted!</strong> The SLA has been accepted.
         </div>
     </div>
             <strong>Accepted!</strong> The SLA has been accepted.
         </div>
     </div>

-    <div id="sla_offers" class="container">
-        <div id="fuseco-fokus-fraunhofer-de" class="row" data-urns="[]" style="display: none">
-            <div class="col-md-6">
-                <p>Testbed <span class="provider">fuseco.fokus.fraunhofer.de</span> offers the following SLA for its resources</p>
-            </div>
-            <div class="col-md-1">
-                <button class="sla-info-button btn btn-default" data-toggle="modal" data-target="#sla_template_modal">
-                    <span class="glyphicon glyphicon-info-sign"></span>
-                    Details
-                </button>
-            </div>
-            <div class="col-md-1">
-                <button class="sla-accept-button btn btn-default" data-complete-text="Accepted" autocomplete="off">
-                    <span class="glyphicon glyphicon-ok"></span>
-                    Accept
-                </button>
-            </div>
-        </div>
-        <div id="omf-netmode" class="row" data-urns="[]" style="display: none">
-            <div class="col-md-6">
-                <p>Testbed <span class="provider">omf:netmode</span> offers the following SLA for its resources</p>
-            </div>
-            <div class="col-md-1">
-                <button class="sla-info-button btn btn-default" data-toggle="modal" data-target="#sla_template_modal">
-                    <span class="glyphicon glyphicon-info-sign"></span>
-                    Details
-                </button>
-            </div>
-            <div class="col-md-1">
-                <button class="sla-accept-button btn btn-default" data-complete-text="Accepted" autocomplete="off">
-                    <span class="glyphicon glyphicon-ok"></span>
-                    Accept
-                </button>
-            </div>
-        </div>
-        <div id="wilab2-ilabt-iminds-be" class="row" data-urns="[]" style="display: none">
-            <div class="col-md-6">
-                <p>Testbed <span class="provider">wilab2.ilabt.iminds.be</span> offers the following SLA for its resources</p>
-            </div>
-            <div class="col-md-1">
-                <button class="sla-info-button btn btn-default" data-toggle="modal" data-target="#sla_template_modal">
-                    <span class="glyphicon glyphicon-info-sign"></span>
-                    Details
-                </button>
-            </div>
-            <div class="col-md-1">
-                <button class="sla-accept-button btn btn-default" data-complete-text="Accepted" autocomplete="off">
-                    <span class="glyphicon glyphicon-ok"></span>
-                    Accept
-                </button>
-            </div>
-        </div>
-        <div id="wall2-ilabt-iminds-be" class="row" data-urns="[]" style="display: none">
-            <div class="col-md-6">
-                <p>Testbed <span class="provider">wall2.ilabt.iminds.be</span> offers the following SLA for its resources</p>
-            </div>
-            <div class="col-md-1">
-                <button class="sla-info-button btn btn-default" data-toggle="modal" data-target="#sla_template_modal">
-                    <span class="glyphicon glyphicon-info-sign"></span>
-                    Details
-                </button>
-            </div>
-            <div class="col-md-1">
-                <button class="sla-accept-button btn btn-default" data-complete-text="Accepted" autocomplete="off">
-                    <span class="glyphicon glyphicon-ok"></span>
-                    Accept
-                </button>
-            </div>
-        </div>
-    </div>
+    <div id="sla_offers" class="container"></div>

 </div>
\ No newline at end of file
 </div>
\ No newline at end of file

diff --git a/sla/slaclient/restclient.py b/sla/slaclient/restclient.py
index c3dc013..4b8614b 100755 (executable)
--- a/sla/slaclient/restclient.py
+++ b/sla/slaclient/restclient.py
@@ -343,12 +343,12 @@ class Templates(object):
         converter = xmlconverter.AgreementConverter()
         self.res = _Resource(resourceurl, converter)
 
         converter = xmlconverter.AgreementConverter()
         self.res = _Resource(resourceurl, converter)
 

-    def getall(self):
+    def getall(self, provider_id):

         """ Get all templates
 
         :rtype : list[wsag_model.Template]
         """
         """ Get all templates
 
         :rtype : list[wsag_model.Template]
         """

-        return self.res.getall()
+        return self.res.get(path="", params={"testbed": provider_id})

 
     def getbyid(self, provider_id):
         """Get a template
 
     def getbyid(self, provider_id):
         """Get a template

diff --git a/sla/slicetabsla.py b/sla/slicetabsla.py
index c9043f6..a5b56fd 100755 (executable)
Binary files a/sla/slicetabsla.py and b/sla/slicetabsla.py differ

diff --git a/sla/urls.py b/sla/urls.py
index 03ab14f..87363ee 100755 (executable)
--- a/sla/urls.py
+++ b/sla/urls.py
@@ -13,6 +13,8 @@ urlpatterns = patterns('',
             slicetabsla.agreement_details, name='agreement_details'),
        url(r'^agreements/(?P<agreement_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/guarantees/(?P<guarantee_name>\w+)/violations$',
             slicetabsla.agreement_term_violations, name='agreement_term_violations'),
             slicetabsla.agreement_details, name='agreement_details'),
        url(r'^agreements/(?P<agreement_id>[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12})/guarantees/(?P<guarantee_name>\w+)/violations$',
             slicetabsla.agreement_term_violations, name='agreement_term_violations'),

+    url(r'^agreements/templates/(?P<testbed>[^/]+)',
+            slicetabsla.AgreementTemplates.as_view(), name='agreement_templates'),

     url(r'^agreements/create/$',
             slicetabsla.CreateAgreement.as_view(), name="agreement_create"),
        # url(r'^agreements/simplecreate/?$',
     url(r'^agreements/create/$',
             slicetabsla.CreateAgreement.as_view(), name="agreement_create"),
        # url(r'^agreements/simplecreate/?$',