Using the new BBSim in kind-voltha
diff --git a/minimal-values.yaml b/minimal-values.yaml
index 62e6038..82d17ed 100644
--- a/minimal-values.yaml
+++ b/minimal-values.yaml
@@ -17,7 +17,7 @@
# By default no defaults are set and the image tags specified in the helm
# charts will be used. If you would like to use the images generated from the
# HEAD of the "master" git branches, then uncomment this below block and
-# set "<VALUE>" to "master". Similarly, if you want to use the images
+# set "<VALUE>" to "master". Similarly, if you want to use the images
# generated from the HEAD of the "voltha-2.1" git branches, then uncomment
# this block and replace "<VALUE>" with "voltha-2.1".
defaults:
@@ -30,7 +30,7 @@
# ---------------
# The helm chart used to deploy ONOS is the public ONOS helm chart so,
# there is a need to specify the exact image repository and image tag.
- # If you would like to use the "master", "voltha-2.1", or other image
+ # If you would like to use the "master", "voltha-2.1", or other image
# just replace the "tag" value below.
tag: voltha-2.1
@@ -53,8 +53,8 @@
repository: voltha/voltha-adapter-simulated-onu
tag: master
bbsim:
- repository: voltha/voltha-bbsim
- tag: voltha-2.1
+ repository: voltha/bbsim
+ tag: master
afrouter:
repository: voltha/voltha-afrouter
tag: master
diff --git a/onos-files/onos-sadis-sample.json b/onos-files/onos-sadis-sample.json
index 5a21c85..131ca1b 100644
--- a/onos-files/onos-sadis-sample.json
+++ b/onos-files/onos-sadis-sample.json
@@ -4,12 +4,12 @@
"cache": {
"enabled": false,
"maxsize": 50,
- "ttl": "PT0m"
+ "ttl": "PT1m"
}
},
"entries": [
{
- "id": "BBSIMOLT000",
+ "id": "BBSIM_OLT_0",
"hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
"nasId": "BBSIMOLT000",
"uplinkPort": 65536
@@ -24,6 +24,39 @@
"technologyProfileId": 64,
"upstreamBandwidthProfile": "Default",
"downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "BBSM00000002-1",
+ "cTag": 901,
+ "sTag": 900,
+ "nasPortId": "BBSM00000002-1",
+ "circuitId": "BBSM00000002-1",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "BBSM00000101-1",
+ "cTag": 902,
+ "sTag": 900,
+ "nasPortId": "BBSM00000101-1",
+ "circuitId": "BBSM00000101-1",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
+ },
+ {
+ "id": "BBSM00000102-1",
+ "cTag": 903,
+ "sTag": 900,
+ "nasPortId": "BBSM00000102-1",
+ "circuitId": "BBSM00000102-1",
+ "remoteId": "BBSIMOLT000",
+ "technologyProfileId": 64,
+ "upstreamBandwidthProfile": "Default",
+ "downstreamBandwidthProfile": "Default"
}
]
},
diff --git a/voltha b/voltha
index c647dc1..71d8402 100755
--- a/voltha
+++ b/voltha
@@ -88,7 +88,7 @@
VOLTHA_CHART=${VOLTHA_CHART:-onf/voltha}
VOLTHA_CHART_VERSION=${VOLTHA_CHART_VERSION:-latest}
VOLTHA_BBSIM_CHART=${VOLTHA_BBSIM_CHART:-onf/bbsim}
-VOLTHA_BBSIM_CHART_VERSION=${VOLTHA_BBSIM_CHART_VERSION:-2.1.1}
+VOLTHA_BBSIM_CHART_VERSION=${VOLTHA_BBSIM_CHART_VERSION:-latest}
VOLTHA_ADAPTER_SIM_CHART=${VOLTHA_ADAPTER_SIM_CHART:-onf/voltha-adapter-simulated}
VOLTHA_ADAPTER_SIM_CHART_VERSION=${VOLTHA_ADAPTER_SIM_CHART_VERSION:-latest}
VOLTHA_ADAPTER_OPEN_OLT_CHART=${VOLTHA_ADAPTER_OPEN_OLT_CHART:-onf/voltha-adapter-openolt}
@@ -598,7 +598,7 @@
(set -x; kubectl get --all-namespaces events >> $DATA/all-events.txt 2>&1) >>$LOG 2>&1
espin - $VERIFIED
bspin - "Dumping VOLTHA POD details"
- PODS="$(kubectl -n default get pod -o name | grep onos | sed -e 's/^/default:/g') $(kubectl get -n voltha pod -o name | sed -e 's/^/voltha:/g')"
+ PODS="$(kubectl -n default get pod -o name | grep onos | sed -e 's/^/default:/g') $(kubectl get -n voltha pod -o name | sed -e 's/^/voltha:/g')"
SINCE=
if [ ! -z "$DUMP_FROM" ]; then
SINCE="--since-time=$DUMP_FROM"