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
varunsha
2016-08-18 10:31:18 -0700
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
45f806ccedf844dfc8fe1722eca653f274b83f12
45f806cc
1 parent
2fecae51
Fix ONOS-5091
Change-Id: I11762eb799c1f93536f472807167cdba20a7c8e6
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
5 deletions
core/common/src/main/java/org/onosproject/codec/impl/GroupCodec.java
web/api/src/main/resources/definitions/Group.json
web/api/src/main/resources/definitions/Groups.json
web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
core/common/src/main/java/org/onosproject/codec/impl/GroupCodec.java
View file @
45f806c
...
...
@@ -82,7 +82,7 @@ public final class GroupCodec extends JsonCodec<Group> {
.
put
(
DEVICE_ID
,
group
.
deviceId
().
toString
());
if
(
group
.
appId
()
!=
null
)
{
result
.
put
(
APP_ID
,
group
.
appId
().
toString
());
result
.
put
(
APP_ID
,
group
.
appId
().
name
());
}
if
(
group
.
appCookie
()
!=
null
)
{
...
...
web/api/src/main/resources/definitions/Group.json
View file @
45f806c
...
...
@@ -62,7 +62,7 @@
"appId"
:
{
"type"
:
"string"
,
"description"
:
"application identifier"
,
"example"
:
"
1
"
"example"
:
"
org.onosproject.rest
"
},
"appCookie"
:
{
"type"
:
"string"
,
...
...
web/api/src/main/resources/definitions/Groups.json
View file @
45f806c
...
...
@@ -75,7 +75,7 @@
"appId"
:
{
"type"
:
"string"
,
"description"
:
"application identifier"
,
"example"
:
"
1
"
"example"
:
"
org.onosproject.rest
"
},
"appCookie"
:
{
"type"
:
"string"
,
...
...
web/api/src/test/java/org/onosproject/rest/resources/GroupsResourceTest.java
View file @
45f806c
...
...
@@ -280,9 +280,9 @@ public class GroupsResourceTest extends ResourceTest {
// check application id
final
String
jsonAppId
=
jsonGroup
.
get
(
"appId"
).
asString
();
final
String
appId
=
group
.
appId
().
toString
();
final
String
appId
=
group
.
appId
().
name
();
if
(!
jsonAppId
.
equals
(
appId
))
{
reason
=
"appId "
+
group
.
appId
().
toString
();
reason
=
"appId "
+
group
.
appId
().
name
();
return
false
;
}
...
...
Please
register
or
login
to post a comment