홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Simon Hunt
063ac11d 1 parent 97a7033e

CORD Subscriber GUI -- Updated sample JSON to reflect current thinking. 

Change-Id: Iae85cbe03c46f58341ed6ae973ebf066fda894d7
Inline Side-by-side
Showing 7 changed files with 59 additions and 93 deletions
...@@ -5,14 +5,14 @@ ...@@ -5,14 +5,14 @@
5 { 5 {
6 "id": "internet", 6 "id": "internet",
7 "name": "Internet", 7 "name": "Internet",
8 - "active": true, 8 + "desc": "Basic internet connectivity",
9 - "editable": false 9 + "params": {}
10 }, 10 },
11 { 11 {
12 "id": "firewall", 12 "id": "firewall",
13 "name": "Firewall", 13 "name": "Firewall",
14 - "active": true, 14 + "desc": "Normal firewall protection",
15 - "editable": true 15 + "params": {}
16 } 16 }
17 ] 17 ]
18 } 18 }
......
...@@ -5,22 +5,23 @@ ...@@ -5,22 +5,23 @@
5 { 5 {
6 "id": "internet", 6 "id": "internet",
7 "name": "Internet", 7 "name": "Internet",
8 - "active": true, 8 + "desc": "Basic internet connectivity",
9 - "editable": false 9 + "params": {}
10 }, 10 },
11 { 11 {
12 "id": "firewall", 12 "id": "firewall",
13 "name": "Firewall", 13 "name": "Firewall",
14 - "active": true, 14 + "desc": "Normal firewall protection",
15 - "editable": true 15 + "params": {}
16 }, 16 },
17 { 17 {
18 - "id": "url_filter", 18 + "id": "url_filtering",
19 "name": "Parental Control", 19 "name": "Parental Control",
20 - "level": "PG", 20 + "desc": "Variable levels of URL filtering",
21 - "levels": [ "PG", "PG-13", "R" ], 21 + "params": {
22 - "active": true, 22 + "level": "PG",
23 - "editable": true 23 + "levels": [ "PG", "PG-13", "R" ]
24 + }
24 } 25 }
25 ] 26 ]
26 } 27 }
......
1 { 1 {
2 - "bundle": { 2 + "bundle": "Basic Bundle",
3 - "name": "Basic Bundle",
4 - "functions": [
5 - {
6 - "id": "internet",
7 - "name": "Internet",
8 - "active": true
9 - },
10 - {
11 - "id": "firewall",
12 - "name": "Firewall",
13 - "active": true
14 - }
15 - ]
16 - },
17 "users": [ 3 "users": [
18 - { "id": 1, "name": "Mom", "role": "Admin" }, 4 + { "id": 1, "name": "Mom's MacBook", "mac": "00:11:22:33:44:55" },
19 - { "id": 2, "name": "Dad", "role": "Admin" }, 5 + { "id": 1, "name": "Dad's iPad", "mac": "00:11:22:33:44:66" },
20 - { "id": 3, "name": "Dick", "role": "User" }, 6 + { "id": 1, "name": "Dick's laptop", "mac": "00:11:22:33:44:77" },
21 - { "id": 4, "name": "Jane", "role": "User" } 7 + { "id": 1, "name": "Jane's laptop", "mac": "00:11:22:33:44:88" }
22 ] 8 ]
23 } 9 }
......
1 { 1 {
2 - "bundle": { 2 + "bundle": "Family Bundle",
3 - "name": "Family Bundle",
4 - "functions": [
5 - {
6 - "id": "internet",
7 - "name": "Internet",
8 - "active": true
9 - },
10 - {
11 - "id": "firewall",
12 - "name": "Firewall",
13 - "active": true
14 - },
15 - {
16 - "id": "url_filter",
17 - "name": "Parental Control",
18 - "level": "PG",
19 - "active": true
20 - }
21 - ]
22 - },
23 "users": [ 3 "users": [
24 - { "id": 1, "name": "Mom", "role": "Admin" }, 4 + { "id": 1, "name": "Mom's MacBook", "mac": "00:11:22:33:44:55" },
25 - { "id": 2, "name": "Dad", "role": "Admin" }, 5 + { "id": 1, "name": "Dad's iPad", "mac": "00:11:22:33:44:66" },
26 - { "id": 3, "name": "Dick", "role": "User" }, 6 + { "id": 1, "name": "Dick's laptop", "mac": "00:11:22:33:44:77" },
27 - { "id": 4, "name": "Jane", "role": "User" } 7 + { "id": 1, "name": "Jane's laptop", "mac": "00:11:22:33:44:88" }
28 ] 8 ]
29 } 9 }
......
...@@ -2,26 +2,26 @@ ...@@ -2,26 +2,26 @@
2 "users": [ 2 "users": [
3 { 3 {
4 "id": 1, 4 "id": 1,
5 - "name": "Mom", 5 + "name": "Mom's MacBook",
6 - "role": { "id": "admin", "name": "Admin"}, 6 + "mac": "01:02:03:04:05:06",
7 "profile": { } 7 "profile": { }
8 }, 8 },
9 { 9 {
10 "id": 2, 10 "id": 2,
11 - "name": "Dad", 11 + "name": "Dad's iPad",
12 - "role": { "id": "admin", "name": "Admin"} 12 + "mac": "01:02:03:04:05:77",
13 "profile": { } 13 "profile": { }
14 }, 14 },
15 { 15 {
16 "id": 3, 16 "id": 3,
17 - "name": "Dick", 17 + "name": "Dick's laptop",
18 - "role": { "id": "user", "name": "User"} 18 + "mac": "01:02:03:04:05:88",
19 "profile": { } 19 "profile": { }
20 }, 20 },
21 { 21 {
22 "id": 4, 22 "id": 4,
23 - "name": "Jane", 23 + "name": "Jane's laptop",
24 - "role": { "id": "user", "name": "User"} 24 + "mac": "01:02:03:04:05:99",
25 "profile": { } 25 "profile": { }
26 } 26 }
27 ] 27 ]
......
...@@ -2,41 +2,40 @@ ...@@ -2,41 +2,40 @@
2 "users": [ 2 "users": [
3 { 3 {
4 "id": 1, 4 "id": 1,
5 - "name": "Mom", 5 + "name": "Mom's MacBook",
6 - "role": { "id": "admin", "name": "Admin"}, 6 + "mac": "01:02:03:04:05:06",
7 "profile": { 7 "profile": {
8 - "url_filter": { 8 + "url_filtering": {
9 - "enabled": false 9 + "level": "R"
10 } 10 }
11 } 11 }
12 }, 12 },
13 { 13 {
14 "id": 2, 14 "id": 2,
15 - "name": "Dad", 15 + "name": "Dad's iPad",
16 - "role": { "id": "admin", "name": "Admin"}, 16 + "mac": "01:02:03:04:05:77",
17 "profile": { 17 "profile": {
18 - "url_filter": { 18 + "url_filtering": {
19 - "enabled": false 19 + "level": "R"
20 } 20 }
21 } 21 }
22 }, 22 },
23 { 23 {
24 "id": 3, 24 "id": 3,
25 - "name": "Dick", 25 + "name": "Dick's laptop",
26 - "role": { "id": "user", "name": "User"}, 26 + "mac": "01:02:03:04:05:88",
27 "profile": { 27 "profile": {
28 - "url_filter": { 28 + "url_filtering": {
29 - "enabled": false 29 + "level": "PG-13"
30 } 30 }
31 } 31 }
32 }, 32 },
33 { 33 {
34 "id": 4, 34 "id": 4,
35 - "name": "Jane", 35 + "name": "Jane's laptop",
36 - "role": { "id": "user", "name": "User"}, 36 + "mac": "01:02:03:04:05:99",
37 "profile": { 37 "profile": {
38 - "url_filter": { 38 + "url_filtering": {
39 - "enabled": false,
40 "level": "PG" 39 "level": "PG"
41 } 40 }
42 } 41 }
......
1 { 1 {
2 "users": [ 2 "users": [
3 { 3 {
4 - "role": "admin", 4 + "id": 1,
5 - "name": "mom", 5 + "name": "Mom's MacBook",
6 - "id": 1 6 + "mac": "01:02:03:04:05:06"
7 }, 7 },
8 { 8 {
9 - "role": "admin", 9 + "id": 2,
10 - "name": "dad", 10 + "name": "Dad's iPad",
11 - "id": 2 11 + "mac": "01:02:03:04:05:77"
12 }, 12 },
13 { 13 {
14 - "role": "user", 14 + "id": 3,
15 - "name": "kid1", 15 + "name": "Dick's laptop",
16 - "id": 3 16 + "mac": "01:02:03:04:05:88"
17 }, 17 },
18 { 18 {
19 - "role": "user", 19 + "id": 4,
20 - "name": "kid2", 20 + "name": "Jane's laptop",
21 - "id": 4 21 + "mac": "01:02:03:04:05:99"
22 } 22 }
23 ] 23 ]
24 } 24 }
......