X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Femuvim%2Fdashboard%2Fjs%2Fmain.js;h=19169accf4094d83a40458751031cb09abe0d263;hb=9467ee52a690736ff222280b11420e4c2104a1c6;hp=71741f2e2c07200f0e56366c321bb8f62e83dc9e;hpb=c911ca6a6560d062fed5d294bc5a80c26da69672;p=osm%2Fvim-emu.git
diff --git a/src/emuvim/dashboard/js/main.js b/src/emuvim/dashboard/js/main.js
index 71741f2..19169ac 100755
--- a/src/emuvim/dashboard/js/main.js
+++ b/src/emuvim/dashboard/js/main.js
@@ -1,3 +1,30 @@
+/*
+ Copyright (c) 2017 SONATA-NFV and Paderborn University
+ ALL RIGHTS RESERVED.
+
+ 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.
+
+ Neither the name of the SONATA-NFV, Paderborn University
+ nor the names of its contributors may be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
+ This work has been performed in the framework of the SONATA project,
+ funded by the European Commission under Grant number 671517 through
+ the Horizon 2020 and 5G-PPP programmes. The authors would like to
+ acknowledge the contributions of their colleagues of the SONATA
+ partner consortium (www.sonata-nfv.eu).
+*/
var API_HOST = "http://127.0.0.1:5001";
var ERROR_ALERT = false;
var TIMESTAMP = 0;
@@ -40,7 +67,7 @@ function update_table_datacenter(data)
// clear table
$("#table_datacenter").empty();
// header
- $("#table_datacenter").append('
Label | Int. Name | Switch | Num. Containers | Metadata Items |
');
+ $("#table_datacenter").append('Label | Int. Name | Switch | Num. Containers | VNFs |
');
// fill table
$.each(data, function(i, item) {
var row_str = "";
@@ -49,7 +76,8 @@ function update_table_datacenter(data)
row_str += '' + item.internalname + ' | ';
row_str += '' + item.switch + ' | ';
row_str += '' + item.n_running_containers + ' | ';
- row_str += '' + Object.keys(item.metadata).length + ' | ';
+ //row_str += '' + Object.keys(item.metadata).length + ' | ';
+ row_str += '' + item.vnf_list + ' | ';
row_str += '';
$("#table_datacenter").append(row_str);
});
@@ -65,27 +93,43 @@ function update_table_container(data)
// clear table
$("#table_container").empty();
// header
- $("#table_container").append('
Datacenter | Container | Image | docker0 | Status |
');
+ $("#table_container").append('Datacenter | Container | Image | docker0 | --Networking-- |
');
// fill table
$.each(data, function(i, item) {
var row_str = "";
- row_str += '';
+ row_str += '
';
row_str += '' + item[1].datacenter + ' | ';
row_str += '' + item[0] + ' | ';
row_str += '' + item[1].image + ' | ';
- row_str += '' + item[1].docker_network + '
| ';
- if(item[1].state.Status == "running")
- row_str += 'running | ';
- else
- row_str += 'stopped | ';
- row_str += '
';
- $("#table_container").append(row_str);
+ row_str += '' + item[1].docker_network + ' | ';
+ row_str += '';
+ //row_str += build_network_table(item[1].network, item[0]);
+ row_str += ' | ';
+ row_str += '
';
+ $("#table_container").append(row_str);
+ build_network_table(item[1].network, item[0]);
});
$("#lbl_container_count").text(data.length);
+ $("#table_network").append('datacenter port | interface | ip | mac |
')
// update lateness counter
LAST_UPDATE_TIMESTAMP_CONTAINER = Date.now();
}
+function build_network_table(network_list, id)
+{
+ console.debug('network list ' + id)
+ console.debug(network_list)
+ var row_str = "";
+ network_list.forEach(function(interface) {
+ row_str += '';
+ row_str += '' + interface.dc_portname + ' | ';
+ row_str += '' + interface.intf_name + ' | ';
+ row_str += '' + interface.ip + ' | ';
+ row_str += '' + interface.mac + ' | ';
+ row_str += '
';
+ });
+ $("#network_list_" + id).append(row_str)
+}
function fetch_datacenter()
{
@@ -105,6 +149,14 @@ function fetch_container()
}
+function fetch_d3graph()
+{
+ // do HTTP request and trigger gui update on success
+ var request_url = API_HOST + "/restapi/network/d3jsgraph";
+ console.debug("fetching from: " + request_url);
+ //$.getJSON(request_url, update_graph);
+}
+
function fetch_loop()
{
// only fetch if we are connected
@@ -153,6 +205,7 @@ function disconnect()
$(document).ready(function(){
console.info("document ready");
// setup global connection error handling
+ /*
$.ajaxSetup({
"error": errorAjaxConnection
});
@@ -160,6 +213,10 @@ $(document).ready(function(){
// add listeners
$("#btn_connect").click(connect);
$("#btn_disconnect").click(disconnect);
+ */
+ setTimeout(fetch_datacenter, 500);//fetch_datacenter();
+ setTimeout(fetch_container, 1000);//fetch_container();
+
// additional refresh on window focus
$(window).focus(function () {