Skip to content

Commit

Permalink
Add v1.1.1 release stuff (#63)
Browse files Browse the repository at this point in the history 
* Add v1.1.1 release stuff

* Update version and modify docs to have 1.1.1 commands

* Modify 1.1.1 sdran chart commit id
  • Loading branch information
@woojoong88
woojoong88 authored Apr 17, 2021
1 parent 7c81895 commit df2dc7a
Show file tree
Hide file tree
Showing 7 changed files with 459 additions and 9 deletions.
16 changes: 15 additions & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ RIABVALUES ?= $(RIABDIR)/sdran-in-a-box-values.yaml
RIABVALUES-LATEST ?= $(RIABDIR)/sdran-in-a-box-values.yaml
RIABVALUES-V1.0.0 ?= $(RIABDIR)/sdran-in-a-box-values-v1.0.0.yaml
RIABVALUES-V1.1.0 ?= $(RIABDIR)/sdran-in-a-box-values-v1.1.0.yaml
RIABVALUES-V1.1.1 ?= $(RIABDIR)/sdran-in-a-box-values-v1.1.1.yaml
RIABVALUES-MS ?= $(RIABDIR)/sdran-in-a-box-values-master-stable.yaml
CHARTDIR ?= $(WORKSPACE)/helm-charts
AETHERCHARTDIR ?= $(CHARTDIR)/aether-helm-charts
Expand All @@ -21,6 +22,7 @@ SDRANCHARTDIR ?= $(CHARTDIR)/sdran-helm-charts
SDRANCHARTCID-LATEST ?= origin/master
SDRANCHARTCID-V1.0.0 ?= v1.0.0#branch: v1.0.0
SDRANCHARTCID-V1.1.0 ?= 6670e6da25129b665b024a7c6d0fd79cfda52f25
SDRANCHARTCID-V1.1.1 ?= 479ff0b59d4ae9f09cd9f7be6ea9a189f207b810

KUBESPRAY_VERSION ?= release-2.14
DOCKER_VERSION ?= 19.03
Expand Down Expand Up @@ -59,7 +61,7 @@ cpu_model := $(shell lscpu | grep 'Model:' | awk '{print $$2}')
os_vendor := $(shell lsb_release -i -s)
os_release := $(shell lsb_release -r -s)

.PHONY: riab-oai riab-ransim riab-fbah riab-oai-latest riab-oai-v1.0.0 riab-oai-v1.1.0 riab-ransim-latest riab-ransim-v1.0.0 riab-ransim-v1.1.0 riab-fbah riab-fbah-latest riab-fbah-v1.1.0 riab-fbah-dev riab-fbah-master-stable riab-oai-master-stable riab-ransim-master-stable oai-enb-usrp oai-ue-usrp ric-oai-latest set-option-oai set-option-ransim set-stable-aether-chart set-latest-sdran-chart set-v1.0.0-sdran-chart set-v1.1.0-sdran-chart set-latest-riab-values set-v1.0.0-riab-values set-v1.1.0-riab-values set-master-stable-riab-values fetch-all-charts omec oai oai-enb-cu oai-enb-du oai-ue ric atomix test-user-plane test-kpimon test-kpimon-v1 test-kpimon-v2 test-pci reset-oai reset-omec reset-atomix reset-ric reset-oai-test reset-ransim-test reset-test clean
.PHONY: riab-oai riab-ransim riab-fbah riab-oai-latest riab-oai-v1.0.0 riab-oai-v1.1.0 riab-oai-v1.1.1 riab-ransim-latest riab-ransim-v1.0.0 riab-ransim-v1.1.0 riab-ransim-v1.1.1 riab-fbah riab-fbah-latest riab-fbah-v1.1.0 riab-fbah-v1.1.1 riab-fbah-dev riab-fbah-master-stable riab-oai-master-stable riab-ransim-master-stable oai-enb-usrp oai-ue-usrp ric-oai-latest set-option-oai set-option-ransim set-stable-aether-chart set-latest-sdran-chart set-v1.0.0-sdran-chart set-v1.1.0-sdran-chart set-v1.1.1-sdran-chart set-latest-riab-values set-v1.0.0-riab-values set-v1.1.0-riab-values set-v1.1.1-riab-values set-master-stable-riab-values fetch-all-charts omec oai oai-enb-cu oai-enb-du oai-ue ric atomix test-user-plane test-kpimon test-kpimon-v1 test-kpimon-v2 test-pci reset-oai reset-omec reset-atomix reset-ric reset-oai-test reset-ransim-test reset-test clean

riab-oai: set-option-oai $(M)/system-check $(M)/helm-ready set-stable-aether-chart set-latest-sdran-chart set-latest-riab-values omec ric oai
riab-ransim: set-option-ransim $(M)/system-check $(M)/helm-ready set-latest-sdran-chart set-latest-riab-values ric
Expand All @@ -76,6 +78,10 @@ riab-oai-v1.1.0: set-option-oai $(M)/system-check $(M)/helm-ready set-stable-aet
riab-ransim-v1.1.0: set-option-ransim $(M)/system-check $(M)/helm-ready set-v1.1.0-sdran-chart set-v1.1.0-riab-values ric
riab-fbah-v1.1.0: set-option-fbah $(M)/system-check $(M)/helm-ready set-v1.1.0-sdran-chart set-v1.1.0-riab-values ric

riab-oai-v1.1.1: set-option-oai $(M)/system-check $(M)/helm-ready set-stable-aether-chart set-v1.1.1-sdran-chart set-v1.1.1-riab-values omec ric oai
riab-ransim-v1.1.1: set-option-ransim $(M)/system-check $(M)/helm-ready set-v1.1.1-sdran-chart set-v1.1.1-riab-values ric
riab-fbah-v1.1.1: set-option-fbah $(M)/system-check $(M)/helm-ready set-v1.1.1-sdran-chart set-v1.1.1-riab-values ric

riab-oai-dev: set-option-oai $(M)/system-check $(M)/helm-ready set-latest-riab-values omec ric oai
riab-ransim-dev: set-option-ransim $(M)/system-check $(M)/helm-ready set-latest-riab-values ric
riab-fbah-dev: set-option-fbah $(M)/system-check $(M)/helm-ready set-latest-riab-values ric
Expand Down Expand Up @@ -127,6 +133,11 @@ set-v1.1.0-sdran-chart:
git fetch origin $(SDRANCHARTCID-V1.1.0); \
git checkout $(SDRANCHARTCID-V1.1.0)

set-v1.1.1-sdran-chart:
cd $(SDRANCHARTDIR); \
git fetch origin $(SDRANCHARTCID-V1.1.1); \
git checkout $(SDRANCHARTCID-V1.1.1)

set-latest-riab-values:
$(eval RIABVALUES=$(RIABVALUES-LATEST))

Expand All @@ -136,6 +147,9 @@ set-v1.0.0-riab-values:
set-v1.1.0-riab-values:
$(eval RIABVALUES=$(RIABVALUES-V1.1.0))

set-v1.1.1-riab-values:
$(eval RIABVALUES=$(RIABVALUES-V1.1.1))

set-master-stable-riab-values:
$(eval RIABVALUES=$(RIABVALUES-MS))

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.1-dev
1.1.1
215 changes: 215 additions & 0 deletions configs/chart_values/onf-server-1-riab-values-v1.1.1.yaml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
# Copyright 2020-present Open Networking Foundation
#
# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0

# cassandra values
cassandra:
config:
cluster_size: 1
seed_size: 1

resources:
enabled: false

config:
spgwc:
pfcp: true
ueIpPool:
ip: 172.250.0.0 # if we use RiaB, Makefile script will override this value with the value defined in Makefile script.
upf:
name: "oaisim"
sriov:
enabled: false
hugepage:
enabled: false
cniPlugin: simpleovs
ipam: static
cfgFiles:
upf.json:
mode: af_packet
mme:
cfgFiles:
config.json:
mme:
mcc:
dig1: 2
dig2: 0
dig3: 8
mnc:
dig1: 0
dig2: 1
dig3: -1
apnlist:
internet: "spgwc"
hss:
bootstrap:
users:
- apn: "internet"
key: "465b5ce8b199b49faa5f0a2ee238a6bc"
opc: "d4416644f6154936193433dd20a0ace0"
sqn: 96
imsiStart: "208014567891201"
msisdnStart: "1122334455"
count: 10
mmes:
- id: 1
mme_identity: mme.riab.svc.cluster.local
mme_realm: riab.svc.cluster.local
isdn: "19136246000"
unreachability: 1
oai-enb-cu:
networks:
f1:
interface: eno1 # if we use RiaB, Makefile script will automatically apply appropriate interface name
address: 10.128.100.100 #if we use RiaB, Makefile script will automatically apply appropriate IP address
s1mme:
interface: eno1 # if we use RiaB, Makefile script will automatically apply appropriate interface name
s1u:
interface: enb
oai-enb-du:
mode: nfapi #or local_L1 for USRP and BasicSim
networks:
f1:
interface: eno1 #if we use RiaB, Makefile script will automatically apply appropriate IP address
address: 10.128.100.100 #if we use RiaB, Makefile script will automatically apply appropriate IP address
nfapi:
interface: eno1 #if we use RiaB, Makefile script will automatically apply appropriate IP address
address: 10.128.100.100 #if we use RiaB, Makefile script will automatically apply appropriate IP address
oai-ue:
numDevices: 1 # support up to 3
networks:
nfapi:
interface: eno1 #if we use RiaB, Makefile script will automatically apply appropriate IP address
address: 10.128.100.100 #if we use RiaB, Makefile script will automatically apply appropriate IP address
onos-e2t:
enabled: "yes"
networks:
e2:
address: 127.0.0.1 # if we use RiaB, Makefile script will automatically apply appropriate interface name
port: 36421

# for the development, we can use the custom images
# For ONOS-RIC
onos-topo:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-topo
tag: v0.7.3
onos-config:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-config
tag: v0.7.18
onos-e2t:
service:
external:
enabled: true
e2:
nodePort: 36421
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-e2t
tag: v0.7.15
onos-e2sub:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-e2sub
tag: v0.7.3
onos-cli:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-cli
tag: v0.7.12
ran-simulator:
image:
pullPolicy: IfNotPresent
repository: onosproject/ran-simulator
tag: v0.7.26
onos-kpimon-v1:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-kpimon
tag: v0.1.8
onos-kpimon-v2:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-kpimon
tag: v0.1.8
onos-pci:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-pci
tag: v0.1.3
fb-ah-xapp:
image:
repository: onosproject/fb-ah-xapp
tag: 0.0.1
pullPolicy: IfNotPresent
fb-ah-gui:
image:
repository: onosproject/fb-ah-gui
tag: 0.0.1
pullPolicy: IfNotPresent
ah-eson-test-server:
image:
repository: onosproject/ah-eson-test-server
tag: 0.0.1
pullPolicy: IfNotPresent

# For OMEC & OAI
images:
pullPolicy: IfNotPresent
tags:
# For OMEC - Those images are stable image for RiaB
# latest Aether helm chart commit ID: 3d1e936e87b4ddae784a33f036f87899e9d00b95
# init: docker.io/omecproject/pod-init:1.0.0
# depCheck: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
hssdb: docker.io/onosproject/riab-hssdb:v1.0.0
hss: docker.io/onosproject/riab-hss:v1.0.0
mme: docker.io/onosproject/riab-nucleus-mme:v1.0.0
spgwc: docker.io/onosproject/riab-spgw:v1.0.0-onfvm-1
pcrf: docker.io/onosproject/riab-pcrf:v1.0.0
pcrfdb: docker.io/onosproject/riab-pcrfdb:v1.0.0
bess: docker.io/onosproject/riab-bess-upf:v1.0.0-onfvm-1
pfcpiface: docker.io/onosproject/riab-pfcpiface:v1.0.0-onfvm-1
# For OAI
oaicucp: docker.io/onosproject/oai-enb-cu:v0.1.5
oaidu: docker.io/onosproject/oai-enb-du:v0.1.4
oaiue: docker.io/onosproject/oai-ue:v0.1.4

# For SD-RAN Umbrella chart:
# ONOS-KPIMON xAPP is imported in the RiaB by default
import:
onos-kpimon-v1:
enabled: false
onos-kpimon-v2:
enabled: true
onos-pci:
enabled: false
# Other ONOS-RIC micro-services
# onos-topo:
# enabled: true
# onos-e2t:
# enabled: true
# onos-e2sub:
# enabled: true
# onos-o1t:
# enabled: false
# onos-config:
# enabled: true
# onos-sdran-cli:
# enabled: true
# ran-simulator chart is automatically imported when pushing ransim option
# ran-simulator:
# enabled: false
# onos-gui:
# enabled: false
# nem-monitoring:
# enabled: false
# fb-ah-xapp, fb-ah-gui, and ah-eson-test-server are automatically imported when pushing fbc-pci option
# fb-ah-xapp:
# enabled: false
# fb-ah-gui:
# enabled: false
# ah-eson-test-server:
# enabled: false
8 changes: 5 additions & 3 deletions docs/Installation_OAI_nFAPI.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ $ git clone https://github.com/onosproject/sdran-in-a-box
$ cd /path/to/sdran-in-a-box
$ git checkout v1.0.0 # for release 1.0
$ git checkout v1.1.0 # for release 1.1
$ git checkout v1.1.1 # for release 1.1.1
$ git checkout master # for master
```

Expand All @@ -29,6 +30,7 @@ $ make riab-oai-master-stable
# for a specific version
$ make riab-oai-v1.0.0 # for release SD-RAN 1.0
$ make riab-oai-v1.1.0 # for release SD-RAN 1.1
$ make riab-oai-v1.1.1 # for release SD-RAN 1.1.1
# for a "dev" version
$ make riab-oai-dev
```
Expand Down Expand Up @@ -163,7 +165,7 @@ $ make test-kpimon
Key[PLMNID, nodeID] num(Active UEs)
{eNB-CU-Eurecom-LTEBox [0 2 16] 57344} 1
```
* `make test-kpimon-v2`: for SD-RAN release 1.1, master-stable, latest, and dev versions
* `make test-kpimon-v2`: for SD-RAN release 1.1, release 1.1.1, master-stable, latest, and dev versions
```bash
$ make test-kpimon-v2
*** Get KPIMON result through CLI ***
Expand All @@ -190,7 +192,7 @@ Key[PLMNID, nodeID] num(Active UEs)
{eNB-CU-Eurecom-LTEBox [0 2 16] 57344} 0
```

* `make detach-ue && make test-kpimon-v2`: for SD-RAN release 1.1, master-stable, latest, and dev versions; `detach-ue` detaches a UE so the number of active UEs decreases
* `make detach-ue && make test-kpimon-v2`: for SD-RAN release 1.1, release 1.1.1, master-stable, latest, and dev versions; `detach-ue` detaches a UE so the number of active UEs decreases
```bash
$ make test-kpimon-v2
*** Get KPIMON result through CLI ***
Expand All @@ -211,7 +213,7 @@ PlmnID egNB ID Cell ID Time RRC.ConnEstabAtt.sum RRC.

If we can see like the above code block, the SD-RAN cotrol plane is working fine.

NOTE 1: If we enable ONOS-KPIMON-V1 in the `sdran-in-a-box-values-<version>.yaml`, we can also use `make test-kpimon-v1` in SD-RAN release 1.1, master-stable, latest, and dev version.
NOTE 1: If we enable ONOS-KPIMON-V1 in the `sdran-in-a-box-values-<version>.yaml`, we can also use `make test-kpimon-v1` in SD-RAN release 1.1, release 1.1.1, master-stable, latest, and dev version.

NOTE 2: Currently, there is no way to reattach the detached UE. For reattachment, we should redeploy RiaB (at least ONOS RIC services, CU-CP, OAI nFAPI emulator).

Expand Down
6 changes: 4 additions & 2 deletions docs/Installation_RANSim_FBAH.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ $ git clone https://github.com/onosproject/sdran-in-a-box
$ cd /path/to/sdran-in-a-box
$ git checkout v1.0.0 # for release 1.0
$ git checkout v1.1.0 # for release 1.1
$ git checkout v1.1.1 # for release 1.1.1
$ git checkout master # for master
```

Expand All @@ -26,6 +27,7 @@ $ make-fbah # or make riab-fbah-latest
$ make riab-fbah-master-stable
# for a specific version
$ make riab-fbah-v1.1.0 # for release SD-RAN 1.1
$ make riab-fbah-v1.1.1 # for release SD-RAN 1.1.1
# for a "dev" version
$ make riab-fbah-dev
```
Expand Down Expand Up @@ -112,7 +114,7 @@ In order to check whether everything is running, we should conduct some E2E test
Since RAN-Sim does only generate SD-RAN control messages, we can run E2E tests on the SD-RAN control plane.

### The E2E test on SD-RAN control plane
* `make test-kpimon-v2`: for SD-RAN release 1.1, master-stable, latest, and dev versions
* `make test-kpimon-v2`: for SD-RAN release 1.1, release 1.1.1, master-stable, latest, and dev versions
```bash
$ make test-kpimon-v2
*** Get KPIMON result through CLI ***
Expand All @@ -125,7 +127,7 @@ PlmnID egNB ID Cell ID Time RRC.Conn.Avg RRC.Conn.Max
1279014 5154 343332707639811 23:25:28.0 5 5 0 0 0 0 0 0
```

* Use Facebook-AirHop GUI page: for SD-RAN release 1.1, master-stable, latest, and dev versions
* Use Facebook-AirHop GUI page: for SD-RAN release 1.1, release 1.1.1, master-stable, latest, and dev versions

To access GUI, we should open web browser like [Chrome](https://www.google.com/chrome/) or [Safari](https://www.apple.com/safari/).
Next, go to `http://<RiaB server IP address>:30095`
Expand Down
6 changes: 4 additions & 2 deletions docs/Installation_RANSim_PCI.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ $ git clone https://github.com/onosproject/sdran-in-a-box
$ cd /path/to/sdran-in-a-box
$ git checkout v1.0.0 # for release 1.0
$ git checkout v1.1.0 # for release 1.1
$ git checkout v1.1.1 # for release 1.1.1
$ git checkout master # for master
```

Expand All @@ -28,6 +29,7 @@ $ make riab-ransim-master-stable
# for a specific version
$ make riab-ransim-v1.0.0 # for release SD-RAN 1.0
$ make riab-ransim-v1.1.0 # for release SD-RAN 1.1
$ make riab-ransim-v1.1.1 # for release SD-RAN 1.1.1
# for a "dev" version
$ make riab-ransim-dev
```
Expand Down Expand Up @@ -121,7 +123,7 @@ Key[PLMNID, nodeID] num(Active UEs)
{eNB-CU-Eurecom-LTEBox [0 2 16] 5154} 1
```

* `make test-kpimon-v2`: for SD-RAN release 1.1, master-stable, latest, and dev versions
* `make test-kpimon-v2`: for SD-RAN release 1.1, release 1.1.1, master-stable, latest, and dev versions
```bash
$ make test-kpimon-v2
*** Get KPIMON result through CLI ***
Expand All @@ -134,7 +136,7 @@ PlmnID egNB ID Cell ID Time RRC.Conn.Avg RRC.Conn.Max
1279014 5154 343332707639811 23:25:28.0 5 5 0 0 0 0 0 0
```

* `make test-pci`: for SD-RAN release 1.1, master-stable, latest, and dev versions
* `make test-pci`: for SD-RAN release 1.1, release 1.1.1, master-stable, latest, and dev versions
```bash
$ make test-pci
*** Get PCI result through CLI ***
Expand Down
Loading

0 comments on commit df2dc7a

Please sign in to comment.