홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Hyunsun Moon
Committed by Gerrit Code Review
992be1d4 1 parent da27e436

Fixed example network-cfg.json files for SONA applications 

Change-Id: I49f30a22a5a9e7579ecb432b375ccaffd5bc71ce
Inline Side-by-side
Showing 3 changed files with 25 additions and 68 deletions
...@@ -4,26 +4,9 @@ ...@@ -4,26 +4,9 @@
4 "openstackinterface" : { 4 "openstackinterface" : {
5 "neutron_server" : "http://10.40.101.209:9696/v2.0/", 5 "neutron_server" : "http://10.40.101.209:9696/v2.0/",
6 "keystone_server" : "http://10.40.101.209:5000/v2.0/", 6 "keystone_server" : "http://10.40.101.209:5000/v2.0/",
7 - "user_name" : "admin", 7 + "user_name" : "admin",
8 "password" : "nova" 8 "password" : "nova"
9 } 9 }
10 } 10 }
11 - },
12 - "devices" : {
13 - "of:0000000000000001" : {
14 - "basic" : {
15 - "driver" : "sona"
16 - }
17 - },
18 - "of:0000000000000002" : {
19 - "basic" : {
20 - "driver" : "sona"
21 - }
22 - },
23 - "of:0000000000000003" : {
24 - "basic" : {
25 - "driver" : "sona"
26 - }
27 - }
28 } 11 }
29 } 12 }
......
1 -{
2 - "userDefined" : {
3 - "openstacknetworking" : {
4 - "config" : {
5 - "physicalRouterMac" : "86:1e:e1:b1:85:bd",
6 - "gatewayBridgeId" : "of:0000000000000003",
7 - "gatewayExternalInterfaceName" : "veth0",
8 - "gatewayExternalInterfaceMac" : "d2:b3:eb:36:bd:ae",
9 - "nodes" : [
10 - {
11 - "dataPlaneIp" : "10.40.101.208",
12 - "bridgeId" : "of:0000000000000001"
13 - },
14 - {
15 - "dataPlaneIp" : "10.40.101.227",
16 - "bridgeId" : "of:0000000000000002"
17 - },
18 - {
19 - "dataPlaneIp" : "10.40.101.240",
20 - "bridgeId" : "of:0000000000000003"
21 - }
22 - ]
23 - }
24 - }
25 - },
26 - "apps" : {
27 - "org.onosproject.openstackinterface" : {
28 - "openstackinterface" : {
29 - "neutronServer" : "http://10.40.101.209:9696/v2.0/",
30 - "keystoneServer" : "http://10.40.101.209:5000/v2.0/",
31 - "userName" : "admin",
32 - "password" : "nova"
33 - }
34 - }
35 - },
36 - "devices" : {
37 - "of:0000000000000001" : {
38 - "basic" : {
39 - "driver" : "sona"
40 - }
41 - },
42 - "of:0000000000000002" : {
43 - "basic" : {
44 - "driver" : "sona"
45 - }
46 - }
47 - }
48 -}
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
23 "managementIp" : "10.203.198.125", 23 "managementIp" : "10.203.198.125",
24 "dataIp" : "10.134.33.208", 24 "dataIp" : "10.134.33.208",
25 "integrationBridge" : "of:00000000000000a3", 25 "integrationBridge" : "of:00000000000000a3",
26 - "routerBridge" : "of:00000000000000b3" 26 + "routerBridge" : "of:00000000000000b1"
27 }, 27 },
28 { 28 {
29 "hostname" : "gateway-02", 29 "hostname" : "gateway-02",
...@@ -31,11 +31,33 @@ ...@@ -31,11 +31,33 @@
31 "managementIp" : "10.203.198.131", 31 "managementIp" : "10.203.198.131",
32 "dataIp" : "10.134.33.209", 32 "dataIp" : "10.134.33.209",
33 "integrationBridge" : "of:00000000000000a4", 33 "integrationBridge" : "of:00000000000000a4",
34 - "routerBridge" : "of:00000000000000b4" 34 + "routerBridge" : "of:00000000000000b2"
35 } 35 }
36 ] 36 ]
37 } 37 }
38 } 38 }
39 + },
40 + "devices" : {
41 + "of:00000000000000a1" : {
42 + "basic" : {
43 + "driver" : "sona"
44 + }
45 + },
46 + "of:00000000000000a2" : {
47 + "basic" : {
48 + "driver" : "sona"
49 + }
50 + },
51 + "of:00000000000000b1" : {
52 + "basic" : {
53 + "driver" : "softrouter"
54 + }
55 + },
56 + "of:00000000000000b2" : {
57 + "basic" : {
58 + "driver" : "softrouter"
59 + }
60 + }
39 } 61 }
40 } 62 }
41 63
......