VOL-2602 Update docker compose onos netcfg for new onos
- new style sadis configuration
- bbsim can now provide its own sadis config
- update development quickstart doc with new onos and
CLI output
Change-Id: Ifbf06d473eee033bd11e650b0f749d746923e71f
diff --git a/compose/network-cfg-bbsim.json b/compose/network-cfg-bbsim.json
index 5507aa3..86f2fd4 100644
--- a/compose/network-cfg-bbsim.json
+++ b/compose/network-cfg-bbsim.json
@@ -1,15 +1,4 @@
{
- "devices": {
- "of:00000000ac110001": {
- "accessDevice": {
- "uplink": "1048576",
- "vlan": "1"
- },
- "basic": {
- "driver": "voltha"
- }
- }
- },
"apps": {
"org.opencord.dhcpl2relay": {
"dhcpl2relay": {
@@ -33,84 +22,23 @@
"org.opencord.sadis": {
"sadis": {
"integration": {
+ "url": "http://172.17.0.1:50074/subscribers/%s",
"cache": {
"enabled": true,
"maxsize": 50,
"ttl": "PT1m"
}
- },
- "entries": [
- {
- "id": "BBSIM_OLT_0",
- "uplinkPort": 1048576,
- "hardwareIdentifier": "00:00:ac:11:00:01",
- "ipAddress": "172.17.0.1",
- "nasId": "BBSIM_OLT_0"
- },
- {
- "id": "BBSM00000001-1",
- "cTag": 900,
- "sTag": 900,
- "nasPortId": "BBSM00000001-1",
- "circuitId": "BBSM00000001-1",
- "remoteId": "BBSIM_OLT_0",
- "technologyProfileId": 64,
- "upstreamBandwidthProfile": "Default",
- "downstreamBandwidthProfile": "Default"
- },
- {
- "id": "BBSM00000001-2",
- "cTag": 900,
- "sTag": 900,
- "nasPortId": "BBSM00000001-2",
- "circuitId": "BBSM00000001-2",
- "remoteId": "BBSIM_OLT_0",
- "technologyProfileId": 64,
- "upstreamBandwidthProfile": "Default",
- "downstreamBandwidthProfile": "Default"
- },
- {
- "id": "BBSM00000001-3",
- "cTag": 900,
- "sTag": 900,
- "nasPortId": "BBSM00000001-3",
- "circuitId": "BBSM00000001-3",
- "remoteId": "BBSIM_OLT_0",
- "technologyProfileId": 64,
- "upstreamBandwidthProfile": "Default",
- "downstreamBandwidthProfile": "Default"
- },
- {
- "id": "BBSM00000001-4",
- "cTag": 900,
- "sTag": 900,
- "nasPortId": "BBSM00000001-4",
- "circuitId": "BBSM00000001-4",
- "remoteId": "BBSIM_OLT_0",
- "technologyProfileId": 64,
- "upstreamBandwidthProfile": "Default",
- "downstreamBandwidthProfile": "Default"
- }
- ]
+ }
},
"bandwidthprofile": {
"integration": {
+ "url": "http://172.17.0.1:50074/bandwidthprofiles/%s",
"cache": {
"enabled": true,
"maxsize": 40,
"ttl": "PT1m"
}
- },
- "entries": [
- {
- "id": "Default",
- "air": 10000000,
- "cbs": 5000,
- "cir": 750000,
- "ebs": 5000,
- "eir": 1000000
- }
- ]
+ }
}
}
}
diff --git a/compose/network-cfg.json b/compose/network-cfg.json
index 591abf1..c2a4f68 100644
--- a/compose/network-cfg.json
+++ b/compose/network-cfg.json
@@ -1,15 +1,4 @@
{
- "devices": {
- "of:000000000a4001d0": {
- "accessDevice": {
- "uplink": "1048576",
- "vlan": "1"
- },
- "basic": {
- "driver": "voltha"
- }
- }
- },
"apps": {
"org.opencord.dhcpl2relay": {
"dhcpl2relay": {
@@ -41,66 +30,27 @@
},
"entries": [
{
- "id": "EC1829000885",
+ "id": "EC1721000221",
"uplinkPort": 1048576,
- "hardwareIdentifier": "3c:2c:99:f7:c6:82",
- "ipAddress": "10.64.1.207",
+ "hardwareIdentifier": "00:00:0a:40:01:ce",
+ "ipAddress": "10.64.1.206",
"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"
+ "uniTagList": [
+ {
+ "ponCTag": 20,
+ "ponSTag": 11,
+ "technologyProfileId": 64,
+ "downstreamBandwidthProfile": "Default",
+ "upstreamBandwidthProfile": "Default",
+ "isDhcpRequired": true
+ }
+ ]
}
]
},
diff --git a/compose/system-test-bbsim.yml b/compose/system-test-bbsim.yml
index d3dc347..a63a244 100644
--- a/compose/system-test-bbsim.yml
+++ b/compose/system-test-bbsim.yml
@@ -171,6 +171,8 @@
privileged: true
command: [
"./bbsim",
+ "-logLevel",
+ "trace",
"-auth",
"-dhcp",
"-pon",
@@ -180,6 +182,7 @@
]
ports:
- "50060:50060"
+ - "50074:50074"
networks:
- default
restart: unless-stopped