Documentation and test update
Change-Id: I564f46eebeffca51fc6f584193881410af0bf06c
diff --git a/compose/network-cfg.json b/compose/network-cfg.json
index 033071b..1ccd56b 100644
--- a/compose/network-cfg.json
+++ b/compose/network-cfg.json
@@ -1,9 +1,9 @@
{
"devices" : {
- "of:0000aabbccddeeff" : {
+ "of:000000000a4001cf" : {
"accessDevice" : {
"uplink" : "65536",
- "vlan" : "12"
+ "vlan" : "1"
},
"basic" : {
"driver" : "voltha"
@@ -42,12 +42,26 @@
"ipAddress" : "10.64.1.207",
"nasId" : "ATLEDGEVOLT1"
}, {
- "id" : "BRCM33333333",
- "cTag" : 21,
- "sTag" : 12,
+ "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"
}]
}
}
diff --git a/quickstart.md b/quickstart.md
index 7e9d93e..b78d35a 100644
--- a/quickstart.md
+++ b/quickstart.md
@@ -206,6 +206,108 @@
At this point preprovision and enable olt, add flows using the CLI or ofagent.
+
+
+### Physical OLT/ONU Testing with Passing Traffic
+Start a physical OLT and ONU. Tested with Edgecore OLT, Broadcom based ONU, and RG capable of EAPoL
+
+Preprovision and enable
+```sh
+(voltha) preprovision_olt -t openolt -H 10.64.1.207:9191
+success (device id = c6efa171c13056d36e69d1ab)
+(voltha) enable
+enabling c6efa171c13056d36e69d1ab
+waiting for device to be enabled...
+waiting for device to be enabled...
+success (device id = c6efa171c13056d36e69d1ab)
+```
+
+Verify device state
+```sh
+(voltha) devices
+Devices:
++--------------------------+-------------------+------+--------------------------+---------------+-------------------+-------------+-------------+----------------+----------------+------------------+--------------------------------------+
+| id | type | root | parent_id | serial_number | mac_address | admin_state | oper_status | connect_status | parent_port_no | host_and_port | reason |
++--------------------------+-------------------+------+--------------------------+---------------+-------------------+-------------+-------------+----------------+----------------+------------------+--------------------------------------+
+| c6efa171c13056d36e69d1ab | openolt | True | 00000a4001cf | EC1829000886 | 00:00:0a:40:01:cf | ENABLED | ACTIVE | REACHABLE | | 10.64.1.207:9191 | |
+| 51e092cb40883b796c77a8f2 | brcm_openomci_onu | | c6efa171c13056d36e69d1ab | BRCM33333333 | | ENABLED | ACTIVE | REACHABLE | 536870912 | | tech-profile-config-download-success |
++--------------------------+-------------------+------+--------------------------+---------------+-------------------+-------------+-------------+----------------+----------------+------------------+--------------------------------------+
+
+(voltha) device c6efa171c13056d36e69d1ab
+(device c6efa171c13056d36e69d1ab) ports
+Device ports:
++-----------+-----------+--------------+-------------+-------------+--------------------------------------------------------------------+
+| port_no | label | type | admin_state | oper_status | peers |
++-----------+-----------+--------------+-------------+-------------+--------------------------------------------------------------------+
+| 536870912 | pon0 | PON_OLT | ENABLED | ACTIVE | [{'port_no': 536870912, 'device_id': u'51e092cb40883b796c77a8f2'}] |
+| 65536 | nni-65536 | ETHERNET_NNI | ENABLED | ACTIVE | |
+| 536870913 | pon1 | PON_OLT | ENABLED | ACTIVE | |
+| 536870914 | pon2 | PON_OLT | ENABLED | ACTIVE | |
+| 536870915 | pon3 | PON_OLT | ENABLED | ACTIVE | |
+| 536870916 | pon4 | PON_OLT | ENABLED | ACTIVE | |
+| 536870917 | pon5 | PON_OLT | ENABLED | ACTIVE | |
+| 536870918 | pon6 | PON_OLT | ENABLED | ACTIVE | |
+| 536870919 | pon7 | PON_OLT | ENABLED | ACTIVE | |
+| 536870920 | pon8 | PON_OLT | ENABLED | ACTIVE | |
++-----------+-----------+--------------+-------------+-------------+--------------------------------------------------------------------+
+| 536870921 | pon9 | PON_OLT | ENABLED | ACTIVE | |
+| 536870922 | pon10 | PON_OLT | ENABLED | ACTIVE | |
+| 536870923 | pon11 | PON_OLT | ENABLED | ACTIVE | |
+| 536870924 | pon12 | PON_OLT | ENABLED | ACTIVE | |
+| 536870925 | pon13 | PON_OLT | ENABLED | ACTIVE | |
+| 536870926 | pon14 | PON_OLT | ENABLED | ACTIVE | |
+| 536870927 | pon15 | PON_OLT | ENABLED | ACTIVE | |
++-----------+-----------+--------------+-------------+-------------+--------------------------------------------------------------------+
+(device c6efa171c13056d36e69d1ab) quit
+
+
+(voltha) device 51e092cb40883b796c77a8f2
+(device 51e092cb40883b796c77a8f2) ports
+Device ports:
++-----------+----------+--------------+-------------+-------------+--------------------------------------------------------------------+
+| port_no | label | type | admin_state | oper_status | peers |
++-----------+----------+--------------+-------------+-------------+--------------------------------------------------------------------+
+| 536870912 | PON port | PON_ONU | ENABLED | ACTIVE | [{'port_no': 536870912, 'device_id': u'c6efa171c13056d36e69d1ab'}] |
+| 16 | uni-16 | ETHERNET_UNI | ENABLED | ACTIVE | |
+| 17 | uni-17 | ETHERNET_UNI | ENABLED | ACTIVE | |
+| 18 | uni-18 | ETHERNET_UNI | ENABLED | ACTIVE | |
+| 19 | uni-19 | ETHERNET_UNI | ENABLED | ACTIVE | |
+| 20 | uni-20 | ETHERNET_UNI | ENABLED | ACTIVE | |
++-----------+----------+--------------+-------------+-------------+--------------------------------------------------------------------+
+```
+
+Verify onos device state and EAPoL authentication. Password is karaf
+```sh
+ssh -p 8101 karaf@localhost
+```
+
+```sh
+onos> ports
+id=of:000000000a4001cf, available=true, local-status=connected 1h15m ago, role=MASTER, type=SWITCH, mfr=, hw=asfvolt16, sw=BAL.2.6.0__Openolt.2018.10.04, serial=EC1829000886, chassis=a4001cf, driver=voltha, channelId=172.18.0.1:38368, locType=none, managementAddress=172.18.0.1, name=of:000000000a4001cf, protocol=OF_13
+ port=16, state=enabled, type=fiber, speed=0 , adminState=enabled, portMac=08:00:00:00:00:10, portName=BRCM33333333-1
+ port=17, state=enabled, type=fiber, speed=0 , adminState=enabled, portMac=08:00:00:00:00:11, portName=BRCM33333333-2
+ port=18, state=enabled, type=fiber, speed=0 , adminState=enabled, portMac=08:00:00:00:00:12, portName=BRCM33333333-3
+ port=19, state=enabled, type=fiber, speed=0 , adminState=enabled, portMac=08:00:00:00:00:13, portName=BRCM33333333-4
+ port=20, state=enabled, type=fiber, speed=0 , adminState=enabled, portMac=08:00:00:00:00:14, portName=BRCM33333333-5
+ port=65536, state=enabled, type=fiber, speed=0 , adminState=enabled, portMac=00:00:00:01:00:00, portName=nni-65536
+
+onos> aaa-users
+UserName=E0:B7:0A:70:E6:C1,CurrentState=AUTHORIZED,DeviceId=of:000000000a4001cf,MAC=E0:B7:0A:70:E6:C1,PortNumber=16,SubscriberId=PON 1/1/3/1:3.1.1
+```
+
+Provision subscriber flows. Verify traffic
+```sh
+onos> volt-subscribers
+port=of:000000000a4001cf/16, svlan=13, cvlan=22
+
+onos> volt-add-subscriber-access of:000000000a4001cf 16
+
+onos> volt-programmed-subscribers
+location=of:000000000a4001cf/16 subscriber=[id:BRCM33333333-1,cTag:22,sTag:13,nasPortId:PON 1/1/3/1:3.1.1,uplinkPort:-1,slot:-1,hardwareIdentifier:null,ipaddress:null,nasId:null,circuitId:PON 1/1/3/1:3.1.1-CID,remoteId:ATLEDGEVOLT1-RID]
+
+```
+
+
### Test with BBSIM or Ponsim
if you don't have a real OLT device and want to test with a simulator BBSIM or PONSIM can be used.
```compose/system-test-bbsim.yml``` file includes BBSIM image and ```compose/system-test-ponsim.yml``` includes PONSIM. Please note that since PONSIM uses its own ```ponsim_adapter``` you need to run the preprovision command like this: