ONOS-6730: Topo View i18n:
- Deprecate non-localized PropertyPanel.addProp() methods.
- Add modify*LinkDetails() methods to UiTopoOverlay class.
- Augment TVMH.RequestDetails to handle link details requests.
- Refactor deviceDetails() to allow piecemeal construction of the Properties Panel.
This allows us to include (or not) the location properties (geo/grid).
- Refactor hostDetails() for piecemeal construction of Properties Panel.
- Add edgeLinkDetails() and infraLinkDetails() methods.
- No lat/long suppression now done server-side. Check for trailing separator.
- Augment requestDetails() to format link details requests.
- Added lion.getSafe(Enum<?>) method.
- Added DeviceEnums and LinkEnums resource bundles.
Change-Id: Ibbd113a7d5ef73765cd10aed0fb7ea8efbaa16c5
diff --git a/core/api/src/main/java/org/onosproject/net/link/LinkService.java b/core/api/src/main/java/org/onosproject/net/link/LinkService.java
index 9d838ac..382ea52 100644
--- a/core/api/src/main/java/org/onosproject/net/link/LinkService.java
+++ b/core/api/src/main/java/org/onosproject/net/link/LinkService.java
@@ -103,6 +103,8 @@
// FIXME: I don't think this makes sense; discuss and remove or adjust return
// to be a Set<Link> or add Link.Type parameter
+ // NOTE: TopoViewMessageHandler uses this to acquire a given link from
+ // two connect points. Would hate to see this method go away.. SDH
/**
* Returns the infrastructure links between the specified source
* and destination connection points.
diff --git a/core/api/src/main/java/org/onosproject/ui/UiTopoOverlay.java b/core/api/src/main/java/org/onosproject/ui/UiTopoOverlay.java
index 5e0b439..c373bd3 100644
--- a/core/api/src/main/java/org/onosproject/ui/UiTopoOverlay.java
+++ b/core/api/src/main/java/org/onosproject/ui/UiTopoOverlay.java
@@ -16,6 +16,7 @@
package org.onosproject.ui;
+import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.HostId;
import org.onosproject.net.link.LinkEvent;
@@ -114,7 +115,7 @@
* a selected device.
* This default implementation does nothing.
*
- * @param pp property panel model of summary data
+ * @param pp property panel model of device data
* @param deviceId device id
*/
public void modifyDeviceDetails(PropertyPanel pp, DeviceId deviceId) {
@@ -125,13 +126,48 @@
* a selected host.
* This default implementation does nothing.
*
- * @param pp property panel model of summary data
+ * @param pp property panel model of host data
* @param hostId host id
*/
public void modifyHostDetails(PropertyPanel pp, HostId hostId) {
}
/**
+ * Callback to modify the contents of the details panel for a selected
+ * edge link. The parameters include identifiers for the host and the
+ * connect point (device and port) to which the host is connected.
+ * <p>
+ * This default implementation does nothing.
+ *
+ * @param pp property panel model of edge link data
+ * @param hostId host ID
+ * @param cp connect point
+ */
+ public void modifyEdgeLinkDetails(PropertyPanel pp,
+ HostId hostId, ConnectPoint cp) {
+ }
+
+ /**
+ * Callback to modify the contents of the details panel for a selected
+ * infrastructure link. The parameters include the two connect points
+ * at either end of the link.
+ * <p>
+ * Note that links in the topology view are (usually) "bi-directional",
+ * meaning that both {@literal A-->B} and {@literal B-->A} backing links
+ * exist. If, however, there is only one backing link, it is guaranteed
+ * to be {@literal A-->B}.
+ * <p>
+ * This default implementation does nothing.
+ *
+ * @param pp property panel model of infrastructure link data
+ * @param cpA connect point A
+ * @param cpB connect point B
+ */
+ public void modifyInfraLinkDetails(PropertyPanel pp,
+ ConnectPoint cpA, ConnectPoint cpB) {
+ }
+
+ /**
* Callback invoked when a link event is processed (e.g. link added).
* A subclass may override this method to return a map of property
* key/value pairs to be included in the JSON event back to the client,
@@ -144,7 +180,8 @@
* @param event the link event
* @return map of additional key/value pairs to be added to the JSON event
* @deprecated this is a temporary addition for Goldeneye (1.6) release,
- * and expected to be replaced in the Ibis (1.8) release
+ * and is superceded by use of {@link #modifyEdgeLinkDetails} and
+ * {@link #modifyInfraLinkDetails}.
*/
@Deprecated
public Map<String, String> additionalLinkData(LinkEvent event) {
diff --git a/core/api/src/main/java/org/onosproject/ui/lion/LionBundle.java b/core/api/src/main/java/org/onosproject/ui/lion/LionBundle.java
index 780dea8..56fc4bc 100644
--- a/core/api/src/main/java/org/onosproject/ui/lion/LionBundle.java
+++ b/core/api/src/main/java/org/onosproject/ui/lion/LionBundle.java
@@ -97,6 +97,17 @@
}
/**
+ * Converts the given enum constant to lowercase and then uses that as the
+ * key to invoke {@link #getSafe(String)}.
+ *
+ * @param enumConst the constant to use as the key
+ * @return the localized value (or a wrapped key placeholder)
+ */
+ public String getSafe(Enum<?> enumConst) {
+ return getSafe(enumConst.name().toLowerCase());
+ }
+
+ /**
* Returns an immutable set of the items in this bundle.
*
* @return the items in this bundle
diff --git a/core/api/src/main/java/org/onosproject/ui/topo/PropertyPanel.java b/core/api/src/main/java/org/onosproject/ui/topo/PropertyPanel.java
index 561fa76..892a75d 100644
--- a/core/api/src/main/java/org/onosproject/ui/topo/PropertyPanel.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/PropertyPanel.java
@@ -31,7 +31,7 @@
private static final NumberFormat NF = NumberFormat.getInstance();
private String title;
- private String typeId;
+ private String glyphId;
private String id;
private String navPath;
private List<Prop> properties = new ArrayList<>();
@@ -39,14 +39,14 @@
/**
* Constructs a property panel model with the given title and
- * type identifier (icon to display).
+ * glyph identifier (icon to display).
*
- * @param title title text
- * @param typeId type (icon) ID
+ * @param title title text
+ * @param glyphId glyph ID
*/
- public PropertyPanel(String title, String typeId) {
+ public PropertyPanel(String title, String glyphId) {
this.title = title;
- this.typeId = typeId;
+ this.glyphId = glyphId;
}
/**
@@ -154,7 +154,7 @@
* regular expression string are stripped.
*
* @param key property key
- * @param label property label (localized)
+ * @param label property label (localized)
* @param value property value
* @param reStrip regexp characters to strip from value string
* @return self, for chaining
@@ -177,8 +177,9 @@
* @param key property key (also used as display label)
* @param value property value
* @return self, for chaining
- * @see #addProp(String, String, String)
+ * @deprecated as of Loon (1.11) in deference to the localized version
*/
+ @Deprecated
public PropertyPanel addProp(String key, String value) {
return addProp(key, key, value);
}
@@ -190,7 +191,9 @@
* @param key property key (also used as display label)
* @param value property value
* @return self, for chaining
+ * @deprecated as of Loon (1.11) in deference to the localized version
*/
+ @Deprecated
public PropertyPanel addProp(String key, int value) {
return addProp(key, key, value);
}
@@ -202,7 +205,9 @@
* @param key property key (also used as display label)
* @param value property value
* @return self, for chaining
+ * @deprecated as of Loon (1.11) in deference to the localized version
*/
+ @Deprecated
public PropertyPanel addProp(String key, long value) {
return addProp(key, key, value);
}
@@ -216,7 +221,9 @@
* @param key property key (also used as display label)
* @param value property value
* @return self, for chaining
+ * @deprecated as of Loon (1.11) in deference to the localized version
*/
+ @Deprecated
public PropertyPanel addProp(String key, Object value) {
return addProp(key, key, value);
}
@@ -232,7 +239,9 @@
* @param value property value
* @param reStrip regexp characters to strip from value string
* @return self, for chaining
+ * @deprecated as of Loon (1.11) in deference to the localized version
*/
+ @Deprecated
public PropertyPanel addProp(String key, Object value, String reStrip) {
return addProp(key, key, value, reStrip);
}
@@ -257,12 +266,12 @@
}
/**
- * Returns the type identifier.
+ * Returns the glyph identifier.
*
- * @return type identifier
+ * @return glyph identifier
*/
- public String typeId() {
- return typeId;
+ public String glyphId() {
+ return glyphId;
}
/**
@@ -288,7 +297,6 @@
*
* @return the property list
*/
- // TODO: consider protecting this?
public List<Prop> properties() {
return properties;
}
@@ -298,7 +306,6 @@
*
* @return the button list
*/
- // TODO: consider protecting this?
public List<ButtonId> buttons() {
return buttons;
}
@@ -317,13 +324,13 @@
}
/**
- * Sets the type identifier (icon ID).
+ * Sets the glyph identifier.
*
- * @param typeId type identifier
+ * @param glyphId glyph identifier
* @return self, for chaining
*/
- public PropertyPanel typeId(String typeId) {
- this.typeId = typeId;
+ public PropertyPanel glyphId(String glyphId) {
+ this.glyphId = glyphId;
return this;
}
@@ -478,8 +485,8 @@
/**
* Auxiliary class representing a separator property.
*/
- public static class Separator extends Prop {
- public Separator() {
+ static class Separator extends Prop {
+ Separator() {
super("-", "-", "");
}
}
diff --git a/core/api/src/main/java/org/onosproject/ui/topo/TopoConstants.java b/core/api/src/main/java/org/onosproject/ui/topo/TopoConstants.java
index c5952a1..50898ab 100644
--- a/core/api/src/main/java/org/onosproject/ui/topo/TopoConstants.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/TopoConstants.java
@@ -22,8 +22,8 @@
public final class TopoConstants {
/**
- * Defines constants for property keys on the default summary and
- * details panels. Note that display labels should be looked up using
+ * Defines constants for property/localization keys on the default summary
+ * and details panels. Note that display labels should be looked up using
* the "core.view.Topo" localization bundle (LionBundle).
*/
public static final class Properties {
@@ -56,6 +56,7 @@
public static final String MAC = "mac";
public static final String IP = "ip";
public static final String VLAN = "vlan";
+ public static final String VLAN_NONE = "vlan_none";
}
/**
diff --git a/core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java b/core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java
index a0646c7..07a187c 100644
--- a/core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java
@@ -46,7 +46,7 @@
static final String MSG = "msg";
static final String TITLE = "title";
- static final String TYPE = "type";
+ static final String GLYPH_ID = "glyphId";
static final String NAV_PATH = "navPath";
static final String PROP_ORDER = "propOrder";
static final String PROP_LABELS = "propLabels";
@@ -179,7 +179,7 @@
public static ObjectNode json(PropertyPanel pp) {
ObjectNode result = objectNode()
.put(TITLE, pp.title())
- .put(TYPE, pp.typeId())
+ .put(GLYPH_ID, pp.glyphId())
.put(ID, pp.id());
if (pp.navPath() != null) {
diff --git a/core/api/src/test/java/org/onosproject/ui/topo/PropertyPanelTest.java b/core/api/src/test/java/org/onosproject/ui/topo/PropertyPanelTest.java
index 6ae6849..aeaa0ae 100644
--- a/core/api/src/test/java/org/onosproject/ui/topo/PropertyPanelTest.java
+++ b/core/api/src/test/java/org/onosproject/ui/topo/PropertyPanelTest.java
@@ -42,8 +42,8 @@
private static final NumberFormat ENGLISH_FORMATTER =
NumberFormat.getInstance(Locale.ENGLISH);
- public EnglishPropertyPanel(String title, String typeId) {
- super(title, typeId);
+ public EnglishPropertyPanel(String title, String glyphId) {
+ super(title, glyphId);
}
@Override
@@ -53,9 +53,9 @@
}
private static final String TITLE_ORIG = "Original Title";
- private static final String TYPE_ORIG = "Original type ID";
+ private static final String GLYPH_ORIG = "Original glyph ID";
private static final String TITLE_NEW = "New Title";
- private static final String TYPE_NEW = "New type";
+ private static final String GLYPH_NEW = "New glyph ID";
private static final String SOME_IDENTIFICATION = "It's Me!";
private static final String KEY_A = "A";
@@ -103,9 +103,9 @@
@Test
public void basic() {
- pp = new EnglishPropertyPanel(TITLE_ORIG, TYPE_ORIG);
+ pp = new EnglishPropertyPanel(TITLE_ORIG, GLYPH_ORIG);
assertEquals("wrong title", TITLE_ORIG, pp.title());
- assertEquals("wrong type", TYPE_ORIG, pp.typeId());
+ assertEquals("wrong glyph", GLYPH_ORIG, pp.glyphId());
assertNull("id?", pp.id());
assertEquals("unexpected props", 0, pp.properties().size());
assertEquals("unexpected buttons", 0, pp.buttons().size());
@@ -119,10 +119,10 @@
}
@Test
- public void changeType() {
+ public void changeGlyph() {
basic();
- pp.typeId(TYPE_NEW);
- assertEquals("wrong type", TYPE_NEW, pp.typeId());
+ pp.glyphId(GLYPH_NEW);
+ assertEquals("wrong glyph", GLYPH_NEW, pp.glyphId());
}
@Test
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
index 3cbce06..a359964 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
@@ -80,6 +80,7 @@
import static java.util.concurrent.Executors.newSingleThreadExecutor;
import static org.onlab.util.Tools.groupedThreads;
import static org.onosproject.cluster.ClusterEvent.Type.INSTANCE_ADDED;
+import static org.onosproject.net.ConnectPoint.deviceConnectPoint;
import static org.onosproject.net.DeviceId.deviceId;
import static org.onosproject.net.HostId.hostId;
import static org.onosproject.net.device.DeviceEvent.Type.DEVICE_ADDED;
@@ -137,10 +138,16 @@
private static final String EXTRA = "extra";
private static final String ID = "id";
private static final String KEY = "key";
+ private static final String IS_EDGE_LINK = "isEdgeLink";
+ private static final String SOURCE_ID = "sourceId";
+ private static final String SOURCE_PORT = "sourcePort";
+ private static final String TARGET_ID = "targetId";
+ private static final String TARGET_PORT = "targetPort";
private static final String APP_ID = "appId";
private static final String APP_NAME = "appName";
private static final String DEVICE = "device";
private static final String HOST = "host";
+ private static final String LINK = "link";
private static final String CLASS = "class";
private static final String UNKNOWN = "unknown";
private static final String ONE = "one";
@@ -162,6 +169,8 @@
private static final String MY_APP_ID = "org.onosproject.gui";
+ private static final String SLASH = "/";
+
private static final long TRAFFIC_PERIOD = 5000;
private static final long SUMMARY_PERIOD = 30000;
@@ -362,20 +371,48 @@
@Override
public void process(ObjectNode payload) {
String type = string(payload, CLASS, UNKNOWN);
- String id = string(payload, ID);
+ String id = string(payload, ID, "");
PropertyPanel pp = null;
if (type.equals(DEVICE)) {
DeviceId did = deviceId(id);
pp = deviceDetails(did);
overlayCache.currentOverlay().modifyDeviceDetails(pp, did);
+
} else if (type.equals(HOST)) {
HostId hid = hostId(id);
pp = hostDetails(hid);
overlayCache.currentOverlay().modifyHostDetails(pp, hid);
+
+ } else if (type.equals(LINK)) {
+ String srcId = string(payload, SOURCE_ID);
+ String tgtId = string(payload, TARGET_ID);
+ boolean isEdgeLink = bool(payload, IS_EDGE_LINK);
+
+ if (isEdgeLink) {
+ HostId hid = hostId(srcId);
+ String cpstr = tgtId + SLASH + string(payload, TARGET_PORT);
+ ConnectPoint cp = deviceConnectPoint(cpstr);
+
+ pp = edgeLinkDetails(hid, cp);
+ overlayCache.currentOverlay().modifyEdgeLinkDetails(pp, hid, cp);
+
+ } else {
+ String cpAstr = srcId + SLASH + string(payload, SOURCE_PORT);
+ String cpBstr = tgtId + SLASH + string(payload, TARGET_PORT);
+ ConnectPoint cpA = deviceConnectPoint(cpAstr);
+ ConnectPoint cpB = deviceConnectPoint(cpBstr);
+
+ pp = infraLinkDetails(cpA, cpB);
+ overlayCache.currentOverlay().modifyInfraLinkDetails(pp, cpA, cpB);
+ }
}
- sendMessage(envelope(SHOW_DETAILS, json(pp)));
+ if (pp != null) {
+ sendMessage(envelope(SHOW_DETAILS, json(pp)));
+ } else {
+ log.warn("Unable to process details request: {}", payload);
+ }
}
}
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 c2e290d..c3eae02 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
@@ -21,6 +21,7 @@
import com.google.common.collect.ImmutableSet;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.packet.IpAddress;
+import org.onlab.packet.VlanId;
import org.onlab.util.DefaultHashMap;
import org.onosproject.cluster.ClusterEvent;
import org.onosproject.cluster.ControllerNode;
@@ -67,15 +68,29 @@
import static com.google.common.base.Strings.isNullOrEmpty;
import static org.onosproject.net.PortNumber.portNumber;
import static org.onosproject.ui.topo.TopoConstants.CoreButtons;
-import static org.onosproject.ui.topo.TopoConstants.Properties;
import static org.onosproject.ui.topo.TopoConstants.Properties.DEVICES;
import static org.onosproject.ui.topo.TopoConstants.Properties.FLOWS;
+import static org.onosproject.ui.topo.TopoConstants.Properties.GRID_X;
+import static org.onosproject.ui.topo.TopoConstants.Properties.GRID_Y;
import static org.onosproject.ui.topo.TopoConstants.Properties.HOSTS;
+import static org.onosproject.ui.topo.TopoConstants.Properties.HW_VERSION;
import static org.onosproject.ui.topo.TopoConstants.Properties.INTENTS;
+import static org.onosproject.ui.topo.TopoConstants.Properties.IP;
+import static org.onosproject.ui.topo.TopoConstants.Properties.LATITUDE;
import static org.onosproject.ui.topo.TopoConstants.Properties.LINKS;
+import static org.onosproject.ui.topo.TopoConstants.Properties.LONGITUDE;
+import static org.onosproject.ui.topo.TopoConstants.Properties.MAC;
+import static org.onosproject.ui.topo.TopoConstants.Properties.PORTS;
+import static org.onosproject.ui.topo.TopoConstants.Properties.PROTOCOL;
+import static org.onosproject.ui.topo.TopoConstants.Properties.SERIAL_NUMBER;
+import static org.onosproject.ui.topo.TopoConstants.Properties.SW_VERSION;
import static org.onosproject.ui.topo.TopoConstants.Properties.TOPOLOGY_SSCS;
import static org.onosproject.ui.topo.TopoConstants.Properties.TUNNELS;
+import static org.onosproject.ui.topo.TopoConstants.Properties.URI;
+import static org.onosproject.ui.topo.TopoConstants.Properties.VENDOR;
import static org.onosproject.ui.topo.TopoConstants.Properties.VERSION;
+import static org.onosproject.ui.topo.TopoConstants.Properties.VLAN;
+import static org.onosproject.ui.topo.TopoConstants.Properties.VLAN_NONE;
import static org.onosproject.ui.topo.TopoUtils.compactLinkString;
/**
@@ -85,11 +100,32 @@
private static final String NO_GEO_VALUE = "0.0";
private static final String DASH = "-";
+ private static final String SLASH = " / ";
// nav paths are the view names for hot-link navigation from topo view...
private static final String DEVICE_NAV_PATH = "device";
private static final String HOST_NAV_PATH = "host";
+ // link panel label keys
+ private static final String LPL_FRIENDLY = "lp_label_friendly";
+ private static final String LPL_A_TYPE = "lp_label_a_type";
+ private static final String LPL_A_ID = "lp_label_a_id";
+ private static final String LPL_A_FRIENDLY = "lp_label_a_friendly";
+ private static final String LPL_A_PORT = "lp_label_a_port";
+ private static final String LPL_B_TYPE = "lp_label_b_type";
+ private static final String LPL_B_ID = "lp_label_b_id";
+ private static final String LPL_B_FRIENDLY = "lp_label_b_friendly";
+ private static final String LPL_B_PORT = "lp_label_b_port";
+ private static final String LPL_A2B = "lp_label_a2b";
+ private static final String LPL_B2A = "lp_label_b2a";
+ private static final String LPV_NO_LINK = "lp_value_no_link";
+
+ // other Lion keys
+ private static final String HOST = "host";
+ private static final String DEVICE = "device";
+ private static final String EXPECTED = "expected";
+ private static final String NOT_EXPECTED = "not_expected";
+
// default to an "add" event...
private static final DefaultHashMap<ClusterEvent.Type, String> CLUSTER_EVENT =
new DefaultHashMap<>("addInstance");
@@ -117,6 +153,32 @@
HOST_EVENT.put(HostEvent.Type.HOST_MOVED, "moveHost");
}
+ private static final DefaultHashMap<Device.Type, String> DEVICE_GLYPHS =
+ new DefaultHashMap<>("m_unknown");
+
+ static {
+ DEVICE_GLYPHS.put(Device.Type.SWITCH, "m_switch");
+ DEVICE_GLYPHS.put(Device.Type.ROUTER, "m_router");
+ DEVICE_GLYPHS.put(Device.Type.ROADM, "m_roadm");
+ DEVICE_GLYPHS.put(Device.Type.OTN, "m_otn");
+ DEVICE_GLYPHS.put(Device.Type.ROADM_OTN, "m_roadm_otn");
+ DEVICE_GLYPHS.put(Device.Type.BALANCER, "m_balancer");
+ DEVICE_GLYPHS.put(Device.Type.IPS, "m_ips");
+ DEVICE_GLYPHS.put(Device.Type.IDS, "m_ids");
+ DEVICE_GLYPHS.put(Device.Type.CONTROLLER, "m_controller");
+ DEVICE_GLYPHS.put(Device.Type.VIRTUAL, "m_virtual");
+ DEVICE_GLYPHS.put(Device.Type.FIBER_SWITCH, "m_fiberSwitch");
+ DEVICE_GLYPHS.put(Device.Type.MICROWAVE, "m_microwave");
+ DEVICE_GLYPHS.put(Device.Type.OLT, "m_olt");
+ DEVICE_GLYPHS.put(Device.Type.ONU, "m_onu");
+ DEVICE_GLYPHS.put(Device.Type.OPTICAL_AMPLIFIER, "unknown"); // TODO glyph needed
+ DEVICE_GLYPHS.put(Device.Type.OTHER, "m_other");
+ }
+
+ private static final String DEFAULT_HOST_GLYPH = "m_endstation";
+ private static final String LINK_GLYPH = "m_ports";
+
+
protected static final Logger log =
LoggerFactory.getLogger(TopologyViewMessageHandlerBase.class);
@@ -368,13 +430,19 @@
// -----------------------------------------------------------------------
// Create models of the data to return, that overlays can adjust / augment
+ private String lookupGlyph(Device device) {
+ return DEVICE_GLYPHS.get(device.type());
+ }
+
+
// Returns property panel model for summary response.
protected PropertyPanel summmaryMessage() {
+ // chose NOT to add debug messages, since this is called every few seconds
Topology topology = services.topology().currentTopology();
LionBundle lion = getLionBundle(LION_TOPO);
String panelTitle = lion.getSafe("title_panel_summary");
- return new PropertyPanel(panelTitle, "node")
+ return new PropertyPanel(panelTitle, "bird")
.addProp(VERSION, lion.getSafe(VERSION), version)
.addSeparator()
.addProp(DEVICES, lion.getSafe(DEVICES), services.device().getDeviceCount())
@@ -387,39 +455,79 @@
.addProp(FLOWS, lion.getSafe(FLOWS), services.flow().getFlowRuleCount());
}
- // Returns property panel model for device details response.
- protected PropertyPanel deviceDetails(DeviceId deviceId) {
+
+ private String friendlyDevice(DeviceId deviceId) {
Device device = services.device().getDevice(deviceId);
Annotations annot = device.annotations();
String name = annot.value(AnnotationKeys.NAME);
+ return isNullOrEmpty(name) ? deviceId.toString() : name;
+ }
+
+ // Generates a property panel model for device details response
+ protected PropertyPanel deviceDetails(DeviceId deviceId) {
+ log.debug("generate prop panel data for device {}", deviceId);
+ Device device = services.device().getDevice(deviceId);
+ Annotations annot = device.annotations();
+ String proto = annot.value(AnnotationKeys.PROTOCOL);
+ String title = friendlyDevice(deviceId);
+ LionBundle lion = getLionBundle(LION_TOPO);
+
+ PropertyPanel pp = new PropertyPanel(title, lookupGlyph(device))
+ .navPath(DEVICE_NAV_PATH)
+ .id(deviceId.toString());
+ addDeviceBasicProps(pp, deviceId, device, proto, lion);
+ addLocationProps(pp, annot, lion);
+ addDeviceCountStats(pp, deviceId, lion);
+ addDeviceCoreButtons(pp);
+ return pp;
+ }
+
+ private void addDeviceBasicProps(PropertyPanel pp, DeviceId deviceId,
+ Device device, String proto, LionBundle lion) {
+ pp.addProp(URI, lion.getSafe(URI), deviceId.toString())
+ .addProp(VENDOR, lion.getSafe(VENDOR), device.manufacturer())
+ .addProp(HW_VERSION, lion.getSafe(HW_VERSION), device.hwVersion())
+ .addProp(SW_VERSION, lion.getSafe(SW_VERSION), device.swVersion())
+ .addProp(SERIAL_NUMBER, lion.getSafe(SERIAL_NUMBER), device.serialNumber())
+ .addProp(PROTOCOL, lion.getSafe(PROTOCOL), proto)
+ .addSeparator();
+ }
+
+ // only add location properties if we have them
+ private void addLocationProps(PropertyPanel pp, Annotations annot,
+ LionBundle lion) {
+ String slat = annot.value(AnnotationKeys.LATITUDE);
+ String slng = annot.value(AnnotationKeys.LONGITUDE);
+ String sgrY = annot.value(AnnotationKeys.GRID_Y);
+ String sgrX = annot.value(AnnotationKeys.GRID_X);
+
+ boolean validLat = slat != null && !slat.equals(NO_GEO_VALUE);
+ boolean validLng = slng != null && !slng.equals(NO_GEO_VALUE);
+ if (validLat && validLng) {
+ pp.addProp(LATITUDE, lion.getSafe(LATITUDE), slat)
+ .addProp(LONGITUDE, lion.getSafe(LONGITUDE), slng)
+ .addSeparator();
+
+ } else if (sgrY != null && sgrX != null) {
+ pp.addProp(GRID_Y, lion.getSafe(GRID_Y), sgrY)
+ .addProp(GRID_X, lion.getSafe(GRID_X), sgrX)
+ .addSeparator();
+ }
+ // else, no location
+ }
+
+ private void addDeviceCountStats(PropertyPanel pp, DeviceId deviceId, LionBundle lion) {
int portCount = services.device().getPorts(deviceId).size();
int flowCount = getFlowCount(deviceId);
int tunnelCount = getTunnelCount(deviceId);
- String title = isNullOrEmpty(name) ? deviceId.toString() : name;
- String typeId = device.type().toString().toLowerCase();
+ pp.addProp(PORTS, lion.getSafe(PORTS), portCount)
+ .addProp(FLOWS, lion.getSafe(FLOWS), flowCount)
+ .addProp(TUNNELS, lion.getSafe(TUNNELS), tunnelCount);
+ }
- return new PropertyPanel(title, typeId)
- .navPath(DEVICE_NAV_PATH)
- .id(deviceId.toString())
-
- .addProp(Properties.URI, deviceId.toString())
- .addProp(Properties.VENDOR, device.manufacturer())
- .addProp(Properties.HW_VERSION, device.hwVersion())
- .addProp(Properties.SW_VERSION, device.swVersion())
- .addProp(Properties.SERIAL_NUMBER, device.serialNumber())
- .addProp(Properties.PROTOCOL, annot.value(AnnotationKeys.PROTOCOL))
- .addSeparator()
-
- .addProp(Properties.LATITUDE, annot.value(AnnotationKeys.LATITUDE))
- .addProp(Properties.LONGITUDE, annot.value(AnnotationKeys.LONGITUDE))
- .addSeparator()
-
- .addProp(Properties.PORTS, portCount)
- .addProp(FLOWS, flowCount)
- .addProp(TUNNELS, tunnelCount)
-
- .addButton(CoreButtons.SHOW_DEVICE_VIEW)
+ private void addDeviceCoreButtons(PropertyPanel pp) {
+ pp.addButton(CoreButtons.SHOW_DEVICE_VIEW)
.addButton(CoreButtons.SHOW_FLOW_VIEW)
.addButton(CoreButtons.SHOW_PORT_VIEW)
.addButton(CoreButtons.SHOW_GROUP_VIEW)
@@ -467,23 +575,108 @@
return useDefaultName(name) ? ip(host.ipAddresses()) : name;
}
- // Returns host details response.
- protected PropertyPanel hostDetails(HostId hostId) {
- Host host = services.host().getHost(hostId);
- Annotations annot = host.annotations();
- String type = annot.value(AnnotationKeys.TYPE);
- String vlan = host.vlan().toString();
- String typeId = isNullOrEmpty(type) ? "endstation" : type;
-
- return new PropertyPanel(nameForHost(host), typeId)
- .navPath(HOST_NAV_PATH)
- .id(hostId.toString())
- .addProp(Properties.MAC, host.mac())
- .addProp(Properties.IP, host.ipAddresses(), "[\\[\\]]")
- .addProp(Properties.VLAN, "-1".equals(vlan) ? "none" : vlan)
- .addSeparator()
- .addProp(Properties.LATITUDE, annot.value(AnnotationKeys.LATITUDE))
- .addProp(Properties.LONGITUDE, annot.value(AnnotationKeys.LONGITUDE));
+ private String glyphForHost(Annotations annot) {
+ String uiType = annot.value(AnnotationKeys.UI_TYPE);
+ return isNullOrEmpty(uiType) ? DEFAULT_HOST_GLYPH : uiType;
}
+ // Generates a property panel model for a host details response
+ protected PropertyPanel hostDetails(HostId hostId) {
+ log.debug("generate prop panel data for host {}", hostId);
+ Host host = services.host().getHost(hostId);
+ Annotations annot = host.annotations();
+ String glyphId = glyphForHost(annot);
+ LionBundle lion = getLionBundle(LION_TOPO);
+
+ PropertyPanel pp = new PropertyPanel(nameForHost(host), glyphId)
+ .navPath(HOST_NAV_PATH)
+ .id(hostId.toString());
+ addHostBasicProps(pp, host, lion);
+ addLocationProps(pp, annot, lion);
+ return pp;
+ }
+
+ private void addHostBasicProps(PropertyPanel pp, Host host, LionBundle lion) {
+ pp.addProp(LPL_FRIENDLY, lion.getSafe(LPL_FRIENDLY), nameForHost(host))
+ .addProp(MAC, lion.getSafe(MAC), host.mac())
+ .addProp(IP, lion.getSafe(IP), host.ipAddresses(), "[\\[\\]]")
+ .addProp(VLAN, lion.getSafe(VLAN), displayVlan(host.vlan(), lion))
+ .addSeparator();
+ }
+
+ private String displayVlan(VlanId vlan, LionBundle lion) {
+ return VlanId.NONE.equals(vlan) ? lion.getSafe(VLAN_NONE) : vlan.toString();
+ }
+
+ // Generates a property panel model for a link details response (edge-link)
+ protected PropertyPanel edgeLinkDetails(HostId hid, ConnectPoint cp) {
+ log.debug("generate prop panel data for edgelink {} {}", hid, cp);
+ LionBundle lion = getLionBundle(LION_TOPO);
+ String title = lion.getSafe("title_edge_link");
+
+ PropertyPanel pp = new PropertyPanel(title, LINK_GLYPH);
+ addLinkHostProps(pp, hid, lion);
+ addLinkCpBProps(pp, cp, lion);
+ return pp;
+ }
+
+ // Generates a property panel model for a link details response (infra-link)
+ protected PropertyPanel infraLinkDetails(ConnectPoint cpA, ConnectPoint cpB) {
+ log.debug("generate prop panel data for infralink {} {}", cpA, cpB);
+ LionBundle lion = getLionBundle(LION_TOPO);
+ String title = lion.getSafe("title_infra_link");
+
+ PropertyPanel pp = new PropertyPanel(title, LINK_GLYPH);
+ addLinkCpAProps(pp, cpA, lion);
+ addLinkCpBProps(pp, cpB, lion);
+ addLinkBackingProps(pp, cpA, cpB, lion);
+ return pp;
+ }
+
+ private void addLinkHostProps(PropertyPanel pp, HostId hostId, LionBundle lion) {
+ Host host = services.host().getHost(hostId);
+
+ pp.addProp(LPL_A_TYPE, lion.getSafe(LPL_A_TYPE), lion.getSafe(HOST))
+ .addProp(LPL_A_ID, lion.getSafe(LPL_A_ID), hostId.toString())
+ .addProp(LPL_A_FRIENDLY, lion.getSafe(LPL_A_FRIENDLY), nameForHost(host))
+ .addSeparator();
+ }
+
+ private void addLinkCpAProps(PropertyPanel pp, ConnectPoint cp, LionBundle lion) {
+ DeviceId did = cp.deviceId();
+
+ pp.addProp(LPL_A_TYPE, lion.getSafe(LPL_A_TYPE), lion.getSafe(DEVICE))
+ .addProp(LPL_A_ID, lion.getSafe(LPL_A_ID), did.toString())
+ .addProp(LPL_A_FRIENDLY, lion.getSafe(LPL_A_FRIENDLY), friendlyDevice(did))
+ .addProp(LPL_A_PORT, lion.getSafe(LPL_A_PORT), cp.port().toLong())
+ .addSeparator();
+ }
+
+ private void addLinkCpBProps(PropertyPanel pp, ConnectPoint cp, LionBundle lion) {
+ DeviceId did = cp.deviceId();
+
+ pp.addProp(LPL_B_TYPE, lion.getSafe(LPL_B_TYPE), lion.getSafe(DEVICE))
+ .addProp(LPL_B_ID, lion.getSafe(LPL_B_ID), did.toString())
+ .addProp(LPL_B_FRIENDLY, lion.getSafe(LPL_B_FRIENDLY), friendlyDevice(did))
+ .addProp(LPL_B_PORT, lion.getSafe(LPL_B_PORT), cp.port().toLong())
+ .addSeparator();
+ }
+
+ private void addLinkBackingProps(PropertyPanel pp, ConnectPoint cpA,
+ ConnectPoint cpB, LionBundle lion) {
+ Link a2b = services.link().getLink(cpA, cpB);
+ Link b2a = services.link().getLink(cpB, cpA);
+
+ pp.addProp(LPL_A2B, lion.getSafe(LPL_A2B), linkPropString(a2b, lion))
+ .addProp(LPL_B2A, lion.getSafe(LPL_B2A), linkPropString(b2a, lion));
+ }
+
+ private String linkPropString(Link link, LionBundle lion) {
+ if (link == null) {
+ return lion.getSafe(LPV_NO_LINK);
+ }
+ return lion.getSafe(link.type()) + SLASH +
+ lion.getSafe(link.state()) + SLASH +
+ lion.getSafe(link.isExpected() ? EXPECTED : NOT_EXPECTED);
+ }
}
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/_config/core.view.Topo.lioncfg b/web/gui/src/main/resources/org/onosproject/ui/lion/_config/core.view.Topo.lioncfg
index 3f4d269..ed18b10 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/_config/core.view.Topo.lioncfg
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/_config/core.view.Topo.lioncfg
@@ -18,15 +18,18 @@
bundle core.view.Topo
alias cv core.view
+alias ce core.enums
alias cf core.fw
alias cc core.common
from cv.Topo import *
+from ce.LinkEnums import *
+
from cf.QuickHelp import qh_hint_close_detail
from cc.Action import show, hide, enable, disable, select
-from cc.Network import devices, links, hosts, topology_sccs, intents, tunnels, flows, protocol
-from cc.Props import version, vendor, hw_version, sw_version, serial_number
-from cc.State import visible, hidden
+from cc.Network import devices, links, hosts, topology_sccs, intents, tunnels, flows, ports, protocol, uri, mac, ip, vlan, device, host
+from cc.Props import version, vendor, hw_version, sw_version, serial_number, latitude, longitude, grid_y, grid_x
+from cc.State import visible, hidden, vlan_none, expected, not_expected
from cc.Ui import click, shift_click, drag, cmd_scroll, cmd_drag, ok, close
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State.properties
index 220fbb6..7f7d8a2 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State.properties
@@ -25,3 +25,10 @@
visible=Visible
hidden=Hidden
+
+# VLAN id == NONE (-1)
+vlan_none=None
+
+# lower case values, please
+expected=expected
+not_expected=not expected
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_es.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_es.properties
index 5dfc971..55271fb 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_es.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_es.properties
@@ -25,3 +25,10 @@
visible=Visible (es)
hidden=Hidden (es)
+
+# VLAN id == NONE (-1)
+vlan_none=None (es)
+
+# lower case values, please
+expected=expected (es)
+not_expected=not expected (es)
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_it.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_it.properties
index 9ac4d17..8fa919f 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_it.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_it.properties
@@ -25,3 +25,10 @@
visible=Visible (it)
hidden=Hidden (it)
+
+# VLAN id == NONE (-1)
+vlan_none=None (it)
+
+# lower case values, please
+expected=expected (it)
+not_expected=not expected (it)
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_ko.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_ko.properties
index 107b68e..bb5d7d6 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_ko.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_ko.properties
@@ -25,3 +25,10 @@
visible=Visible (ko)
hidden=Hidden (ko)
+
+# VLAN id == NONE (-1)
+vlan_none=None (ko)
+
+# lower case values, please
+expected=expected (ko)
+not_expected=not expected (ko)
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_zh_CN.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_zh_CN.properties
index 1c11cee..ec58365 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_zh_CN.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_zh_CN.properties
@@ -25,3 +25,10 @@
visible=Visible (zh_CN)
hidden=Hidden (zh_CN)
+
+# VLAN id == NONE (-1)
+vlan_none=None (zh_CN)
+
+# lower case values, please
+expected=expected (zh_CN)
+not_expected=not expected (zh_CN)
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_zh_TW.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_zh_TW.properties
index 4c5ef51..cbd117e 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_zh_TW.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/common/State_zh_TW.properties
@@ -25,3 +25,10 @@
visible=Visible (zh_TW)
hidden=Hidden (zh_TW)
+
+# VLAN id == NONE (-1)
+vlan_none=None (zh_TW)
+
+# lower case values, please
+expected=expected (zh_TW)
+not_expected=not expected (zh_TW)
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/DeviceEnums.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/DeviceEnums.properties
new file mode 100644
index 0000000..a5494a2
--- /dev/null
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/DeviceEnums.properties
@@ -0,0 +1,34 @@
+#
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
+#
+
+# display names for Device.Type constants
+switch=switch
+router=router
+roadm=roadm
+otn=otn
+roadm_otn=roadm otn
+firewall=firewall
+balancer=balancer
+ips=ips
+ids=ids
+controller=controller
+virtual=virtual
+fiber_switch=fiber switch
+microwave=microwave
+olt=olt
+onu=onu
+optical_amplifier=optical amplifier
+other=other
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/DeviceEnums_it.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/DeviceEnums_it.properties
new file mode 100644
index 0000000..9166889
--- /dev/null
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/DeviceEnums_it.properties
@@ -0,0 +1,34 @@
+#
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
+#
+
+# display names for Device.Type constants
+switch=switch (it)
+router=router (it)
+roadm=roadm (it)
+otn=otn (it)
+roadm_otn=roadm otn (it)
+firewall=firewall (it)
+balancer=balancer (it)
+ips=ips (it)
+ids=ids (it)
+controller=controller (it)
+virtual=virtual (it)
+fiber_switch=fiber switch (it)
+microwave=microwave (it)
+olt=olt (it)
+onu=onu (it)
+optical_amplifier=optical amplifier (it)
+other=other (it)
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/LinkEnums.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/LinkEnums.properties
new file mode 100644
index 0000000..3380034
--- /dev/null
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/LinkEnums.properties
@@ -0,0 +1,27 @@
+#
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
+#
+
+# display names for Link.Type constants
+direct=direct
+indirect=indirect
+edge=edge
+tunnel=tunnel
+optical=optical
+virtual=virtual
+
+# display names for Link.State constants
+active=active
+inactive=inactive
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/LinkEnums_it.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/LinkEnums_it.properties
new file mode 100644
index 0000000..f3fb9fa
--- /dev/null
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/enums/LinkEnums_it.properties
@@ -0,0 +1,27 @@
+#
+# Copyright 2017-present Open Networking Foundation
+#
+# 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.
+#
+
+# display names for Link.Type constants
+direct=direct (it)
+indirect=indirect (it)
+edge=edge (it)
+tunnel=tunnel (it)
+optical=optical (it)
+virtual=virtual (it)
+
+# display names for Link.State constants
+active=active (it)
+inactive=inactive (it)
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo.properties
index c32cd6a..82c4634 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo.properties
@@ -15,11 +15,6 @@
#
#
-
-# ==========================================
-# | WIP -- Not Yet Ready For Translation |
-# ==========================================
-
# Text that appears in the navigation panel
nav_item_topo=Topology
@@ -90,6 +85,28 @@
btn_show_view_group=Show Group View for this Device
btn_show_view_meter=Show Meter View for this Device
-# Miscellaneous
+# Panel Titles
title_select_map=Select Map
title_panel_summary=ONOS Summary
+title_selected_items=Selected Items
+title_edge_link=Edge Link
+title_infra_link=Infrastructure Link
+
+# Custom Panel Labels / Values
+lp_label_friendly=Friendly
+
+lp_label_a_type=A type
+lp_label_a_id=A id
+lp_label_a_friendly=A friendly
+lp_label_a_port=A port
+
+lp_label_b_type=B type
+lp_label_b_id=B id
+lp_label_b_friendly=B friendly
+lp_label_b_port=B port
+
+lp_label_a2b=A to B
+lp_label_b2a=B to A
+
+lp_value_no_link=[no link]
+
diff --git a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo_it.properties b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo_it.properties
index c32b249..524b248 100644
--- a/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo_it.properties
+++ b/web/gui/src/main/resources/org/onosproject/ui/lion/core/view/Topo_it.properties
@@ -85,6 +85,27 @@
btn_show_view_group=Show Group View for this Device (it)
btn_show_view_meter=Show Meter View for this Device (it)
-# Miscellaneous
+# Panel Titles
title_select_map=Select Map (it)
title_panel_summary=ONOS Summary (it)
+title_selected_items=Selected Items (it)
+title_edge_link=Edge Link (it)
+title_infra_link=Infrastructure Link (it)
+
+# Custom Panel Labels / Values
+lp_label_friendly=Friendly (it)
+
+lp_label_a_type=A type (it)
+lp_label_a_id=A id (it)
+lp_label_a_friendly=A friendly (it)
+lp_label_a_port=A port (it)
+
+lp_label_b_type=B type (it)
+lp_label_b_id=B id (it)
+lp_label_b_friendly=B friendly (it)
+lp_label_b_port=B port (it)
+
+lp_label_a2b=A to B (it)
+lp_label_b2a=B to A (it)
+
+lp_value_no_link=[no link] (it)
diff --git a/web/gui/src/main/webapp/app/view/topo/topo-theme.css b/web/gui/src/main/webapp/app/view/topo/topo-theme.css
index a19e6e8..5f8f8d5 100644
--- a/web/gui/src/main/webapp/app/view/topo/topo-theme.css
+++ b/web/gui/src/main/webapp/app/view/topo/topo-theme.css
@@ -45,11 +45,11 @@
/* --- general topo-panel styling --- */
.topo-p svg {
- background: #c0242b;
+ background: none;
}
.topo-p svg .glyph {
- fill: #ffffff;
+ fill: #c0242b;
}
.topo-p hr {
diff --git a/web/gui/src/main/webapp/app/view/topo/topoLink.js b/web/gui/src/main/webapp/app/view/topo/topoLink.js
index ed06ce1..d4f1dfe 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoLink.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoLink.js
@@ -254,8 +254,9 @@
d.el.classed('selected', true);
selectedLinks[d.key] = { key: d };
- tps.displayLink(d, tov.hooks.modifyLinkData);
- tps.displaySomething();
+ // TODO: deprecate tov.hooks.modifyLinkData
+ // tps.displayLink(d, tov.hooks.modifyLinkData);
+ // tps.displaySomething();
}
// ====== MOUSE EVENT HANDLERS ======
diff --git a/web/gui/src/main/webapp/app/view/topo/topoPanel.js b/web/gui/src/main/webapp/app/view/topo/topoPanel.js
index eac6a89..3452614 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoPanel.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoPanel.js
@@ -156,8 +156,10 @@
tbody.append('tr').append('td').attr('colspan', 2).append('hr');
}
- function addBtnFooter() {
- detail.appendFooter('hr');
+ function addBtnFooter(sepAlreadyThere) {
+ if (!sepAlreadyThere) {
+ detail.appendFooter('hr');
+ }
detail.appendFooter('div').classed('actionBtns', true);
}
@@ -173,35 +175,25 @@
function addCell(cls, txt) {
tr.append('td').attr('class', cls).text(txt);
}
+
addCell('label', lab + ' :');
addCell('value', value);
}
function listProps(tbody, data) {
+ var sepLast = false;
- // Suppress Lat Long in details panel if null
- if (data.propLabels.latitude === null ||
- data.propLabels.longitude === null) {
- var idx = data.propOrder.indexOf('latitude');
- data.propOrder.splice(idx, 3);
- }
-
+ // note: track whether we end with a separator or not...
data.propOrder.forEach(function (p) {
- // TODO: remove after topo view fully i18n'd
- var foo = data.props && data.props[p];
-
if (p === '-') {
addSep(tbody);
-
+ sepLast = true;
} else {
- // TODO: remove this if/else once DETAILS panel fixed for i18n
- if (foo !== undefined) {
- addProp(tbody, p, foo);
- } else {
- addProp(tbody, data.propLabels[p], data.propValues[p]);
- }
+ addProp(tbody, data.propLabels[p], data.propValues[p]);
+ sepLast = false;
}
});
+ return sepLast;
}
function watchWindow() {
@@ -232,9 +224,10 @@
.append('svg'),
title = summary.appendHeader('h2'),
table = summary.appendBody('table'),
- tbody = table.append('tbody');
+ tbody = table.append('tbody'),
+ glyphId = data.glyphId || 'bird';
- gs.addGlyph(svg, 'bird', 24, 0, [1, 1]);
+ gs.addGlyph(svg, glyphId, 24, 0, [1, 1]);
title.text(data.title);
listProps(tbody, data);
@@ -249,8 +242,13 @@
};
function displaySingle(data) {
+ var sepLast;
+
detail.setup();
+ // TODO: remove
+ $log.debug('>> Display Single Item Details', data);
+
var svg = detail.appendHeader('div')
.classed('icon clickable', true)
.append('svg'),
@@ -261,7 +259,7 @@
navFn,
navPath;
- gs.addGlyph(svg, (data.type || 'unknown'), 26);
+ gs.addGlyph(svg, (data.glyphId || 'm_unknown'), 26);
title.text(data.title);
// add navigation hot-link if defined
@@ -277,8 +275,8 @@
title.on('click', navFn);
}
- listProps(tbody, data);
- addBtnFooter();
+ sepLast = listProps(tbody, data);
+ addBtnFooter(sepLast);
}
function displayMulti(ids) {
@@ -288,9 +286,9 @@
table = detail.appendBody('table'),
tbody = table.append('tbody');
- title.text('Selected Items');
+ title.text(topoLion('title_selected_items'));
ids.forEach(function (d, i) {
- addProp(tbody, i+1, d);
+ addProp(tbody, i + 1, d);
});
addBtnFooter();
}
@@ -331,6 +329,7 @@
return d.expected();
}
+ // TODO: implement server-side processing of link details
var coreOrder = [
'Type', 'Expected', '-',
'A_type', 'A_id', 'A_label', 'A_port', '-',
@@ -342,6 +341,7 @@
'B_type', 'B_id', 'B_label', 'B_port',
];
+ // FIXME: DEPRECATED (no longer called)
function displayLink(data, modifyCb) {
detail.setup();
@@ -428,6 +428,7 @@
summary.panel().show();
summary.adjustHeight(sumFromTop, sumMax);
}
+
if (detail.panel().isVisible()) {
detail.down(_show);
} else {
@@ -493,7 +494,7 @@
verb;
useDetails = kev ? !useDetails : !!x;
- verb = useDetails ? 'Enable' : 'Disable';
+ verb = useDetails ? 'Enable' : 'Disable'; // TODO: Lion
if (useDetails) {
if (haveDetails) {
@@ -502,7 +503,7 @@
} else {
hideDetailPanel();
}
- flash.flash(verb + ' details panel');
+ flash.flash(verb + ' details panel'); // TODO: Lion
return useDetails;
}
diff --git a/web/gui/src/main/webapp/app/view/topo/topoSelect.js b/web/gui/src/main/webapp/app/view/topo/topoSelect.js
index 5d23f1e..e9829e0 100644
--- a/web/gui/src/main/webapp/app/view/topo/topoSelect.js
+++ b/web/gui/src/main/webapp/app/view/topo/topoSelect.js
@@ -23,7 +23,7 @@
'use strict';
// injected refs
- var fs, wss, tov, tps, tts, sus;
+ var $log, fs, wss, tov, tps, tts, sus;
// api to topoForce
var api;
@@ -183,10 +183,31 @@
// === -----------------------------------------------------
function requestDetails(data) {
- wss.sendEvent('requestDetails', {
- id: data.id,
- class: data.class,
- });
+ var itemClass = data.class,
+ payload = {
+ class: itemClass,
+ id: data.id,
+ };
+
+ // special handling for links...
+ if (itemClass === 'link') {
+ payload.key = data.key;
+ if (data.source.class === 'host') {
+ payload.isEdgeLink = true;
+ payload.sourceId = data.source.id;
+ payload.targetId = data.source.cp.device;
+ payload.targetPort = data.source.cp.port;
+ } else {
+ payload.isEdgeLink = false;
+ payload.sourceId = data.source.id;
+ payload.sourcePort = data.srcPort;
+ payload.targetId = data.target.id;
+ payload.targetPort = data.tgtPort;
+ }
+ }
+
+ $log.debug('EVENT> requestDetails', payload);
+ wss.sendEvent('requestDetails', payload);
}
// === -----------------------------------------------------
@@ -210,10 +231,7 @@
function singleSelect() {
var data = getSel(0).obj;
- // the link details are already taken care of in topoLink.js
- if (data.class === 'link') {
- return;
- }
+ $log.debug('Requesting details from server for', data);
requestDetails(data);
// NOTE: detail panel is shown as a response to receiving
// a 'showDetails' event from the server. See 'showDetails'
@@ -304,10 +322,11 @@
angular.module('ovTopo')
.factory('TopoSelectService',
- ['FnService', 'WebSocketService', 'TopoOverlayService',
+ ['$log', 'FnService', 'WebSocketService', 'TopoOverlayService',
'TopoPanelService', 'TopoTrafficService', 'SvgUtilService',
- function (_fs_, _wss_, _tov_, _tps_, _tts_, _sus_) {
+ function (_$log_, _fs_, _wss_, _tov_, _tps_, _tts_, _sus_) {
+ $log = _$log_;
fs = _fs_;
wss = _wss_;
tov = _tov_;