[AETHER-1243] Adding more host icons and changing the default icon.
Changed default icon to look like server; name is still m_endstation.
New icons are:
- m_terminal (old endstation icon)
- m_tower
- m_slrCamera
- m_videoCamera
- m_cellPhone
- m_endstation1 (alternate server icon)
- m_endstation2 (alternate server icon)
Also enabled other existing icons to serve as host icons, e.g. m_microwave.
Fixed an issue with host icon being different in the detail pane.
To set the icon type, you can use the 'annotate-host' command with 'uiType' annotation, e.g.
annotate-host 00:00:00:00:00:01/None uiType videoCamera
Alternately, use netcfg to configure the 'uiType' attribute.
Change-Id: I5b7e338f3c12319da34012c5a28de8c9a48f0b15
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index 93f41a6..1709476 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -566,7 +566,7 @@
private String glyphForHost(Annotations annot) {
String uiType = annot.value(AnnotationKeys.UI_TYPE);
- return isNullOrEmpty(uiType) ? DEFAULT_HOST_GLYPH : uiType;
+ return isNullOrEmpty(uiType) ? DEFAULT_HOST_GLYPH : "m_" + uiType;
}
// Generates a property panel model for a host details response