mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 10:21:52 +02:00
Code Issues Projects Releases Wiki Activity

Adding option to show no host labels in the GUI.

Browse Source 
Change-Id: I80072b14f15e344fa8a55f40a446085c1538337c
This commit is contained in:
Thomas Vachuska 2017-10-09 18:25:35 +02:00
parent 4929a81e93
commit 528ea95fa1
9 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/api/src/main/java/org/onosproject/ui/UiTopoLayoutService.java
View File

@ -66,6 +66,9 @@ public interface UiTopoLayoutService {
* @param regionId region identifier
* @return corresponding layout
*/
// FIXME: We will need to add support for multiple layouts (logical & physical)
// for the same region and this method won't have sufficient inputs to resolve
// the desired layout.
UiTopoLayout getLayout(RegionId regionId);
/**

2
web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
View File

@ -352,7 +352,7 @@ public abstract class TopologyViewMessageHandlerBase extends UiMessageHandler {
// set ALL connect points
addAllCps(host.locations(), payload);
payload.set("labels", labels(nameForHost(host), ip, host.mac().toString()));
payload.set("labels", labels(nameForHost(host), ip, host.mac().toString(), ""));
payload.set("props", props(host.annotations()));
addGeoLocation(host, payload);
addMetaUi(host.id().toString(), payload);

1
web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo.properties
View File

@ -61,6 +61,7 @@ fl_device_labels_show_id=Show device ID labels
fl_host_labels_show_friendly=Show friendly host labels
fl_host_labels_show_ip=Show host IP addresses
fl_host_labels_show_mac=Show host MAC addresses
fl_host_labels_hide=Hide host labels
fl_offline_devices=Offline Devices
fl_bad_links=Bad Links

2
web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo_es.properties
View File

@ -61,6 +61,8 @@ fl_device_labels_show_id=Muestra etiquetas con el indicador (device ID)
fl_host_labels_show_friendly=Muestra etiquetas con el nombre del host
fl_host_labels_show_ip=Muestra dirección IP del host
fl_host_labels_show_mac=Muestra la dirección MAC del host
fl_host_labels_hide=Hide host labels # TODO
fl_offline_devices=Dispositivos fuera de línea
fl_bad_links=Enlaces con problemas
fl_reset_node_locations=Reinicia la localización de nodos

1
web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo_it.properties
View File

@ -61,6 +61,7 @@ fl_device_labels_show_id=Mostra le etichette con l'ID del device
fl_host_labels_show_friendly=Mostra etichette semplici degli host
fl_host_labels_show_ip=Mostra l'indirizzo IP degli Host
fl_host_labels_show_mac=Mostra l'indirizzo MAC degli Host
fl_host_labels_hide=Hide host labels # TODO
fl_offline_devices=Device disconnessi
fl_bad_links=Link corrotti

1
web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo_ko.properties
View File

@ -61,6 +61,7 @@ fl_device_labels_show_id=장치 ID 라벨 표시
fl_host_labels_show_friendly=익숙한 호스트 라벨 표시
fl_host_labels_show_ip=호스트 IP 주소 표시
fl_host_labels_show_mac=호스트 MAC 주소 표시
fl_host_labels_hide=Hide host labels # TODO
fl_offline_devices=오프라인 장치
fl_bad_links=잘못된 링크

1
web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo_zh_CN.properties
View File

@ -61,6 +61,7 @@ fl_device_labels_show_id=显示设备ID标签
fl_host_labels_show_friendly=显示友好的主机标签
fl_host_labels_show_ip=显示主机IP地址
fl_host_labels_show_mac=显示主机MAC地址
fl_host_labels_hide=Hide host labels # TODO
fl_offline_devices=离线设备
fl_bad_links=失效链路

1
web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo_zh_TW.properties
View File

@ -61,6 +61,7 @@ fl_device_labels_show_id=顯示設備 ID 的標籤
fl_host_labels_show_friendly=顯示易讀主機的標籤
fl_host_labels_show_ip=顯示主機的 IP 位址
fl_host_labels_show_mac=顯示主機的 MAC 位址
fl_host_labels_hide=Hide host labels # TODO
fl_offline_devices=離線設備
fl_bad_links=不良的連結

3
web/gui/src/main/webapp/app/view/topo/topoD3.js
View File

@ -150,11 +150,12 @@
case 0: return topoLion('fl_host_labels_show_friendly');
case 1: return topoLion('fl_host_labels_show_ip');
case 2: return topoLion('fl_host_labels_show_mac');
case 3: return topoLion('fl_host_labels_hide');
}
}
function setHostLabIndex(mode) {
hostLabelIndex = mode % 3;
hostLabelIndex = mode % 4;
var p = ps.getPrefs('topo_prefs', ttbs.defaultPrefs);
p.hlbls = hostLabelIndex;
ps.setPrefs('topo_prefs', p);