X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=instancehandler%2Ftemplate%2Finstance_list.html;h=bee51165a63a2ac6a838a5a1a6e8038c41e179bf;hb=e5a130af55131c3437fe3e2b7bb7cdacd0b22add;hp=bc94e5f8cba3cfd5ddc10a33cafbb6ec7ed1c76b;hpb=0b59fc774757dead0976514f70ebe7a59d2bba61;p=osm%2FLW-UI.git

diff --git a/instancehandler/template/instance_list.html b/instancehandler/template/instance_list.html
index bc94e5f..bee5116 100644
--- a/instancehandler/template/instance_list.html
+++ b/instancehandler/template/instance_list.html
@@ -7,14 +7,14 @@
 {% block head_block %}
     {{ block.super }}
     <!-- Codemirror core CSS -->
-    <link rel="stylesheet" href="/static/bower_components/codemirror/lib/codemirror.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/fold/foldgutter.css" />
-    <link rel="stylesheet" href="/static/bower_components/codemirror/theme/neat.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/dialog/dialog.css">
-    <link rel="stylesheet" href="/static/bower_components/codemirror/addon/display/fullscreen.css">
-    <link rel="stylesheet" href="/static/bower_components/select2/dist/css/select2.min.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/lib/codemirror.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/fold/foldgutter.css" />
+    <link rel="stylesheet" href="/static/node_modules/codemirror/theme/neat.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/dialog/dialog.css">
+    <link rel="stylesheet" href="/static/node_modules/codemirror/addon/display/fullscreen.css">
+    <link rel="stylesheet" href="/static/node_modules/select2/dist/css/select2.min.css">
     <link rel="stylesheet" href="/static/css/lwuitable.css">
-    <link rel="stylesheet" href="/static/bower_components/datatables.net-bs/css/dataTables.bootstrap.min.css">
+    <link rel="stylesheet" href="/static/node_modules/datatables.net-bs/css/dataTables.bootstrap.min.css">
 {% endblock %}
 {% block title_header_big %}
     {{ block.super }}
@@ -40,41 +40,46 @@
                 {% include 'instance_list_ns.html' %}
             {% elif type == 'vnf' %}
                 {% include 'instance_list_vnf.html' %}
+            {% elif type == 'pdu' %}
+                {% include 'instance_list_pdu.html' %}
+            {% elif type == 'nsi' %}
+                {% include 'instance_list_nsi.html' %}
             {% endif %}
 
         </div>
 
     </div>
     {% include 'modal/instance_create.html' %}
+    {% include 'modal/instance_create_pdu.html' %}
+    {% include 'modal/instance_create_nsi.html' %}
     {% include 'modal/instance_show.html' %}
     {% include 'modal/instance_new_action.html' %}
-    {% include 'modal/instance_new_alarm.html' %}
-    {% include 'modal/instance_export_metric.html' %}
 {% endblock %}
 
 {% block resource_block %}
     {{ block.super }}
     <!-- Utility JS -->
-    <script src="/static/bower_components/select2/dist/js/select2.js"></script>
-    <script src="/static/bower_components/codemirror/lib/codemirror.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldcode.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/foldgutter.js"></script>
-    <script src="/static/bower_components/codemirror/addon/fold/brace-fold.js"></script>
-    <script src="/static/bower_components/codemirror/mode/javascript/javascript.js"></script>
-    <script src="/static/bower_components/codemirror/addon/search/searchcursor.js"></script>
-    <script src="/static/bower_components/codemirror/addon/search/search.js"></script>
-    <script src="/static/bower_components/codemirror/addon/dialog/dialog.js"></script>
-    <script src="/static/bower_components/codemirror/addon/display/autorefresh.js"></script>
-    <script src="/static/bower_components/codemirror/addon/edit/matchbrackets.js"></script>
-    <script src="/static/bower_components/codemirror/addon/edit/closebrackets.js"></script>
-    <script src="/static/bower_components/codemirror/addon/display/fullscreen.js"></script>
-    <script src="/static/bower_components/codemirror/keymap/sublime.js"></script>
+    <script src="/static/node_modules/select2/dist/js/select2.js"></script>
+    <script src="/static/node_modules/codemirror/lib/codemirror.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldcode.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/foldgutter.js"></script>
+    <script src="/static/node_modules/codemirror/addon/fold/brace-fold.js"></script>
+    <script src="/static/node_modules/codemirror/mode/javascript/javascript.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/searchcursor.js"></script>
+    <script src="/static/node_modules/codemirror/addon/search/search.js"></script>
+    <script src="/static/node_modules/codemirror/addon/dialog/dialog.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/autorefresh.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/matchbrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/edit/closebrackets.js"></script>
+    <script src="/static/node_modules/codemirror/addon/display/fullscreen.js"></script>
+    <script src="/static/node_modules/codemirror/keymap/sublime.js"></script>
     <script src="/static/src/instancehandler/instance_list.js"></script>
     <script src="/static/src/instancehandler/instance_create.js"></script>
-    <script src="/static/bower_components/datatables.net/js/jquery.dataTables.min.js"></script>
-    <script src="/static/bower_components/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
+    <script src="/static/node_modules/datatables.net/js/jquery.dataTables.min.js"></script>
+    <script src="/static/node_modules/datatables.net-bs/js/dataTables.bootstrap.min.js"></script>
 
     <script>
+        var table;
         var instance_type = '{{ type }}';
         var row_builder = {
             'ns': [
@@ -166,13 +171,6 @@
                             '         <a href="/instances/ns/' +row["_id"] +'/operation">' +
                             '             <i class="fa fa-list"></i> History of operations</a></li>' +
                             '     <li class="divider"></li>' +
-                            '     <li><a href="#"' +
-                            '            onclick="javascript:newAlarmNs(\''+ row["short-name"] +'\', \''+row["_id"]+'\')">' +
-                            '         <i class="far fa-bell"></i> New Alarm</a></li>' +
-                            '     <li><a href="#"' +
-                            '            onclick="javascript:exportMetricNs(\''+ row["short-name"] +'\', \''+row["_id"]+ '\')">' +
-                            '         <i class="far fa-chart-bar"></i> Export metric</a></li>' +
-                            '     <li class="divider"></li>' +
                             '     <li>' +
                             '         <a href="javascript:deleteNs(\''+ row["short-name"] +'\', \''+row["_id"]+'\', true)">' +
                             '             <i class="far fa-trash-alt" style="color:red" ></i> Force delete</a></li>' +
@@ -180,11 +178,13 @@
                             '</div>';
                           return template;
                     },
-                    "targets": 5
+                    "targets": 5,
+                    "orderable": false
                 },
 
             ],
-            'vnf': [ {
+            'vnf': [ 
+                {
                     "render": function (data, type, row) {
                         return row["_id"];
                     },
@@ -224,12 +224,161 @@
                             '     </button>' +
                             ' </div>';
                     },
+                    "targets": 5,
+                    "orderable": false
+                },
+            ],
+            'pdu': [
+            {
+                    "render": function (data, type, row) {
+                        return row["_id"];
+                    },
+                    "targets": 0
+                },
+                {
+                    "render": function (data, type, row) {
+                        return row["name"];
+                    },
+                    "targets": 1
+                },
+                {
+                    "render": function (data, type, row) {
+                        return row["type"];
+                    },
+                    "targets": 2
+                },
+                {
+                    "render": function (data, type, row) {
+                        return row['_admin']['usageState'];
+                    },
+                    "targets": 3
+                },
+                {
+                    "render": function (data, type, row) {
+                        return moment.unix(row['_admin']['created']).format('YYYY-MM-DD hh:mm:ss a');
+                    },
+                    "targets": 4
+                }, 
+                {
+                    "render": function (data, type, row) {
+                        return '<div class="btn-group">' +
+                            '     <button type="button" class="btn btn-default"' +
+                            '             onclick="javascript:showInstanceDetails(\''+instance_type+'\', \''+row["_id"]+'\')"' +
+                            '             data-toggle="tooltip" data-placement="top" data-container="body" title="Show Info">' +
+                            '         <i class="fa fa-info"></i>' +
+                            '     </button>' +
+                            '<button type="button" class="btn btn-default"' +
+                            '         onclick="javascript:deletePDU(\''+ row["name"] +'\', \''+row["_id"]+'\')"' +
+                            '         data-toggle="tooltip" data-placement="top" data-container="body" title="Delete"><i' +
+                            '         class="far fa-trash-alt"></i></button>'+
+                            ' </div>';
+                    },
+                    "targets": 5,
+                    "orderable": false
+                }
+            ],
+            'nsi': [
+                {
+                    "render": function (data, type, row) {
+                        return row["name"];
+                    },
+                    "targets": 0
+                },
+                {
+                    "render": function (data, type, row) {
+                        return row["_id"];
+                    },
+                    "targets": 1
+                },
+                {
+                    "render": function (data, type, row) {
+                        return row["nst-ref"];
+                    },
+                    "targets": 2
+                },
+                {
+                 //   "width": "5%",
+                    "render": function (data, type, row) {
+                        if(row["operational-status"] === 'failed')
+                           return '<span class="label label-danger">'+ row["operational-status"] +'</span>';
+                        if(row["operational-status"] === 'init')
+                           return '<span class="label label-warning">'+ row["operational-status"] +'</span>';
+                        if(row["operational-status"] === 'running')
+                           return '<span class="label label-success">'+ row["operational-status"] +'</span>';
+                        return  ''+row["operational-status"]+'';
+                    },
+                    "targets": 3
+                },
+                {
+                //    "width": "5%",
+                    "render": function (data, type, row) {
+                         if(row["config-status"] === 'failed')
+                           return '<span class="label label-danger">'+ row["config-status"] +'</span>';
+                        if(row["config-status"] === 'init')
+                           return '<span class="label label-warning">'+ row["config-status"] +'</span>';
+                        if(row["config-status"] === 'running')
+                           return '<span class="label label-success">'+ row["config-status"] +'</span>';
+                        if(row["config-status"] === 'configured')
+                           return '<span class="label label-success">'+ row["config-status"] +'</span>';
+                        return  ''+row["operational-status"]+'';
+                    },
+                    "targets": 4
+                },
+                {
+                   // "className": "ellipsis",
+                    "render": function (data, type, row) {
+                        return row["detailed-status"];
+                    },
                     "targets": 5
+                },{
+                     "width": "20%",
+                    "render": function (data, type, row) {
+                          var template = '<div class="btn-group">' +
+                            ' <button type="button" class="btn btn-default"' +
+                            '         onclick="javascript:showInstanceDetails(\''+instance_type+'\', \''+row["_id"]+'\')"' +
+                            '         data-toggle="tooltip" data-placement="top" data-container="body" title="Show Info">' +
+                            '     <i class="fa fa-info"></i>';
+                            /* if (row["operational-status"] === "running") {
+                                template += ' <button type="button" class="btn btn-default"' +
+                                '         onclick="javascript:showTopology(\'' + instance_type + '\', \'' + row["_id"] + '\')"' +
+                                '         data-toggle="tooltip" data-placement="top" data-container="body" title="Show Graph">' +
+                                '     <i class="fa fa-sitemap"></i>' +
+                                ' </button>';
+                            }else{
+                                template += ' <button type="button" disabled class="btn btn-default"' +
+                                '         onclick="javascript:showTopology(\'' + instance_type + '\', \'' + row["_id"] + '\')"' +
+                                '         data-toggle="tooltip" data-placement="top" data-container="body" title="Show Graph">' +
+                                '     <i class="fa fa-sitemap"></i>' +
+                                ' </button>';
+                            } */
+                            template += ' <button type="button" class="btn btn-default"' +
+                            '         onclick="javascript:deleteNsi(\''+ row["name"] +'\', \''+row["_id"]+'\')"' +
+                            '         data-toggle="tooltip" data-placement="top" data-container="body" title="Delete"><i' +
+                            '         class="far fa-trash-alt"></i></button>' +
+                            ' <button type="button" class="btn btn-default dropdown-toggle"' +
+                            '         data-toggle="dropdown" aria-expanded="false">Actions' +
+                            '     <span class="fa fa-caret-down"></span></button>' +
+                            ' <ul class="dropdown-menu">' +
+                            '     <li>' +
+                            '         <a href="/instances/nsi/' +row["_id"] +'/operation">' +
+                            '             <i class="fa fa-list"></i> History of operations</a></li>' +
+                            '     <li class="divider"></li>' +
+
+                            '     <li>' +
+                            '         <a href="javascript:deleteNsi(\''+ row["name"] +'\', \''+row["_id"]+'\', true)">' +
+                            '             <i class="far fa-trash-alt" style="color:red" ></i> Force delete</a></li>' +
+                            ' </ul>' +
+                            '</div>';
+                          return template;
+                    },
+                    "targets": 5,
+                    "orderable": false
                 },
+
             ]
         };
         $(document).ready(function () {
-            var table = $('#instances_table').DataTable({
+            table = $('#instances_table').DataTable({
                 responsive: true,
                 "ajax": {
                     "url": "/instances/" + instance_type + "/list/",
@@ -254,6 +403,8 @@
             setInterval(function () {
                 table.ajax.reload();
             }, 10000);
+
+
         });
 
     </script>