Skip to content

Commit

Permalink
Add ver 1.1.1-rev3 (#70)
Browse files Browse the repository at this point in the history 
* Add ver 1.1.1-rev3

* Change 1.1.1-rev3 cid
  • Loading branch information
@woojoong88
woojoong88 authored May 14, 2021
1 parent 1983db5 commit 2b2cdd8
Show file tree
Hide file tree
Showing 5 changed files with 438 additions and 1 deletion.
5 changes: 5 additions & 0 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ else ifeq ($(VER), v1.1.1)
$(eval HELM_VALUES=$(HELM_VALUES_V1.1.1))
@echo "Helm values.yaml file: $(HELM_VALUES_V1.1.1)"
@cd $(SDRANCHARTDIR); git checkout $(SDRANCHARTCID-V1.1.1)
else ifeq ($(VER), v1.1.1-rev3)
$(eval VER=v1.1.1-rev3)
$(eval HELM_VALUES=$(HELM_VALUES_V1.1.1-REV3))
@echo "Helm values.yaml file: $(HELM_VALUES_V1.1.1-REV3)"
@cd $(SDRANCHARTDIR); git checkout $(SDRANCHARTCID-V1.1.1-REV3)
else ifeq ($(VER), stable)
$(eval VER=stable)
$(eval HELM_VALUES=$(HELM_VALUES_STABLE))
Expand Down
2 changes: 2 additions & 0 deletions MakefileVar.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ 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
SDRANCHARTCID-V1.1.1-REV3 ?= sd-ran-1.1.4-rev3

# Helm arguments
DEFAULT_HELM_ARGS := --set import.ran-simulator.enabled=true --set import.onos-pci.enabled=true
Expand All @@ -35,6 +36,7 @@ HELM_VALUES ?= $(DEFAULT_HELM_VALUES)
HELM_VALUES_V1.0.0 ?= $(RIABDIR)/sdran-in-a-box-values-v1.0.0.yaml
HELM_VALUES_V1.1.0 ?= $(RIABDIR)/sdran-in-a-box-values-v1.1.0.yaml
HELM_VALUES_V1.1.1 ?= $(RIABDIR)/sdran-in-a-box-values-v1.1.1.yaml
HELM_VALUES_V1.1.1-REV3 ?= $(RIABDIR)/sdran-in-a-box-values-v1.1.1-rev3.yaml
HELM_VALUES_STABLE ?= $(RIABDIR)/sdran-in-a-box-values-master-stable.yaml
HELM_VALUES_LATEST ?= $(RIABDIR)/sdran-in-a-box-values.yaml
HELM_VALUES_DEV ?= $(RIABDIR)/sdran-in-a-box-values.yaml
Expand Down
215 changes: 215 additions & 0 deletions configs/chart_values/onf-server-1-riab-values-v1.1.1-rev3.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.17
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.28
onos-kpimon-v1:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-kpimon
tag: v0.1.9
onos-kpimon-v2:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-kpimon
tag: v0.1.9
onos-pci:
image:
pullPolicy: IfNotPresent
repository: onosproject/onos-pci
tag: v0.1.4
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
2 changes: 1 addition & 1 deletion mk/ric.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $(M)/ric: | version $(M)/helm-ready $(M)/atomix $(M)/onos-operator
kubectl get po -n kube-system | grep config-operator | grep -v Terminating || kubectl create -f https://raw.githubusercontent.com/onosproject/onos-operator/v0.4.0/deploy/onos-operator.yaml
@until [ $$(kubectl get po -n kube-system | grep -e config-operator -e topo-operator | grep 1/1 | wc -l) == 2 ]; do sleep 1; done
kubectl get namespace $(RIAB_NAMESPACE) 2> /dev/null || kubectl create namespace $(RIAB_NAMESPACE)
cd $(SDRANCHARTDIR)/sd-ran; helm dep update
cd $(SDRANCHARTDIR)/sd-ran; rm -rf charts Chart.lock tmpcharts; helm dep update
helm upgrade --install $(HELM_ARGS) \
--namespace $(RIAB_NAMESPACE) \
--values $(HELM_VALUES) \
Expand Down
Loading

0 comments on commit 2b2cdd8

Please sign in to comment.