홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Charles Chan
Committed by Gerrit Code Review
a8c31b1c 1 parent 8ea09d43

Update and Remove some network-cfg.json sample 

Remove network-cfg
    Each app has its own way to interpret the config.
    Therefore it doesn't make sense to keep a generic one
    In long term, each app should have a json schema that explain the meaning
Remove network-cfg-fabric4x4
    It does not provide more info than 2x2
Remove network-cfg-fabric2x2-default-route and network-cfg-fabric2x2-xconnect
    Keeping features in different configs doesn't help much but make people confused
    Also it's hard to maintain so many samples
Add network-cfg-fabric-2x2-all
    Full fabric config with readme
    The html documentation is just temporary. We will have a json schema
Rename/update network-cfg-fabric-2x2-min.json
    Minimum config required by the fabric

Change-Id: I93332d8166c264b9dbb7819b90099c2f19fcf3b5
Expand all
Inline Side-by-side
Showing 7 changed files with 188 additions and 466 deletions
The onos-config command will copy files contained in this directory to ONOS
instances according to cell definition.
NOTE: Please remember to rename the network config to network-cfg.json if
you copy it from the samples directory
\ No newline at end of file
......
{
"ports" : {
"of:0000000000000001/3" : {
"of:0000000000000001/5" : {
"interfaces" : [
{
"ips" : [ "10.0.1.254/24" ],
"vlan" : "-1"
},
{
"vlan" : "100"
}
{
"ips" : [ "10.0.1.254/24" ]
},
{
"vlan" : "20"
},
{
"vlan" : "10"
},
{
"vlan" : "222"
},
{
"ips" : [
"A.A.A.146/32", "A.A.A.147/32", "A.A.A.148/32", "A.A.A.149/32",
"A.A.A.150/32", "A.A.A.151/32", "A.A.A.152/32", "A.A.A.153/32"
]
}
]
},
"of:0000000000000001/4" : {
"of:0000000000000001/7" : {
"interfaces" : [
{
"ips" : [ "10.0.1.254/24" ],
"vlan" : "-1"
}
{
"ips" : [ "10.0.1.254/24" ]
}
]
},
"of:0000000000000001/5" : {
"of:0000000000000001/65" : {
"interfaces" : [
{
"vlan" : "100"
"name" : "fujitsu-olt",
"vlan" : "20"
}
]
},
"of:0000000000000002/3" : {
"of:0000000000000001/73" : {
"interfaces" : [
{
"ips" : [ "10.0.2.254/24" ],
"vlan" : "-1"
}
{
"name" : "pmc-olt",
"vlan" : "10"
},
{
"vlan" : "222"
}
]
},
"of:0000000000000002/4" : {
"of:0000000000000002/5" : {
"interfaces" : [
{
"ips" : [ "10.0.2.254/24" ],
"vlan" : "-1"
}
{
"ips" : [ "10.0.2.254/24" ]
},
{
"ips" : [ "A.A.A.130/32", "A.A.A.131/32" ]
}
]
},
"of:0000000000000002/32" : {
"interfaces" : [
{
"name" : "internet-router",
"ips" : [ "10.231.254.202/30" ],
"mac" : "00:16:3e:4b:5a:04"
}
],
"pimInterface" : {
"interfaceName" : "internet-router",
"enabled" : true,
"helloInterval" : 1,
"holdTime" : 3,
"propagationDelay" : 500,
"overrideInterval" : 2500
}
}
},
"devices" : {
......@@ -86,28 +119,138 @@
}
},
"hosts" : {
"00:00:00:00:00:01/-1" : {
"00:02:c9:1e:b1:20/-1" : {
"basic": {
"ips": ["10.0.1.1"],
"location": "of:0000000000000001/3"
"location": "of:0000000000000001/5"
}
},
"00:00:00:00:00:02/-1" : {
"00:02:c9:1e:b4:e0/-1" : {
"basic": {
"ips": ["10.0.1.2"],
"location": "of:0000000000000001/4"
"location": "of:0000000000000001/7"
}
},
"00:00:00:00:00:03/-1" : {
"00:02:c9:1e:b4:60/-1" : {
"basic": {
"ips": ["10.0.2.1"],
"location": "of:0000000000000002/3"
"location": "of:0000000000000002/5"
}
},
"00:00:00:00:00:04/-1" : {
"fa:16:3e:f9:2d:96/-1" : {
"basic": {
"ips": ["10.0.2.2"],
"location": "of:0000000000000002/4"
"ips": ["A.A.A.130"],
"location": "of:0000000000000002/5"
}
},
"FA:16:3E:2D:11:D4/-1" : {
"basic": {
"ips": ["A.A.A.134"],
"location": "of:0000000000000002/5"
}
},
"02:42:cf:8d:c0:92/-1" : {
"basic": {
"ips": ["A.A.A.146"],
"location": "of:0000000000000001/5"
}
},
"02:42:cf:8d:c0:93/-1" : {
"basic": {
"ips": ["A.A.A.147"],
"location": "of:0000000000000001/5"
}
},
"02:42:cf:8d:c0:94/-1" : {
"basic": {
"ips": ["A.A.A.148"],
"location": "of:0000000000000001/5"
}
},
"02:42:cf:8d:c0:95/-1" : {
"basic": {
"ips": ["A.A.A.149"],
"location": "of:0000000000000001/5"
}
},
"02:42:cf:8d:c0:96/-1" : {
"basic": {
"ips": ["A.A.A.150"],
"location": "of:0000000000000001/5"
}
},
"02:42:cf:8d:c0:97/-1" : {
"basic": {
"ips": ["A.A.A.151"],
"location": "of:0000000000000001/5"
}
},
"02:42:cf:8d:c0:98/-1" : {
"basic": {
"ips": ["A.A.A.152"],
"location": "of:0000000000000001/5"
}
},
"02:42:cf:8d:c0:99/-1" : {
"basic": {
"ips": ["A.A.A.153"],
"location": "of:0000000000000001/5"
}
}
},
"links" : {
"of:0000000000000001/1-of:0000000000000191/1" : {
"basic" : {}
},
"of:0000000000000001/3-of:0000000000000192/1" : {
"basic" : {}
},
"of:0000000000000002/1-of:0000000000000191/3" : {
"basic" : {}
},
"of:0000000000000002/3-of:0000000000000192/3" : {
"basic" : {}
},
"of:0000000000000191/1-of:0000000000000001/1" : {
"basic" : {}
},
"of:0000000000000192/1-of:0000000000000001/3" : {
"basic" : {}
},
"of:0000000000000191/3-of:0000000000000002/1" : {
"basic" : {}
},
"of:0000000000000192/3-of:0000000000000002/3" : {
"basic" : {}
}
},
"apps" : {
"org.onosproject.core" : {
"core" : {
"linkDiscoveryMode" : "STRICT"
}
},
"org.onosproject.segmentrouting" : {
"segmentrouting" : {
"vRouterMacs" : [
"a4:23:05:34:56:78", "a4:23:05:34:56:79"
],
"vRouterId" : "of:0000000000000002",
"suppressSubnet" : [
"of:0000000000000002/31", "of:0000000000000002/32"
],
"suppressHost" : [
"of:0000000000000001/65", "of:0000000000000001/73",
"of:0000000000000002/31", "of:0000000000000002/32"
]
}
},
"org.onosproject.router" : {
"router" : {
"controlPlaneConnectPoint" : "of:0000000000000002/31",
"ospfEnabled" : "true",
"pimEnabled" : "true",
"interfaces" : [ "internet-router" ]
}
}
}
......
......@@ -3,32 +3,28 @@
"of:0000000000000001/3" : {
"interfaces" : [
{
"ips" : [ "10.0.1.254/24" ],
"vlan" : "-1"
"ips" : [ "10.0.1.254/24" ]
}
]
},
"of:0000000000000001/4" : {
"interfaces" : [
{
"ips" : [ "10.0.1.254/24" ],
"vlan" : "-1"
"ips" : [ "10.0.1.254/24" ]
}
]
},
"of:0000000000000002/3" : {
"interfaces" : [
{
"ips" : [ "10.0.2.254/24" ],
"vlan" : "-1"
"ips" : [ "10.0.2.254/24" ]
}
]
},
"of:0000000000000002/4" : {
"interfaces" : [
{
"ips" : [ "10.0.2.254/24" ],
"vlan" : "-1"
"ips" : [ "10.0.2.254/24" ]
}
]
}
......@@ -76,25 +72,25 @@
}
},
"hosts" : {
"00:00:00:00:00:01/4093" : {
"00:00:00:00:00:01/-1" : {
"basic": {
"ips": ["10.0.1.1"],
"location": "of:0000000000000001/3"
}
},
"00:00:00:00:00:02/4093" : {
"00:00:00:00:00:02/-1" : {
"basic": {
"ips": ["10.0.1.2"],
"location": "of:0000000000000001/4"
}
},
"00:00:00:00:00:03/4093" : {
"00:00:00:00:00:03/-1" : {
"basic": {
"ips": ["10.0.2.1"],
"location": "of:0000000000000002/3"
}
},
"00:00:00:00:00:04/4093" : {
"00:00:00:00:00:04/-1" : {
"basic": {
"ips": ["10.0.2.2"],
"location": "of:0000000000000002/4"
......
{
"ports" : {
"of:0000000000000001/3" : {
"interfaces" : [
{
"ips" : [ "10.0.1.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000001/4" : {
"interfaces" : [
{
"ips" : [ "10.0.1.254/24", "200.0.0.200/32" ],
"vlan" : "-1"
}
]
},
"of:0000000000000002/3" : {
"interfaces" : [
{
"ips" : [ "10.0.2.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000002/4" : {
"interfaces" : [
{
"ips" : [ "10.0.2.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000002/5" : {
"interfaces" : [
{
"ips" : [ "100.0.0.0/24" ],
"vlan" : "-1"
}
]
}
},
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "Leaf-R1",
"nodeSid" : 101,
"routerIp" : "10.0.1.254",
"routerMac" : "00:00:00:00:01:80",
"isEdgeRouter" : true,
"adjacencySids" : []
}
},
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "Leaf-R2",
"nodeSid" : 102,
"routerIp" : "10.0.2.254",
"routerMac" : "00:00:00:00:02:80",
"isEdgeRouter" : true,
"adjacencySids" : []
}
},
"of:0000000000000191" : {
"segmentrouting" : {
"name" : "Spine-R1",
"nodeSid" : 103,
"routerIp" : "192.168.0.11",
"routerMac" : "00:00:01:00:11:80",
"isEdgeRouter" : false,
"adjacencySids" : []
}
},
"of:0000000000000192" : {
"segmentrouting" : {
"name" : "Spine-R2",
"nodeSid" : 104,
"routerIp" : "192.168.0.22",
"routerMac" : "00:00:01:00:22:80",
"isEdgeRouter" : false,
"adjacencySids" : []
}
}
},
"hosts" : {
"00:00:00:00:00:01/-1" : {
"basic": {
"ips": ["10.0.1.1"],
"location": "of:0000000000000001/3"
}
},
"00:00:00:00:00:02/-1" : {
"basic": {
"ips": ["10.0.1.2"],
"location": "of:0000000000000001/4"
}
},
"00:00:00:00:00:03/-1" : {
"basic": {
"ips": ["10.0.2.1"],
"location": "of:0000000000000002/3"
}
},
"00:00:00:00:00:04/-1" : {
"basic": {
"ips": ["10.0.2.2"],
"location": "of:0000000000000002/4"
}
},
"00:00:00:aa:00:01/-1" : {
"basic": {
"ips": ["200.0.0.200"],
"location": "of:0000000000000001/4"
}
}
},
"apps" : {
"org.onosproject.segmentrouting" : {
"segmentrouting" : {
"vRouterMacs" : [
"00:00:00:aa:00:02"
],
"vRouterId" : "of:0000000000000002",
"suppressSubnet" : [
"of:0000000000000002/5"
],
"suppressHost" : [
"of:0000000000000002/5"
]
}
}
}
}
{
"ports" : {
"of:0000000000000001/5" : {
"interfaces" : [
{
"ips" : [ "10.0.1.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000001/6" : {
"interfaces" : [
{
"ips" : [ "10.0.1.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000002/5" : {
"interfaces" : [
{
"ips" : [ "10.0.2.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000002/6" : {
"interfaces" : [
{
"ips" : [ "10.0.2.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000003/5" : {
"interfaces" : [
{
"ips" : [ "10.0.3.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000003/6" : {
"interfaces" : [
{
"ips" : [ "10.0.3.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000004/5" : {
"interfaces" : [
{
"ips" : [ "10.0.4.254/24" ],
"vlan" : "-1"
}
]
},
"of:0000000000000004/6" : {
"interfaces" : [
{
"ips" : [ "10.0.4.254/24" ],
"vlan" : "-1"
}
]
}
},
"devices" : {
"of:0000000000000001" : {
"segmentrouting" : {
"name" : "Leaf-R1",
"nodeSid" : 101,
"routerIp" : "10.0.1.254",
"routerMac" : "00:00:00:00:01:80",
"isEdgeRouter" : true,
"adjacencySids" : []
}
},
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "Leaf-R2",
"nodeSid" : 102,
"routerIp" : "10.0.2.254",
"routerMac" : "00:00:00:00:02:80",
"isEdgeRouter" : true,
"adjacencySids" : []
}
},
"of:0000000000000003" : {
"segmentrouting" : {
"name" : "Leaf-R3",
"nodeSid" : 103,
"routerIp" : "10.0.3.254",
"routerMac" : "00:00:00:00:03:80",
"isEdgeRouter" : true,
"adjacencySids" : []
}
},
"of:0000000000000004" : {
"segmentrouting" : {
"name" : "Leaf-R4",
"nodeSid" : 104,
"routerIp" : "10.0.4.254",
"routerMac" : "00:00:00:00:04:80",
"isEdgeRouter" : true,
"adjacencySids" : []
}
},
"of:0000000000000191" : {
"segmentrouting" : {
"name" : "Spine-R1",
"nodeSid" : 105,
"routerIp" : "192.168.0.11",
"routerMac" : "00:00:01:00:11:80",
"isEdgeRouter" : false,
"adjacencySids" : []
}
},
"of:0000000000000192" : {
"segmentrouting" : {
"name" : "Spine-R2",
"nodeSid" : 106,
"routerIp" : "192.168.0.22",
"routerMac" : "00:00:01:00:22:80",
"isEdgeRouter" : false,
"adjacencySids" : []
}
},
"of:0000000000000193" : {
"segmentrouting" : {
"name" : "Spine-R3",
"nodeSid" : 107,
"routerIp" : "192.168.0.33",
"routerMac" : "00:00:03:00:33:80",
"isEdgeRouter" : false,
"adjacencySids" : []
}
},
"of:0000000000000194" : {
"segmentrouting" : {
"name" : "Spine-R4",
"nodeSid" : 108,
"routerIp" : "192.168.0.44",
"routerMac" : "00:00:04:00:44:80",
"isEdgeRouter" : false,
"adjacencySids" : []
}
}
},
"hosts" : {
"00:00:00:00:00:01/-1" : {
"basic": {
"ips": ["10.0.1.1"],
"location": "of:0000000000000001/5"
}
},
"00:00:00:00:00:02/-1" : {
"basic": {
"ips": ["10.0.1.2"],
"location": "of:0000000000000001/6"
}
},
"00:00:00:00:00:03/-1" : {
"basic": {
"ips": ["10.0.2.1"],
"location": "of:0000000000000002/5"
}
},
"00:00:00:00:00:04/-1" : {
"basic": {
"ips": ["10.0.2.2"],
"location": "of:0000000000000002/6"
}
},
"00:00:00:00:00:05/-1" : {
"basic": {
"ips": ["10.0.3.1"],
"location": "of:0000000000000003/5"
}
},
"00:00:00:00:00:06/-1" : {
"basic": {
"ips": ["10.0.3.2"],
"location": "of:0000000000000003/6"
}
},
"00:00:00:00:00:07/-1" : {
"basic": {
"ips": ["10.0.4.1"],
"location": "of:0000000000000004/5"
}
},
"00:00:00:00:00:08/-1" : {
"basic": {
"ips": ["10.0.4.2"],
"location": "of:0000000000000004/6"
}
}
}
}
{
"ports" : {
"of:0000000000000002/1" : {
"interfaces" : [
{
"ips" : [ "192.168.10.101/24" ],
"mac" : "08:9e:01:82:38:68",
"vlan" : "100"
}
]
},
"of:0000000000000002/2" : {
"interfaces" : [
{
"ips" : [ "192.168.20.101/24" ],
"mac" : "08:9e:01:82:38:68",
"vlan" : "200"
}
]
}
},
"devices" : {
"of:0000000000000002" : {
"segmentrouting" : {
"name" : "Leaf-R1",
"nodeSid" : 101,
"routerIp" : "10.0.1.254",
"routerMac" : "00:00:00:00:01:80",
"isEdgeRouter" : true,
"adjacencySids" : [
{ "adjSids" : 100, "ports" : [2, 3] },
{ "adjSids" : 200, "ports" : [4, 5] }
]
}
},
"of:0000000000000191" : {
"segmentrouting" : {
"name" : "Spine-R1",
"nodeSid" : 105,
"routerIp" : "192.168.0.11",
"routerMac" : "00:00:01:00:11:80",
"isEdgeRouter" : false,
"adjacencySids" : []
}
}
},
"apps" : {
"org.onosproject.router" : {
"bgp" : {
"bgpSpeakers" : [
{
"connectPoint" : "of:00000000000000aa/10",
"peers" : [
"192.168.10.1"
]
},
{
"connectPoint" : "of:00000000000000aa/20",
"peers" : [
"192.168.20.1"
]
}
]
}
}
},
"hosts" : {
"00:00:00:00:00:01/4093": {
"basic": {
"ips": [
"10.0.1.1"
],
"location": "of:0000000000000001/3"
}
},
"00:00:00:00:00:02/4093": {
"basic": {
"ips": [
"10.0.1.2"
],
"location": "of:0000000000000001/4"
}
}
}
}