VOL-2227: Update nni in compose setup and update quickstart doc
- example netcfg json uses new nni number
- stop using nonsense bandwidth profile settings
- quickstart now only sets up needed repositories to build containers
- use ppa to install golang, pinned to a specific version
- use voltctl instead of cli container
- improved output capture examples and bbsim setup example
Change-Id: I94718bf30dfe8e7605bd05f91e1a8dae4517b395
diff --git a/compose/network-cfg-bbsim.json b/compose/network-cfg-bbsim.json
index a839211..5507aa3 100644
--- a/compose/network-cfg-bbsim.json
+++ b/compose/network-cfg-bbsim.json
@@ -2,7 +2,7 @@
"devices": {
"of:00000000ac110001": {
"accessDevice": {
- "uplink": "65536",
+ "uplink": "1048576",
"vlan": "1"
},
"basic": {
@@ -41,11 +41,11 @@
},
"entries": [
{
- "id": "BBSIMOLT000",
- "uplinkPort": 65536,
+ "id": "BBSIM_OLT_0",
+ "uplinkPort": 1048576,
"hardwareIdentifier": "00:00:ac:11:00:01",
"ipAddress": "172.17.0.1",
- "nasId": "BBSIMOLT000"
+ "nasId": "BBSIM_OLT_0"
},
{
"id": "BBSM00000001-1",
@@ -53,7 +53,7 @@
"sTag": 900,
"nasPortId": "BBSM00000001-1",
"circuitId": "BBSM00000001-1",
- "remoteId": "BBSIMOLT000",
+ "remoteId": "BBSIM_OLT_0",
"technologyProfileId": 64,
"upstreamBandwidthProfile": "Default",
"downstreamBandwidthProfile": "Default"
@@ -64,7 +64,7 @@
"sTag": 900,
"nasPortId": "BBSM00000001-2",
"circuitId": "BBSM00000001-2",
- "remoteId": "BBSIMOLT000",
+ "remoteId": "BBSIM_OLT_0",
"technologyProfileId": 64,
"upstreamBandwidthProfile": "Default",
"downstreamBandwidthProfile": "Default"
@@ -75,7 +75,7 @@
"sTag": 900,
"nasPortId": "BBSM00000001-3",
"circuitId": "BBSM00000001-3",
- "remoteId": "BBSIMOLT000",
+ "remoteId": "BBSIM_OLT_0",
"technologyProfileId": 64,
"upstreamBandwidthProfile": "Default",
"downstreamBandwidthProfile": "Default"
@@ -86,7 +86,7 @@
"sTag": 900,
"nasPortId": "BBSM00000001-4",
"circuitId": "BBSM00000001-4",
- "remoteId": "BBSIMOLT000",
+ "remoteId": "BBSIM_OLT_0",
"technologyProfileId": 64,
"upstreamBandwidthProfile": "Default",
"downstreamBandwidthProfile": "Default"
@@ -104,11 +104,11 @@
"entries": [
{
"id": "Default",
- "cir": 1000000,
- "cbs": 1001,
- "eir": 1002,
- "ebs": 1003,
- "air": 1004
+ "air": 10000000,
+ "cbs": 5000,
+ "cir": 750000,
+ "ebs": 5000,
+ "eir": 1000000
}
]
}
diff --git a/compose/network-cfg.json b/compose/network-cfg.json
index 038c4d7..591abf1 100644
--- a/compose/network-cfg.json
+++ b/compose/network-cfg.json
@@ -2,7 +2,7 @@
"devices": {
"of:000000000a4001d0": {
"accessDevice": {
- "uplink": "65536",
+ "uplink": "1048576",
"vlan": "1"
},
"basic": {
@@ -42,7 +42,7 @@
"entries": [
{
"id": "EC1829000885",
- "uplinkPort": 65536,
+ "uplinkPort": 1048576,
"hardwareIdentifier": "3c:2c:99:f7:c6:82",
"ipAddress": "10.64.1.207",
"nasId": "ATLEDGEVOLT1"
@@ -115,11 +115,11 @@
"entries": [
{
"id": "Default",
- "cir": 1000000,
- "cbs": 1001,
- "eir": 1002,
- "ebs": 1003,
- "air": 1004
+ "air": 10000000,
+ "cbs": 5000,
+ "cir": 750000,
+ "ebs": 5000,
+ "eir": 1000000
}
]
}
diff --git a/compose/system-test-bbsim.yml b/compose/system-test-bbsim.yml
index 7739b92..37abd5e 100644
--- a/compose/system-test-bbsim.yml
+++ b/compose/system-test-bbsim.yml
@@ -181,15 +181,15 @@
bbsim:
- image: "voltha/voltha-bbsim:latest"
+ image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}bbsim:${DOCKER_TAG}"
privileged: true
command: [
"./bbsim",
- "-m",
- "both",
- "-i",
+ "-auth",
+ "-dhcp",
+ "-pon",
"1",
- "-n",
+ "-onu",
"1"
]
ports: