Fixing the urls used for bbsim service and the documentation
Change-Id: Ib26f33a2f62da17af938d6295114eafbb7c0d477
diff --git a/README.md b/README.md
index a59b713..8a9d380 100644
--- a/README.md
+++ b/README.md
@@ -106,8 +106,8 @@
| `WITH_PORT_FORWARDS` | yes | Forwards ports for some services from localhost into the K8s cluster |
| `CONFIG_SADIS` | no | Configure SADIS entries into ONOS. Values: `yes`, `no`, `file`, `url`, `bbsim`, or `external` |
| `WITH_PPROF` | no | Forwards ports for Golang pprof webserver in rw-core and openolt-adapter (does not automatically include profiled images) |
-| `SADIS_SUBSCRIBERS` | http://bbsim.voltha.svc:50074/v2/subscribers/%s | URL for ONOS to use to query subsriber information if `CONFIG_SADIS` is set to `url` |
-| `SADIS_BANDWIDTH_PROFILES` | http://bbsim.voltha.svc:50074/v2/bandwidthprofiles/%s | URL for ONOS to use to query bandwidth profiles if `CONFIG_SADIS` is set to `url` |
+| `SADIS_SUBSCRIBERS` | http://bbsim0.voltha.svc:50074/v2/subscribers/%s | URL for ONOS to use to query subsriber information if `CONFIG_SADIS` is set to `url` |
+| `SADIS_BANDWIDTH_PROFILES` | http://bbsim0.voltha.svc:50074/v2/bandwidthprofiles/%s| URL for ONOS to use to query bandwidth profiles if `CONFIG_SADIS` is set to `url` |
| `SADIS_CFG` | onos-files/onos-sadis-sample.json | SADIS Configuration File to push, if CONFIG_SADIS set |
| `INSTALL_ONOS_APPS` | no | Replaces/installs ONOS OAR files in onos-files/onos-apps |
| `INSTALL_KUBECTL` | yes | Should a copy of `kubectl` be installed locally? |
@@ -180,7 +180,7 @@
| `bbsim` | configure ONOS use use the SADIS servers that are part of BBSIM |
| `external` | an additional helm chart will be installed (`bbsim-sadis-server`) and ONOS will be configured to use that service for SADIS queries |
-### Controlling volthawith and ONOS cluster
+### Controlling VOLTHA with an ONOS cluster
To provide HA, resilinecy and failover ONOS can be configured in cluster mode.
A 3 node ONOS deployment for example can be achieved via the `full` configuration:
@@ -232,6 +232,11 @@
OS/Arch: linux/amd64
```
+If you've run the voltha script with `WITH_BBSIM=y` you can now create a BBSIM OLT with
+```bash
+voltctl device create -t openolt -H bbsim0.voltha.svc:50060
+```
+
## TROUBLESHOOTING
When VOLTHA is installed the install log is written to the file
`install-$TYPE.log`. If the install appears stalled or is not completing
diff --git a/voltha b/voltha
index 10eb4f8..76f73f9 100755
--- a/voltha
+++ b/voltha
@@ -90,8 +90,8 @@
ONLY_ONE=${ONLY_ONE:-yes}
SCHEDULE_ON_CONTROL_NODES=${SCHEDULE_ON_CONTROL_NODES:-no}
CONFIG_SADIS=${CONFIG_SADIS:-no} # yes | no | file | bbsim | external | URL
-SADIS_SUBSCRIBERS=${SADIS_SUBSCRIBERS:-http://bbsim.$VOLTHA_NS.svc:50074/v2/subscribers/%s}
-SADIS_BANDWIDTH_PROFILES=${SADIS_BANDWIDTH_PROFILES:-http://bbsim.$VOLTHA_NS.svc:50074/v2/bandwidthprofiles/%s}
+SADIS_SUBSCRIBERS=${SADIS_SUBSCRIBERS:-http://bbsim0.$VOLTHA_NS.svc:50074/v2/subscribers/%s}
+SADIS_BANDWIDTH_PROFILES=${SADIS_BANDWIDTH_PROFILES:-http://bbsim0.$VOLTHA_NS.svc:50074/v2/bandwidthprofiles/%s}
SADIS_CFG=${SADIS_CFG:-onos-files/onos-sadis-sample.json}
INSTALL_ONOS_APPS=${INSTALL_ONOS_APPS:-no}
JUST_K8S=${JUST_K8S:-no}
@@ -1767,7 +1767,7 @@
{
"sadis": {
"integration": {
- "url": "http://bbsim.$BBSIM_NS.svc.cluster.local:50074/v2/subscribers/%s",
+ "url": "http://bbsim0.$BBSIM_NS.svc.cluster.local:50074/v2/subscribers/%s",
"cache": {
"enabled": true,
"maxsize": 50,
@@ -1777,7 +1777,7 @@
},
"bandwidthprofile": {
"integration": {
- "url": "http://bbsim.$BBSIM_NS.svc.cluster.local:50074/v2/bandwidthprofiles/%s",
+ "url": "http://bbsim0.$BBSIM_NS.svc.cluster.local:50074/v2/bandwidthprofiles/%s",
"cache": {
"enabled": true,
"maxsize": 50,