Toggle navigation
Toggle navigation
This project
Loading...
Sign in
홍길동
/
onos
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Simon Hunt
2015-06-08 09:57:05 -0700
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
423660876e75e7ceb6a0257fc3ef67603428b75e
42366087
1 parent
8bd51bfd
CORD GUI - Shenanigans clean up
Change-Id: Ied8472102f537e51956c509a1a4511434b2d0cd5
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
14 deletions
apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
apps/demo/cord-gui/src/main/java/org/onosproject/cord/gui/CordModelCache.java
View file @
4236608
...
...
@@ -48,8 +48,6 @@ public class CordModelCache extends JsonFactory {
private
static
final
String
KEY_SSID_MAP
=
"ssidmap"
;
private
static
final
String
KEY_SSID
=
"service_specific_id"
;
// FIXME: remove once the key has been fixed
private
static
final
String
KEY_SSID_ALT
=
"service_specific_id:"
;
private
static
final
String
KEY_SUB_ID
=
"subscriber_id"
;
private
static
final
int
DEMO_SSID
=
1234
;
...
...
@@ -96,18 +94,7 @@ public class CordModelCache extends JsonFactory {
StringBuilder
msg
=
new
StringBuilder
();
while
(
iter
.
hasNext
())
{
ObjectNode
node
=
(
ObjectNode
)
iter
.
next
();
// FIXME: clean up once the colon has been removed from the key
JsonNode
s
=
node
.
get
(
KEY_SSID
);
if
(
s
==
null
)
{
s
=
node
.
get
(
KEY_SSID_ALT
);
if
(
s
==
null
)
{
log
.
error
(
"missing {} property!"
,
KEY_SSID
);
continue
;
}
}
String
ssidStr
=
s
.
asText
();
String
ssidStr
=
node
.
get
(
KEY_SSID
).
asText
();
int
ssid
=
Integer
.
valueOf
(
ssidStr
);
int
subId
=
node
.
get
(
KEY_SUB_ID
).
asInt
();
LOOKUP
.
put
(
ssid
,
subId
);
...
...
Please
register
or
login
to post a comment