commit a58d894de1ef1f9d4b1edeb85fd6bf22670be7df
author Simon Hunt <simon@opennetworking.org> Fri Aug 11 12:51:14 2017 -0700
committer Simon Hunt <simon@opennetworking.org> Fri Aug 11 19:19:34 2017 -0700
tree 71806da6d1365863c2d794c789b266afec09042f
parent d4ac0edb2fd4f329ac2973ddd1c458e67cf2db00

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

core/api/src/main/java/org/onosproject/ui/topo/TopoJson.java

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) {