Update docker-compose onos test configuration
Updated to reflect TP configuration needed.
Change-Id: Iad02d3b2aee35a5401821449bc4e2b38c75cb045
diff --git a/compose/network-cfg-bbsim.json b/compose/network-cfg-bbsim.json
index fe21d4e..a839211 100644
--- a/compose/network-cfg-bbsim.json
+++ b/compose/network-cfg-bbsim.json
@@ -1,60 +1,116 @@
{
- "devices" : {
- "of:00000000ac110001" : {
- "accessDevice" : {
- "uplink" : "65536",
- "vlan" : "1"
+ "devices": {
+ "of:00000000ac110001": {
+ "accessDevice": {
+ "uplink": "65536",
+ "vlan": "1"
},
- "basic" : {
- "driver" : "voltha"
+ "basic": {
+ "driver": "voltha"
}
}
},
- "apps" : {
- "org.opencord.dhcpl2relay" : {
- "dhcpl2relay" : {
- "useOltUplinkForServerPktInOut" : true
+ "apps": {
+ "org.opencord.dhcpl2relay": {
+ "dhcpl2relay": {
+ "useOltUplinkForServerPktInOut": true
}
},
- "org.opencord.aaa" : {
- "AAA" : {
- "radiusIp" : "172.17.0.1",
- "radiusServerPort" : "1812",
- "radiusSecret" : "SECRET",
- "nasIp" : "172.17.0.1",
- "radiusConnectionType" : "socket"
+ "org.opencord.kafka": {
+ "kafka": {
+ "bootstrapServers": "172.17.0.1:9092"
}
},
- "org.opencord.sadis" : {
- "sadis" : {
- "integration" : {
- "cache" : {
- "enabled" : true,
- "maxsize" : 50,
- "ttl" : "PT1m"
+ "org.opencord.aaa": {
+ "AAA": {
+ "radiusIp": "172.17.0.1",
+ "radiusServerPort": "1812",
+ "radiusSecret": "SECRET",
+ "nasIp": "172.17.0.1",
+ "radiusConnectionType": "socket"
+ }
+ },
+ "org.opencord.sadis": {
+ "sadis": {
+ "integration": {
+ "cache": {
+ "enabled": true,
+ "maxsize": 50,
+ "ttl": "PT1m"
}
},
- "entries" : [ {
- "id" : "BBSIMOLT000",
- "uplinkPort" : 65536,
- "hardwareIdentifier" : "00:00:ac:11:00:01",
- "ipAddress" : "172.17.0.1",
- "nasId" : "BBSIMOLT000"
- }, {
- "id" : "BBSM00000001-1",
- "cTag" : 900,
- "sTag" : 900,
- "nasPortId" : "BBSM00000001-1",
- "circuitId" : "BBSM00000001-1",
- "remoteId" : "BBSIMOLT000"
- }, {
- "id" : "BBSM00000002-1",
- "cTag" : 901,
- "sTag" : 901,
- "nasPortId" : "BBSM00000002-1",
- "circuitId" : "BBSM00000002-1",
- "remoteId" : "BBSIMOLT000"
- }]
+ "entries": [
+ {
+ "id": "BBSIMOLT000",
+ "uplinkPort": 65536,
+ "hardwareIdentifier": "00:00:ac:11:00:01",
+ "ipAddress": "172.17.0.1",
+ "nasId": "BBSIMOLT000"
+ },
+ {
+ "id": "BBSM00000001-1",
+ "cTag": 900,
+ "sTag": 900,
+ "nasPortId": "BBSM00000001-1",
+ "circuitId": "BBSM00000001-1",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "BBSM00000001-2",
+ "cTag": 900,
+ "sTag": 900,
+ "nasPortId": "BBSM00000001-2",
+ "circuitId": "BBSM00000001-2",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "BBSM00000001-3",
+ "cTag": 900,
+ "sTag": 900,
+ "nasPortId": "BBSM00000001-3",
+ "circuitId": "BBSM00000001-3",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "BBSM00000001-4",
+ "cTag": 900,
+ "sTag": 900,
+ "nasPortId": "BBSM00000001-4",
+ "circuitId": "BBSM00000001-4",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ }
+ ]
+ },
+ "bandwidthprofile": {
+ "integration": {
+ "cache": {
+ "enabled": true,
+ "maxsize": 40,
+ "ttl": "PT1m"
+ }
+ },
+ "entries": [
+ {
+ "id": "Default",
+ "cir": 1000000,
+ "cbs": 1001,
+ "eir": 1002,
+ "ebs": 1003,
+ "air": 1004
+ }
+ ]
}
}
}
diff --git a/compose/network-cfg.json b/compose/network-cfg.json
index 1ccd56b..038c4d7 100644
--- a/compose/network-cfg.json
+++ b/compose/network-cfg.json
@@ -1,68 +1,127 @@
{
- "devices" : {
- "of:000000000a4001cf" : {
- "accessDevice" : {
- "uplink" : "65536",
- "vlan" : "1"
+ "devices": {
+ "of:000000000a4001d0": {
+ "accessDevice": {
+ "uplink": "65536",
+ "vlan": "1"
},
- "basic" : {
- "driver" : "voltha"
+ "basic": {
+ "driver": "voltha"
}
}
},
- "apps" : {
- "org.opencord.dhcpl2relay" : {
- "dhcpl2relay" : {
- "useOltUplinkForServerPktInOut" : true
+ "apps": {
+ "org.opencord.dhcpl2relay": {
+ "dhcpl2relay": {
+ "useOltUplinkForServerPktInOut": true
}
},
- "org.opencord.aaa" : {
- "AAA" : {
- "radiusIp" : "172.16.0.1",
- "radiusServerPort" : "1645",
- "radiusSecret" : "secret",
- "nasIp" : "172.16.0.10",
- "radiusConnectionType" : "socket",
- "packetCustomizer" : "att"
+ "org.opencord.kafka": {
+ "kafka": {
+ "bootstrapServers": "172.17.0.1:9092"
}
},
- "org.opencord.sadis" : {
- "sadis" : {
- "integration" : {
- "cache" : {
- "enabled" : true,
- "maxsize" : 50,
- "ttl" : "PT1m"
+ "org.opencord.aaa": {
+ "AAA": {
+ "radiusIp": "172.17.0.1",
+ "radiusServerPort": "1812",
+ "radiusSecret": "SECRET",
+ "nasIp": "172.17.0.1",
+ "radiusConnectionType": "socket"
+ }
+ },
+ "org.opencord.sadis": {
+ "sadis": {
+ "integration": {
+ "cache": {
+ "enabled": true,
+ "maxsize": 50,
+ "ttl": "PT1m"
}
},
- "entries" : [ {
- "id" : "EC1829000886",
- "uplinkPort" : 65536,
- "hardwareIdentifier" : "3c:2c:99:f7:c6:82",
- "ipAddress" : "10.64.1.207",
- "nasId" : "ATLEDGEVOLT1"
- }, {
- "id" : "BRCM33333333-1",
- "cTag" : 22,
- "sTag" : 13,
- "nasPortId" : "PON 1/1/3/1:3.1.1",
- "circuitId" : "PON 1/1/3/1:3.1.1-CID",
- "remoteId" : "ATLEDGEVOLT1-RID"
- }, {
- "id" : "BRCM33333333-2",
- "cTag" : 23,
- "sTag" : 13,
- "nasPortId" : "PON 1/1/3/1:4.1.1",
- "circuitId" : "PON 1/1/3/1:4.1.1-CID",
- "remoteId" : "ATLEDGEVOLT1-RID"
- }, {
- "id" : "BRCM33333333-3",
- "cTag" : 24,
- "sTag" : 13,
- "nasPortId" : "PON 1/1/3/1:5.1.1",
- "circuitId" : "PON 1/1/3/1:5.1.1-CID",
- "remoteId" : "ATLEDGEVOLT1-RID"
- }]
+ "entries": [
+ {
+ "id": "EC1829000885",
+ "uplinkPort": 65536,
+ "hardwareIdentifier": "3c:2c:99:f7:c6:82",
+ "ipAddress": "10.64.1.207",
+ "nasId": "ATLEDGEVOLT1"
+ },
+ {
+ "id": "ALPHe3d1cf57-1",
+ "cTag": 21,
+ "sTag": 13,
+ "nasPortId": "PON 1/1/3/1:2.1.1",
+ "circuitId": "PON 1/1/3/1:2.1.1-CID",
+ "remoteId": "ATLEDGEVOLT1-RID",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "ALPHe3d1cf57-2",
+ "cTag": 21,
+ "sTag": 13,
+ "nasPortId": "PON 1/1/3/1:2.1.1",
+ "circuitId": "PON 1/1/3/1:2.1.1-CID",
+ "remoteId": "ATLEDGEVOLT1-RID",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "ALPHe3d1cf57-3",
+ "cTag": 21,
+ "sTag": 13,
+ "nasPortId": "PON 1/1/3/1:2.1.1",
+ "circuitId": "PON 1/1/3/1:2.1.1-CID",
+ "remoteId": "ATLEDGEVOLT1-RID",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "ALPHe3d1cf57-4",
+ "cTag": 21,
+ "sTag": 13,
+ "nasPortId": "PON 1/1/3/1:2.1.1",
+ "circuitId": "PON 1/1/3/1:2.1.1-CID",
+ "remoteId": "ATLEDGEVOLT1-RID",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "ALPHe3d1cf57-5",
+ "cTag": 21,
+ "sTag": 13,
+ "nasPortId": "PON 1/1/3/1:2.1.1",
+ "circuitId": "PON 1/1/3/1:2.1.1-CID",
+ "remoteId": "ATLEDGEVOLT1-RID",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ }
+ ]
+ },
+ "bandwidthprofile": {
+ "integration": {
+ "cache": {
+ "enabled": true,
+ "maxsize": 40,
+ "ttl": "PT1m"
+ }
+ },
+ "entries": [
+ {
+ "id": "Default",
+ "cir": 1000000,
+ "cbs": 1001,
+ "eir": 1002,
+ "ebs": 1003,
+ "air": 1004
+ }
+ ]
}
}
}