홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
42366087 1 parent 8bd51bfd

CORD GUI - Shenanigans clean up 

Change-Id: Ied8472102f537e51956c509a1a4511434b2d0cd5
Inline Side-by-side
Showing 1 changed file with 1 additions and 14 deletions
...@@ -48,8 +48,6 @@ public class CordModelCache extends JsonFactory { ...@@ -48,8 +48,6 @@ public class CordModelCache extends JsonFactory {
48 48
49 private static final String KEY_SSID_MAP = "ssidmap"; 49 private static final String KEY_SSID_MAP = "ssidmap";
50 private static final String KEY_SSID = "service_specific_id"; 50 private static final String KEY_SSID = "service_specific_id";
51 - // FIXME: remove once the key has been fixed
52 - private static final String KEY_SSID_ALT = "service_specific_id:";
53 private static final String KEY_SUB_ID = "subscriber_id"; 51 private static final String KEY_SUB_ID = "subscriber_id";
54 52
55 private static final int DEMO_SSID = 1234; 53 private static final int DEMO_SSID = 1234;
...@@ -96,18 +94,7 @@ public class CordModelCache extends JsonFactory { ...@@ -96,18 +94,7 @@ public class CordModelCache extends JsonFactory {
96 StringBuilder msg = new StringBuilder(); 94 StringBuilder msg = new StringBuilder();
97 while (iter.hasNext()) { 95 while (iter.hasNext()) {
98 ObjectNode node = (ObjectNode) iter.next(); 96 ObjectNode node = (ObjectNode) iter.next();
99 - 97 + String ssidStr = node.get(KEY_SSID).asText();
100 - // FIXME: clean up once the colon has been removed from the key
101 - JsonNode s = node.get(KEY_SSID);
102 - if (s == null) {
103 - s = node.get(KEY_SSID_ALT);
104 - if (s == null) {
105 - log.error("missing {} property!", KEY_SSID);
106 - continue;
107 - }
108 - }
109 -
110 - String ssidStr = s.asText();
111 int ssid = Integer.valueOf(ssidStr); 98 int ssid = Integer.valueOf(ssidStr);
112 int subId = node.get(KEY_SUB_ID).asInt(); 99 int subId = node.get(KEY_SUB_ID).asInt();
113 LOOKUP.put(ssid, subId); 100 LOOKUP.put(ssid, subId);
......