Skip to content
Snippets Groups Projects
Commit 6b9d7878 authored by Sagar Arora's avatar Sagar Arora :bicyclist_tone1:
Browse files

[docs] fixing tutorials and docker-compose 

- Fixing the tutorials for release v1.4.0
parent 5fa65e1a
Branches vpp-tutorial-fix
No related tags found
1 merge request!57Release v1.4.0
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 879 additions and 285 deletions
charts/oai-5g-core/oai-amf/templates/deployment.yaml
+ 10
− 8
View file @ 6b9d7878
...@@ -31,11 +31,12 @@ spec: ...@@ -31,11 +31,12 @@ spec:
{{ toYaml .Values.imagePullSecrets | indent 8 }} {{ toYaml .Values.imagePullSecrets | indent 8 }}
{{- end }} {{- end }}
containers: containers:
{{- if .Values.keepTcpContainer }}
- name: tcpdump - name: tcpdump
image: "{{ .Values.tcpdumpimage.repository }}:{{ .Values.tcpdumpimage.version }}" image: "{{ .Values.tcpdumpimage.imageOS.tag }}:{{ .Values.tcpdumpimage.imageOS.tag }}"
imagePullPolicy: {{ .Values.tcpdumpimage.pullPolicy }} imagePullPolicy: {{ .Values.tcpdumpimage.pullPolicy }}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- toYaml .Values.securityContext.tcpdump | nindent 12 }}
{{- if .Values.start.tcpdump}} {{- if .Values.start.tcpdump}}
command: command:
- /bin/sh - /bin/sh
...@@ -49,11 +50,12 @@ spec: ...@@ -49,11 +50,12 @@ spec:
{{- if .Values.persistent.sharedvolume}} {{- if .Values.persistent.sharedvolume}}
volumeMounts: volumeMounts:
- mountPath: "/pcap" - mountPath: "/pcap"
name: cn5g-pv name: {{ .Values.persistent.volumeName}}
{{- end}} {{- end}}
{{- end }}
- name: amf - name: amf
image: "{{ .Values.nfimage.repository }}:{{ .Values.nfimage.version }}" image: "{{ .Values.nfimage.imageOS.tag }}:{{ .Values.nfimage.imageOS.tag }}"
imagePullPolicy: {{ .Values.nfimage.pullPolicy }} imagePullPolicy: {{ .Values.nfimage.imageOS.pullPolicy }}
{{- if .Values.resources.define}} {{- if .Values.resources.define}}
resources: resources:
requests: requests:
...@@ -96,7 +98,7 @@ spec: ...@@ -96,7 +98,7 @@ spec:
- containerPort: {{ .Values.servicehttp.http2Port }} - containerPort: {{ .Values.servicehttp.http2Port }}
name: http2 name: http2
protocol: TCP protocol: TCP
{{- if .Values.start.amf}} {{- if .Values.start.nf}}
{{- else}} {{- else}}
command: command:
- /bin/sleep - /bin/sleep
...@@ -385,9 +387,9 @@ spec: ...@@ -385,9 +387,9 @@ spec:
key: operatorKey key: operatorKey
volumes: volumes:
{{- if .Values.persistent.sharedvolume}} {{- if .Values.persistent.sharedvolume}}
- name: cn5g-pv - name: {{ .Values.persistent.volumeName}}
persistentVolumeClaim: persistentVolumeClaim:
claimName: cn5g-pvc claimName: {{ .Values.persistent.volumeName}}
{{- end }} {{- end }}
- name: scripts - name: scripts
configMap: configMap:
......
charts/oai-5g-core/oai-amf/templates/rbac.yaml
+ 30
− 0
View file @ 6b9d7878
--- ---
{{- if or (eq .Values.securityContext.nf.privileged true) (eq .Values.keepTcpContainer true) }}
apiVersion: rbac.authorization.k8s.io/v1 apiVersion: rbac.authorization.k8s.io/v1
kind: Role kind: Role
metadata: metadata:
...@@ -25,3 +26,32 @@ roleRef: ...@@ -25,3 +26,32 @@ roleRef:
kind: Role kind: Role
name: {{ .Chart.Name }}-{{ .Release.Namespace }}-role name: {{ .Chart.Name }}-{{ .Release.Namespace }}-role
apiGroup: rbac.authorization.k8s.io apiGroup: rbac.authorization.k8s.io
{{ else }}
---
apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
name: {{ .Chart.Name }}-{{ .Release.Namespace }}-role
rules:
- apiGroups:
- security.openshift.io
resourceNames:
- anyuid
resources:
- securitycontextconstraints
verbs:
- use
---
apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
name: {{ .Chart.Name }}-{{ .Release.Namespace }}-binding
subjects:
- kind: ServiceAccount
name: {{ .Values.serviceAccount.name }}
namespace: {{ .Release.Namespace }}
roleRef:
kind: Role
name: {{ .Chart.Name }}-{{ .Release.Namespace }}-role
apiGroup: rbac.authorization.k8s.io
{{- end }}
\ No newline at end of file
charts/oai-5g-core/oai-amf/values.yaml
+ 43
− 23
View file @ 6b9d7878
# This is a YAML-formatted file. # This is a YAML-formatted file.
# Declare variables to be passed into your templates. # Declare variables to be passed into your templates.
replicaCount: 1 replicaCount: 1 # can't be changed
imageOS: ubuntu # only ubi (Openshift) and ubuntu (Ubuntu based worker nodes in Kubernetes)
# this variable takes care of adding dependency between this nf and other nfs, so that the core network can be deployed properly
handleDependencies: true
nfimage: # image name either locally present or in a public/private repository nfimage: # image name either locally present or in a public/private repository
registry: local ubuntu:
repository: docker.io/oaisoftwarealliance/oai-amf ## The image will be pulled from dockerhub repository: docker.io/oaisoftwarealliance/oai-amf ## The image will be pulled from dockerhub
version: develop ## The branch to be used to pull from dockerhub tag: develop ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always # pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
ubi:
repository: oai-amf ## The image will be pulled from dockerhub
tag: develop ## The branch to be used to pull from dockerhub
# pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
tcpdumpimage: tcpdumpimage:
registry: local ubuntu:
repository: docker.io/corfr/tcpdump repository: docker.io/corfr/tcpdump
version: latest tag: latest
#pullPolicy: IfNotPresent or Never or Always #pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
ubi:
## good to use when pulling images from docker-hub mention repository: network-tools-rhel8
imagePullSecrets: tag: latest
- name: "regcred" #pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent
## good to use when pulling images from docker-hub, the same pull secrets will be used to pull both the images, if you have multiple secrets mention all of them.
# imagePullSecrets:
# - name: "regcred"
serviceAccount: serviceAccount:
# Specifies whether a service account should be created # Specifies whether a service account should be created
...@@ -37,7 +52,10 @@ podSecurityContext: ...@@ -37,7 +52,10 @@ podSecurityContext:
## OPENSHIFT terminology ## OPENSHIFT terminology
securityContext: securityContext:
privileged: true nf:
privileged: false
tcpdump:
privileged: true #Always be true for capturing on a interface
servicehttp: servicehttp:
type: ClusterIP type: ClusterIP
...@@ -48,9 +66,13 @@ servicesctp: ...@@ -48,9 +66,13 @@ servicesctp:
type: ClusterIP #LoadBalancer type: ClusterIP #LoadBalancer
sctpPort: 38412 sctpPort: 38412
# If you will turn turn this to false TCPdump container will not run
keepTcpContainer: false
# Turning it to false will make the nf and tcpdump container to go in sleep mode and you can run any command for debugging
start: start:
amf: true nf: true
tcpdump: false # WARNING: start tcpdump collection to analyse but beware it will take a lot of space in the container/persistent volume tcpdump: false # WARNING: start tcpdump collection to analyse but beware it will take a lot of space in the container/persistent volume
# AMF needs two seperate interface one for http and other one for SCTP (N1/N2) to communicate with gNB. # AMF needs two seperate interface one for http and other one for SCTP (N1/N2) to communicate with gNB.
# But for experimentation only one interface can be used. # But for experimentation only one interface can be used.
...@@ -59,13 +81,12 @@ start: ...@@ -59,13 +81,12 @@ start:
# 2. Your gnB is outside the cluster and the host machine can communicate but pods can not then you can provide ip-address in the same range as your host machine # 2. Your gnB is outside the cluster and the host machine can communicate but pods can not then you can provide ip-address in the same range as your host machine
# 3. You want static ip-address for N1/N2 interface, Namf can be discovered by its service name # 3. You want static ip-address for N1/N2 interface, Namf can be discovered by its service name
multus: multus:
create: false create: false
n1IPadd: "172.21.10.6" n1IPadd: "172.21.10.6"
n1Netmask: "22" n1Netmask: "22"
n1Gateway: "172.21.11.254" n1Gateway: "172.21.11.254"
hostInterface: "ens2f0np0" # Interface of the host machine on which this pod will be scheduled hostInterface: "bond0" # Interface of the host machine on which this pod will be scheduled
config: config:
instance: "0" instance: "0"
...@@ -126,11 +147,10 @@ config: ...@@ -126,11 +147,10 @@ config:
mySqlPass: "linux" # OPTIONAL: used only if not using AUSF mySqlPass: "linux" # OPTIONAL: used only if not using AUSF
mySqlDb: "oai_db" # OPTIONAL: used only if not using AUSF mySqlDb: "oai_db" # OPTIONAL: used only if not using AUSF
# Currently this presistent volume is only used for storing the tcpdump of network functions at one common place.
persistent: persistent:
sharedvolume: false sharedvolume: false
volumneName: managed-nfs-storage volumeName: cn5g-pv
size: 1Gi
resources: resources:
define: false define: false
......
charts/simulators/gnbsim/values.yaml
+ 2
− 2
View file @ 6b9d7878
...@@ -7,14 +7,14 @@ replicaCount: 1 ...@@ -7,14 +7,14 @@ replicaCount: 1
# NF image # NF image
nfimage: nfimage:
registry: local registry: local
repository: rohankharade/gnbsim repository: docker.io/rohankharade/gnbsim
version: develop version: develop
# pullPolicy: IfNotPresent or Never or Always # pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
tcpdumpimage: tcpdumpimage:
registry: local registry: local
repository: corfr/tcpdump repository: docker.io/corfr/tcpdump
version: latest version: latest
# pullPolicy: IfNotPresent or Never or Always # pullPolicy: IfNotPresent or Never or Always
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
......
docker-compose/core-network.py
+ 3
− 21
View file @ 6b9d7878
...@@ -54,8 +54,8 @@ def _parse_args() -> argparse.Namespace: ...@@ -54,8 +54,8 @@ def _parse_args() -> argparse.Namespace:
python3 core-network.py --type start-basic python3 core-network.py --type start-basic
python3 core-network.py --type start-basic-vpp python3 core-network.py --type start-basic-vpp
python3 core-network.py --type stop-mini python3 core-network.py --type stop-mini
python3 core-network.py --type start-mini --fqdn no --scenario 1 python3 core-network.py --type start-mini --scenario 2
python3 core-network.py --type start-basic --fqdn no --scenario 1''' python3 core-network.py --type start-basic --scenario 2'''
parser = argparse.ArgumentParser(description='OAI 5G CORE NETWORK DEPLOY', parser = argparse.ArgumentParser(description='OAI 5G CORE NETWORK DEPLOY',
epilog=example_text, epilog=example_text,
...@@ -69,14 +69,6 @@ def _parse_args() -> argparse.Namespace: ...@@ -69,14 +69,6 @@ def _parse_args() -> argparse.Namespace:
choices=['start-mini', 'start-basic', 'start-basic-vpp', 'stop-mini', 'stop-basic', 'stop-basic-vpp'], choices=['start-mini', 'start-basic', 'start-basic-vpp', 'stop-mini', 'stop-basic', 'stop-basic-vpp'],
help='Functional type of 5g core network ("start-mini"|"start-basic"|"start-basic-vpp"|"stop-mini"|"stop-basic"|"stop-basic-vpp")', help='Functional type of 5g core network ("start-mini"|"start-basic"|"start-basic-vpp"|"stop-mini"|"stop-basic"|"stop-basic-vpp")',
) )
# Deployment scenario with FQDN/IP based
parser.add_argument(
'--fqdn', '-fq',
action='store',
choices=['yes', 'no'],
default='yes',
help='Deployment scenario with FQDN ("yes"|"no")',
)
# Deployment scenario with NRF/ without NRF # Deployment scenario with NRF/ without NRF
parser.add_argument( parser.add_argument(
'--scenario', '-s', '--scenario', '-s',
...@@ -99,13 +91,6 @@ def deploy(file_name, ct, extra_interface=False): ...@@ -99,13 +91,6 @@ def deploy(file_name, ct, extra_interface=False):
Returns: Returns:
None None
""" """
# Before deploy adapting with fqdn/ip
if args.fqdn == 'no':
subprocess.run(f'sed -i -e "s#USE_FQDN_DNS=yes#USE_FQDN_DNS=no#g" {file_name}', shell=True)
subprocess.run(f'sed -i -e "s#USE_FQDN_NRF=yes#USE_FQDN_NRF=no#g" {file_name}', shell=True)
elif args.fqdn == 'yes':
subprocess.run(f'sed -i -e "s#USE_FQDN_DNS=no#USE_FQDN_DNS=yes#g" {file_name}', shell=True)
subprocess.run(f'sed -i -e "s#USE_FQDN_NRF=no#USE_FQDN_NRF=yes#g" {file_name}', shell=True)
logging.debug('\033[0;34m Starting 5gcn components... Please wait\033[0m....') logging.debug('\033[0;34m Starting 5gcn components... Please wait\033[0m....')
if args.capture is None: if args.capture is None:
...@@ -174,7 +159,7 @@ def undeploy(file_name): ...@@ -174,7 +159,7 @@ def undeploy(file_name):
None None
""" """
logging.debug('\033[0;34m UnDeploying OAI 5G core components\033[0m....') logging.debug('\033[0;34m UnDeploying OAI 5G core components\033[0m....')
cmd = f'docker-compose -f {file_name} down' cmd = f'docker-compose -f {file_name} down -t 0'
res = run_cmd(cmd, False) res = run_cmd(cmd, False)
if res is None: if res is None:
exit(f'\033[0;31m Incorrect/Unsupported executing command {cmd}') exit(f'\033[0;31m Incorrect/Unsupported executing command {cmd}')
...@@ -339,9 +324,6 @@ if __name__ == '__main__': ...@@ -339,9 +324,6 @@ if __name__ == '__main__':
elif args.scenario == '2': elif args.scenario == '2':
deploy(BASIC_NO_NRF, 7) deploy(BASIC_NO_NRF, 7)
elif args.type == 'start-basic-vpp': elif args.type == 'start-basic-vpp':
if args.fqdn == 'yes':
logging.error('Configuration not supported yet')
exit(-1)
# Basic function with NRF and VPP-UPF # Basic function with NRF and VPP-UPF
if args.scenario == '1': if args.scenario == '1':
deploy(BASIC_VPP_W_NRF, 8, True) deploy(BASIC_VPP_W_NRF, 8, True)
......
docker-compose/oai_db1.sql → docker-compose/database/oai_db1.sql
+ 0
− 0
View file @ 6b9d7878
File moved
docker-compose/docker-compose-basic-nonrf.yaml
+ 90
− 42
View file @ 6b9d7878
...@@ -4,8 +4,8 @@ services: ...@@ -4,8 +4,8 @@ services:
container_name: "mysql" container_name: "mysql"
image: mysql:5.7 image: mysql:5.7
volumes: volumes:
- ./oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./database/oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh - ./healthscripts/mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- MYSQL_DATABASE=oai_db - MYSQL_DATABASE=oai_db
...@@ -21,36 +21,41 @@ services: ...@@ -21,36 +21,41 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: oai-udr container_name: "oai-udr"
image: oai-udr:latest image: oai-udr:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
- UDR_NAME=OAI_UDR
- UDR_INTERFACE_NAME_FOR_NUDR=eth0 - UDR_INTERFACE_NAME_FOR_NUDR=eth0
- UDR_INTERFACE_PORT_FOR_NUDR=80 - UDR_INTERFACE_PORT_FOR_NUDR=80
- UDR_INTERFACE_HTTP2_PORT_FOR_NUDR=8080 - UDR_INTERFACE_HTTP2_PORT_FOR_NUDR=8080
- USE_HTTP2=no
- UDR_API_VERSION=v1 - UDR_API_VERSION=v1
- MYSQL_IPV4_ADDRESS=192.168.70.131 - MYSQL_IPV4_ADDRESS=192.168.70.131
- MYSQL_USER=test - MYSQL_USER=test
- MYSQL_PASS=test - MYSQL_PASS=test
- DB_CONNECTION_TIMEOUT=300 # Reset the connection to the DB after expiring the timeout (in second) currently can't be changed
- MYSQL_DB=oai_db - MYSQL_DB=oai_db
- WAIT_MYSQL=120 - WAIT_MYSQL=120
- USE_FQDN_DNS=yes
- REGISTER_NRF=no
depends_on: depends_on:
- mysql - mysql
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.136 ipv4_address: 192.168.70.136
volumes: volumes:
- ./udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh - ./healthscripts/udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh" test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh"
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-udm: oai-udm:
container_name: oai-udm container_name: "oai-udm"
image: oai-udm:latest image: oai-udm:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -58,27 +63,30 @@ services: ...@@ -58,27 +63,30 @@ services:
- UDM_NAME=OAI_UDM - UDM_NAME=OAI_UDM
- SBI_IF_NAME=eth0 - SBI_IF_NAME=eth0
- SBI_PORT=80 - SBI_PORT=80
- SBI_HTTP2_PORT=8080
- USE_HTTP2
- UDM_VERSION_NB=v1 - UDM_VERSION_NB=v1
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- UDR_IP_ADDRESS=192.168.70.136 - UDR_IP_ADDRESS=192.168.70.136
- UDR_PORT=80 - UDR_PORT=80
- UDR_VERSION_NB=v1 - UDR_VERSION_NB=v1
- UDR_FQDN=oai-udr - UDR_FQDN=oai-udr
- REGISTER_NRF=no
depends_on: depends_on:
- oai-udr - oai-udr
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.137 ipv4_address: 192.168.70.137
volumes: volumes:
- ./udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh - ./healthscripts/udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh" test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh"
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
oai-ausf: oai-ausf:
container_name: oai-ausf container_name: "oai-ausf"
image: oai-ausf:latest image: oai-ausf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE_ID=0 - INSTANCE_ID=0
...@@ -86,18 +94,21 @@ services: ...@@ -86,18 +94,21 @@ services:
- AUSF_NAME=OAI_AUSF - AUSF_NAME=OAI_AUSF
- SBI_IF_NAME=eth0 - SBI_IF_NAME=eth0
- SBI_PORT=80 - SBI_PORT=80
- USE_HTTP2=no
- SBI_HTTP2_PORT=8080
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- UDM_IP_ADDRESS=192.168.70.137 - UDM_IP_ADDRESS=192.168.70.137
- UDM_PORT=80 - UDM_PORT=80
- UDM_VERSION_NB=v1 - UDM_VERSION_NB=v1
- UDM_FQDN=oai-udm - UDM_FQDN=oai-udm
- REGISTER_NRF=no
depends_on: depends_on:
- oai-udm - oai-udm
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.138 ipv4_address: 192.168.70.138
volumes: volumes:
- ./ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh - ./healthscripts/ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh" test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -105,7 +116,7 @@ services: ...@@ -105,7 +116,7 @@ services:
retries: 5 retries: 5
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oai-amf:latest image: oai-amf:v1.4.0
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
...@@ -125,10 +136,12 @@ services: ...@@ -125,10 +136,12 @@ services:
- PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MCC=208
- PLMN_SUPPORT_MNC=95 - PLMN_SUPPORT_MNC=95
- PLMN_SUPPORT_TAC=0xa000 - PLMN_SUPPORT_TAC=0xa000
- SST_0=222 - SST_0=1
- SD_0=123 - SD_0=0xFFFFFF
- SST_1=1 - SST_1=1
- SD_1=12 - SD_1=1
- SST_2=222
- SD_2=123
- AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_NGAP=eth0
- AMF_INTERFACE_NAME_FOR_N11=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0
- SMF_INSTANCE_ID_0=1 - SMF_INSTANCE_ID_0=1
...@@ -146,15 +159,18 @@ services: ...@@ -146,15 +159,18 @@ services:
- MYSQL_PASS=linux - MYSQL_PASS=linux
- MYSQL_DB=oai_db - MYSQL_DB=oai_db
- OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d - OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d
- NRF_IPV4_ADDRESS=0.0.0.0
- NRF_PORT=80
- EXTERNAL_NRF=no - EXTERNAL_NRF=no
- NF_REGISTRATION=no - NF_REGISTRATION=no
- SMF_SELECTION=no - SMF_SELECTION=no
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- EXTERNAL_AUSF=yes - EXTERNAL_AUSF=yes
- NRF_API_VERSION=v1 - EXTERNAL_UDM=no
- NRF_FQDN=oai-nrf - EXTERNAL_NSSF=no
- USE_HTTP2=no
- NRF_IPV4_ADDRESS=0.0.0.0 # not used in this scenario, can't remove
- NRF_PORT=80 # not used in this scenario, can't remove
- NRF_API_VERSION=v1 # not used in this scenario, can't remove
- NRF_FQDN=localhost # not used in this scenario, can't remove
- AUSF_IPV4_ADDRESS=192.168.70.138 - AUSF_IPV4_ADDRESS=192.168.70.138
- AUSF_PORT=80 - AUSF_PORT=80
- AUSF_API_VERSION=v1 - AUSF_API_VERSION=v1
...@@ -162,12 +178,12 @@ services: ...@@ -162,12 +178,12 @@ services:
- UDM_IPV4_ADDRESS=192.168.70.137 - UDM_IPV4_ADDRESS=192.168.70.137
- UDM_PORT=80 - UDM_PORT=80
- UDM_API_VERSION=v2 - UDM_API_VERSION=v2
- UDM_FQDN=oai-udm - UDM_FQDN=oai-udm
depends_on: depends_on:
- mysql - mysql
- oai-ausf - oai-ausf
volumes: volumes:
- ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - ./healthscripts/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -178,7 +194,7 @@ services: ...@@ -178,7 +194,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai-smf: oai-smf:
container_name: "oai-smf" container_name: "oai-smf"
image: oai-smf:latest image: oai-smf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -200,21 +216,47 @@ services: ...@@ -200,21 +216,47 @@ services:
- UDM_FQDN=oai-udm - UDM_FQDN=oai-udm
- UPF_IPV4_ADDRESS=192.168.70.134 - UPF_IPV4_ADDRESS=192.168.70.134
- UPF_FQDN_0=oai-spgwu - UPF_FQDN_0=oai-spgwu
- NRF_IPV4_ADDRESS=0.0.0.0 - NRF_IPV4_ADDRESS=0.0.0.0 # not used in this scenario, can't remove
- NRF_PORT=80 - NRF_PORT=80 # not used in this scenario, can't remove
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1 # not used in this scenario, can't remove
- USE_LOCAL_SUBSCRIPTION_INFO=yes - NRF_FQDN=localhost # not used in this scenario, can't remove
- NRF_FQDN=oai-nrf - USE_LOCAL_SUBSCRIPTION_INFO=no #Set to yes if SMF uses local subscription information instead of from an UDM
- USE_NETWORK_INSTANCE=no #Set yes if network instance is to be used for given UPF
- REGISTER_NRF=no - REGISTER_NRF=no
- DISCOVER_UPF=no - DISCOVER_UPF=no
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- DNN_RANGE1=12.1.1.2 - 12.1.1.128 - HTTP_VERSION=1 # Default: 1
- DNN_RANGE0=12.2.1.2 - 12.2.1.128 - UE_MTU=1500
- DNN_NI1=default - DNN_NI0=oai
- TYPE0=IPv4
- DNN_RANGE0=12.1.1.2 - 12.1.1.100
- NSSAI_SST0=1
- NSSAI_SD0=0xFFFFFF
- SESSION_AMBR_UL0=200Mbps
- SESSION_AMBR_DL0=400Mbps
- DNN_NI1=oai.ipv4
- TYPE1=IPv4
- DNN_RANGE1=12.1.1.101 - 12.1.1.200
- NSSAI_SST1=1
- NSSAI_SD1=1
- SESSION_AMBR_UL1=100Mbps
- SESSION_AMBR_DL1=200Mbps
- DNN_NI2=default
- TYPE2=IPv4
- DNN_RANGE2=12.1.1.201 - 12.1.1.253
- NSSAI_SST2=222
- NSSAI_SD2=123
- SESSION_AMBR_UL2=50Mbps
- SESSION_AMBR_DL2=100Mbps
- DNN_NI3=ims
- TYPE3=IPv4v6
- DNN_RANGE3=14.1.1.2 - 14.1.1.253
- DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 # only needed when ims is being used
- ENABLE_USAGE_REPORTING=no # Set yes if UE USAGE REPORTING is to be done at UPF
depends_on: depends_on:
- oai-amf - oai-amf
volumes: volumes:
- ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -225,7 +267,7 @@ services: ...@@ -225,7 +267,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-spgwu: oai-spgwu:
container_name: "oai-spgwu" container_name: "oai-spgwu"
image: oai-spgwu-tiny:latest image: oai-spgwu-tiny:v1.3.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
...@@ -246,13 +288,19 @@ services: ...@@ -246,13 +288,19 @@ services:
- REGISTER_NRF=no - REGISTER_NRF=no
- USE_FQDN_NRF=yes - USE_FQDN_NRF=yes
- UPF_FQDN_5G=oai-spgwu - UPF_FQDN_5G=oai-spgwu
- NRF_IPV4_ADDRESS=0.0.0.0 - NRF_IPV4_ADDRESS=0.0.0.0 # not used in this scenario, can't remove
- NRF_PORT=80 - NRF_PORT=80 # not used in this scenario, can't remove
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1 # not used in this scenario, can't remove
- NRF_FQDN=oai-nrf - NRF_FQDN=localhost # not used in this scenario, can't remove
- NSSAI_SST_0=222 - NSSAI_SST_0=1
- NSSAI_SD_0=123 - NSSAI_SD_0=0xFFFFFF
- DNN_0=default - DNN_0=oai
- NSSAI_SST_1=1
- NSSAI_SD_1=1
- DNN_1=oai.ipv4
- NSSAI_SST_2=222
- NSSAI_SD_2=123
- DNN_2=default
depends_on: depends_on:
- oai-smf - oai-smf
cap_add: cap_add:
...@@ -262,7 +310,7 @@ services: ...@@ -262,7 +310,7 @@ services:
- ALL - ALL
privileged: true privileged: true
volumes: volumes:
- ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - ./healthscripts/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
interval: 10s interval: 10s
...@@ -271,10 +319,10 @@ services: ...@@ -271,10 +319,10 @@ services:
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.134 ipv4_address: 192.168.70.134
oai-ext-dn: oai-traffic-gen:
image: trf-gen-cn5g:latest image: trf-gen-cn5g:latest
privileged: true privileged: true
container_name: oai-ext-dn container_name: oai-traffic-gen
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity" "ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity"
depends_on: depends_on:
......
docker-compose/docker-compose-basic-nrf.yaml
+ 74
− 31
View file @ 6b9d7878
...@@ -4,8 +4,8 @@ services: ...@@ -4,8 +4,8 @@ services:
container_name: "mysql" container_name: "mysql"
image: mysql:5.7 image: mysql:5.7
volumes: volumes:
- ./oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./database/oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh - ./healthscripts/mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- MYSQL_DATABASE=oai_db - MYSQL_DATABASE=oai_db
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oai-udr:latest image: oai-udr:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -31,10 +31,12 @@ services: ...@@ -31,10 +31,12 @@ services:
- UDR_INTERFACE_NAME_FOR_NUDR=eth0 - UDR_INTERFACE_NAME_FOR_NUDR=eth0
- UDR_INTERFACE_PORT_FOR_NUDR=80 - UDR_INTERFACE_PORT_FOR_NUDR=80
- UDR_INTERFACE_HTTP2_PORT_FOR_NUDR=8080 - UDR_INTERFACE_HTTP2_PORT_FOR_NUDR=8080
- USE_HTTP2=no
- UDR_API_VERSION=v1 - UDR_API_VERSION=v1
- MYSQL_IPV4_ADDRESS=192.168.70.131 - MYSQL_IPV4_ADDRESS=192.168.70.131
- MYSQL_USER=test - MYSQL_USER=test
- MYSQL_PASS=test - MYSQL_PASS=test
- DB_CONNECTION_TIMEOUT=300 # Reset the connection to the DB after expiring the timeout (in second) currently can't be changed
- MYSQL_DB=oai_db - MYSQL_DB=oai_db
- WAIT_MYSQL=120 - WAIT_MYSQL=120
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
...@@ -50,7 +52,7 @@ services: ...@@ -50,7 +52,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.136 ipv4_address: 192.168.70.136
volumes: volumes:
- ./udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh - ./healthscripts/udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh" test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh"
interval: 10s interval: 10s
...@@ -58,7 +60,7 @@ services: ...@@ -58,7 +60,7 @@ services:
retries: 5 retries: 5
oai-udm: oai-udm:
container_name: "oai-udm" container_name: "oai-udm"
image: oai-udm:latest image: oai-udm:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -66,6 +68,8 @@ services: ...@@ -66,6 +68,8 @@ services:
- UDM_NAME=OAI_UDM - UDM_NAME=OAI_UDM
- SBI_IF_NAME=eth0 - SBI_IF_NAME=eth0
- SBI_PORT=80 - SBI_PORT=80
- SBI_HTTP2_PORT=8080
- USE_HTTP2
- UDM_VERSION_NB=v1 - UDM_VERSION_NB=v1
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- UDR_IP_ADDRESS=192.168.70.136 - UDR_IP_ADDRESS=192.168.70.136
...@@ -83,7 +87,7 @@ services: ...@@ -83,7 +87,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.137 ipv4_address: 192.168.70.137
volumes: volumes:
- ./udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh - ./healthscripts/udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh" test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh"
interval: 10s interval: 10s
...@@ -91,7 +95,7 @@ services: ...@@ -91,7 +95,7 @@ services:
retries: 5 retries: 5
oai-ausf: oai-ausf:
container_name: "oai-ausf" container_name: "oai-ausf"
image: oai-ausf:latest image: oai-ausf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE_ID=0 - INSTANCE_ID=0
...@@ -99,6 +103,8 @@ services: ...@@ -99,6 +103,8 @@ services:
- AUSF_NAME=OAI_AUSF - AUSF_NAME=OAI_AUSF
- SBI_IF_NAME=eth0 - SBI_IF_NAME=eth0
- SBI_PORT=80 - SBI_PORT=80
- USE_HTTP2
- SBI_HTTP2_PORT
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- UDM_IP_ADDRESS=192.168.70.137 - UDM_IP_ADDRESS=192.168.70.137
- UDM_PORT=80 - UDM_PORT=80
...@@ -115,7 +121,7 @@ services: ...@@ -115,7 +121,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.138 ipv4_address: 192.168.70.138
volumes: volumes:
- ./ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh - ./healthscripts/ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh" test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -123,11 +129,12 @@ services: ...@@ -123,11 +129,12 @@ services:
retries: 5 retries: 5
oai-nrf: oai-nrf:
container_name: "oai-nrf" container_name: "oai-nrf"
image: oai-nrf:latest image: oai-nrf:v1.4.0
environment: environment:
- TZ=Europe/Paris
- NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80 - NRF_INTERFACE_PORT_FOR_SBI=80
- NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090 - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=8080
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- INSTANCE=0 - INSTANCE=0
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
...@@ -135,7 +142,7 @@ services: ...@@ -135,7 +142,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.130 ipv4_address: 192.168.70.130
volumes: volumes:
- ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - ./healthscripts/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -143,7 +150,7 @@ services: ...@@ -143,7 +150,7 @@ services:
retries: 5 retries: 5
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oai-amf:latest image: oai-amf:v1.4.0
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
...@@ -163,10 +170,12 @@ services: ...@@ -163,10 +170,12 @@ services:
- PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MCC=208
- PLMN_SUPPORT_MNC=95 - PLMN_SUPPORT_MNC=95
- PLMN_SUPPORT_TAC=0xa000 - PLMN_SUPPORT_TAC=0xa000
- SST_0=222 - SST_0=1
- SD_0=123 - SD_0=0xFFFFFF
- SST_1=1 - SST_1=1
- SD_1=12 - SD_1=1
- SST_2=222
- SD_2=123
- AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_NGAP=eth0
- AMF_INTERFACE_NAME_FOR_N11=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0
- SMF_INSTANCE_ID_0=1 - SMF_INSTANCE_ID_0=1
...@@ -186,11 +195,14 @@ services: ...@@ -186,11 +195,14 @@ services:
- OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d - OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d
- NRF_IPV4_ADDRESS=192.168.70.130 - NRF_IPV4_ADDRESS=192.168.70.130
- NRF_PORT=80 - NRF_PORT=80
- EXTERNAL_NRF=yes - EXTERNAL_NRF=no
- NF_REGISTRATION=yes - NF_REGISTRATION=yes
- SMF_SELECTION=no - SMF_SELECTION=yes
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- EXTERNAL_AUSF=yes - EXTERNAL_AUSF=yes
- EXTERNAL_UDM=no
- EXTERNAL_NSSF=no
- USE_HTTP2=no
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- AUSF_IPV4_ADDRESS=192.168.70.138 - AUSF_IPV4_ADDRESS=192.168.70.138
...@@ -206,7 +218,7 @@ services: ...@@ -206,7 +218,7 @@ services:
- oai-nrf - oai-nrf
- oai-ausf - oai-ausf
volumes: volumes:
- ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - ./healthscripts/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -217,7 +229,7 @@ services: ...@@ -217,7 +229,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai-smf: oai-smf:
container_name: "oai-smf" container_name: "oai-smf"
image: oai-smf:latest image: oai-smf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -242,20 +254,45 @@ services: ...@@ -242,20 +254,45 @@ services:
- NRF_IPV4_ADDRESS=192.168.70.130 - NRF_IPV4_ADDRESS=192.168.70.130
- NRF_PORT=80 - NRF_PORT=80
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- USE_LOCAL_SUBSCRIPTION_INFO=no - USE_LOCAL_SUBSCRIPTION_INFO=no #Set to yes if SMF uses local subscription information instead of from an UDM
- USE_NETWORK_INSTANCE=no #Set yes if network instance is to be used for given UPF
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- REGISTER_NRF=yes - REGISTER_NRF=yes
- DISCOVER_UPF=yes - DISCOVER_UPF=yes
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- DNN_RANGE1=12.1.1.2 - 12.1.1.128 - HTTP_VERSION=1 # Default: 1
- DNN_RANGE0=12.2.1.2 - 12.2.1.128
- DNN_NI1=default
- UE_MTU=1500 - UE_MTU=1500
- DNN_NI0=oai
- TYPE0=IPv4
- DNN_RANGE0=12.1.1.2 - 12.1.1.100
- NSSAI_SST0=1
- NSSAI_SD0=0xFFFFFF
- SESSION_AMBR_UL0=200Mbps
- SESSION_AMBR_DL0=400Mbps
- DNN_NI1=oai.ipv4
- TYPE1=IPv4
- DNN_RANGE1=12.1.1.101 - 12.1.1.200
- NSSAI_SST1=1
- NSSAI_SD1=1
- SESSION_AMBR_UL1=100Mbps
- SESSION_AMBR_DL1=200Mbps
- DNN_NI2=default
- TYPE2=IPv4
- DNN_RANGE2=12.1.1.201 - 12.1.1.253
- NSSAI_SST2=222
- NSSAI_SD2=123
- SESSION_AMBR_UL2=50Mbps
- SESSION_AMBR_DL2=100Mbps
- DNN_NI3=ims
- TYPE3=IPv4v6
- DNN_RANGE3=14.1.1.2 - 14.1.1.253
- DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 # only needed when ims is being used
- ENABLE_USAGE_REPORTING=no # Set yes if UE USAGE REPORTING is to be done at UPF
depends_on: depends_on:
- oai-nrf - oai-nrf
- oai-amf - oai-amf
volumes: volumes:
- ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -266,7 +303,7 @@ services: ...@@ -266,7 +303,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-spgwu: oai-spgwu:
container_name: "oai-spgwu" container_name: "oai-spgwu"
image: oai-spgwu-tiny:latest image: oai-spgwu-tiny:v1.3.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
...@@ -291,9 +328,15 @@ services: ...@@ -291,9 +328,15 @@ services:
- NRF_PORT=80 - NRF_PORT=80
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- NSSAI_SST_0=222 - NSSAI_SST_0=1
- NSSAI_SD_0=123 - NSSAI_SD_0=0xFFFFFF
- DNN_0=default - DNN_0=oai
- NSSAI_SST_1=1
- NSSAI_SD_1=1
- DNN_1=oai.ipv4
- NSSAI_SST_2=222
- NSSAI_SD_2=123
- DNN_2=default
depends_on: depends_on:
- oai-nrf - oai-nrf
- oai-smf - oai-smf
...@@ -304,7 +347,7 @@ services: ...@@ -304,7 +347,7 @@ services:
- ALL - ALL
privileged: true privileged: true
volumes: volumes:
- ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - ./healthscripts/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
interval: 10s interval: 10s
...@@ -313,10 +356,10 @@ services: ...@@ -313,10 +356,10 @@ services:
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.134 ipv4_address: 192.168.70.134
oai-ext-dn: oai-traffic-gen:
image: trf-gen-cn5g:latest image: trf-gen-cn5g:latest
privileged: true privileged: true
container_name: oai-ext-dn container_name: oai-traffic-gen
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity" "ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity"
depends_on: depends_on:
......
docker-compose/docker-compose-basic-vpp-nonrf.yaml
+ 15
− 15
View file @ 6b9d7878
...@@ -4,8 +4,8 @@ services: ...@@ -4,8 +4,8 @@ services:
container_name: "mysql" container_name: "mysql"
image: mysql:5.7 image: mysql:5.7
volumes: volumes:
- ./oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./database/oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh - ./healthscripts/mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- MYSQL_DATABASE=oai_db - MYSQL_DATABASE=oai_db
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oai-udr:latest image: oai-udr:v1.4
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -42,7 +42,7 @@ services: ...@@ -42,7 +42,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.136 ipv4_address: 192.168.70.136
volumes: volumes:
- ./udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh - ./healthscripts/udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh" test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh"
interval: 10s interval: 10s
...@@ -50,7 +50,7 @@ services: ...@@ -50,7 +50,7 @@ services:
retries: 5 retries: 5
oai-udm: oai-udm:
container_name: "oai-udm" container_name: "oai-udm"
image: oai-udm:latest image: oai-udm:v1.4
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -70,7 +70,7 @@ services: ...@@ -70,7 +70,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.137 ipv4_address: 192.168.70.137
volumes: volumes:
- ./udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh - ./healthscripts/udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh" test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh"
interval: 10s interval: 10s
...@@ -78,7 +78,7 @@ services: ...@@ -78,7 +78,7 @@ services:
retries: 5 retries: 5
oai-ausf: oai-ausf:
container_name: "oai-ausf" container_name: "oai-ausf"
image: oai-ausf:latest image: oai-ausf:v1.4
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE_ID=0 - INSTANCE_ID=0
...@@ -97,7 +97,7 @@ services: ...@@ -97,7 +97,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.138 ipv4_address: 192.168.70.138
volumes: volumes:
- ./ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh - ./healthscripts/ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh" test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -105,7 +105,7 @@ services: ...@@ -105,7 +105,7 @@ services:
retries: 5 retries: 5
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oai-amf:latest image: oai-amf:v1.4
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
...@@ -169,7 +169,7 @@ services: ...@@ -169,7 +169,7 @@ services:
- oai-ext-dn - oai-ext-dn
- oai-ausf - oai-ausf
volumes: volumes:
- ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - ./healthscripts/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -180,7 +180,7 @@ services: ...@@ -180,7 +180,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai-smf: oai-smf:
container_name: "oai-smf" container_name: "oai-smf"
image: oai-smf:latest image: oai-smf:v1.4
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -219,7 +219,7 @@ services: ...@@ -219,7 +219,7 @@ services:
depends_on: depends_on:
- oai-amf - oai-amf
volumes: volumes:
- ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -229,7 +229,7 @@ services: ...@@ -229,7 +229,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
vpp-upf: vpp-upf:
image: oai-upf-vpp:latest image: oai-upf-vpp:v1.4
privileged: true privileged: true
container_name: "vpp-upf" container_name: "vpp-upf"
environment: environment:
...@@ -267,10 +267,10 @@ services: ...@@ -267,10 +267,10 @@ services:
ipv4_address: 192.168.72.134 ipv4_address: 192.168.72.134
public_net_core: public_net_core:
ipv4_address: 192.168.73.134 ipv4_address: 192.168.73.134
oai-ext-dn: oai-traffic-gen:
image: image: trf-gen-cn5g:latest image: image: trf-gen-cn5g:latest
privileged: true privileged: true
container_name: "oai-ext-dn" container_name: "oai-traffic-gen"
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.2.1.0/24 via 192.168.73.202 dev eth0; sleep infinity" "ip route add 12.2.1.0/24 via 192.168.73.202 dev eth0; sleep infinity"
......
docker-compose/docker-compose-basic-vpp-nrf.yaml
+ 10
− 10
View file @ 6b9d7878
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-udr: oai-udr:
container_name: "oai-udr" container_name: "oai-udr"
image: oai-udr:latest image: oai-udr:v1.4
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -58,7 +58,7 @@ services: ...@@ -58,7 +58,7 @@ services:
retries: 5 retries: 5
oai-udm: oai-udm:
container_name: "oai-udm" container_name: "oai-udm"
image: oai-udm:latest image: oai-udm:v1.4
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -91,7 +91,7 @@ services: ...@@ -91,7 +91,7 @@ services:
retries: 5 retries: 5
oai-ausf: oai-ausf:
container_name: "oai-ausf" container_name: "oai-ausf"
image: oai-ausf:latest image: oai-ausf:v1.4
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE_ID=0 - INSTANCE_ID=0
...@@ -123,7 +123,7 @@ services: ...@@ -123,7 +123,7 @@ services:
retries: 5 retries: 5
oai-nrf: oai-nrf:
container_name: "oai-nrf" container_name: "oai-nrf"
image: oai-nrf:latest image: oai-nrf:v1.4
environment: environment:
- NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80 - NRF_INTERFACE_PORT_FOR_SBI=80
...@@ -143,7 +143,7 @@ services: ...@@ -143,7 +143,7 @@ services:
retries: 5 retries: 5
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oai-amf:latest image: oai-amf:v1.4
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
...@@ -218,7 +218,7 @@ services: ...@@ -218,7 +218,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai-smf: oai-smf:
container_name: "oai-smf" container_name: "oai-smf"
image: oai-smf:latest image: oai-smf:v1.4
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -267,7 +267,7 @@ services: ...@@ -267,7 +267,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
vpp-upf: vpp-upf:
image: oai-upf-vpp:latest image: oai-upf-vpp:v1.4
privileged: true privileged: true
container_name: "vpp-upf" container_name: "vpp-upf"
environment: environment:
...@@ -307,10 +307,10 @@ services: ...@@ -307,10 +307,10 @@ services:
ipv4_address: 192.168.72.134 ipv4_address: 192.168.72.134
public_net_core: public_net_core:
ipv4_address: 192.168.73.134 ipv4_address: 192.168.73.134
oai-ext-dn: oai-traffic-gen:
image: trf-gen-cn5g:latest image: image: trf-gen-cn5g:latest
privileged: true privileged: true
container_name: "oai-ext-dn" container_name: "oai-traffic-gen"
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.1.1.0/24 via 192.168.73.202 dev eth0; sleep infinity" "ip route add 12.1.1.0/24 via 192.168.73.202 dev eth0; sleep infinity"
......
docker-compose/docker-compose-gnbsim.yaml
+ 1
− 0
View file @ 6b9d7878
...@@ -170,6 +170,7 @@ services: ...@@ -170,6 +170,7 @@ services:
interval: 10s interval: 10s
timeout: 5s timeout: 5s
retries: 5 retries: 5
## This version of gnbsim connects with AMF using, AMF FQDN not with AMF ip-addres (which is good for container world)
gnbsim-fqdn: gnbsim-fqdn:
container_name: gnbsim-fqdn container_name: gnbsim-fqdn
image: gnbsim:latest image: gnbsim:latest
......
docker-compose/docker-compose-mini-nonrf.yaml
+ 62
− 24
View file @ 6b9d7878
...@@ -4,8 +4,8 @@ services: ...@@ -4,8 +4,8 @@ services:
container_name: "mysql" container_name: "mysql"
image: mysql:5.7 image: mysql:5.7
volumes: volumes:
- ./oai_db1.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./database/oai_db1.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./mysql-healthcheck1.sh:/tmp/mysql-healthcheck.sh - ./healthscripts/mysql-healthcheck1.sh:/tmp/mysql-healthcheck.sh
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- MYSQL_DATABASE=oai_db - MYSQL_DATABASE=oai_db
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oai-amf:latest image: oai-amf:v1.4.0
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
...@@ -42,10 +42,12 @@ services: ...@@ -42,10 +42,12 @@ services:
- PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MCC=208
- PLMN_SUPPORT_MNC=95 - PLMN_SUPPORT_MNC=95
- PLMN_SUPPORT_TAC=0xa000 - PLMN_SUPPORT_TAC=0xa000
- SST_0=222 - SST_0=1
- SD_0=123 - SD_0=0xFFFFFF
- SST_1=1 - SST_1=1
- SD_1=12 - SD_1=1
- SST_2=222
- SD_2=123
- AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_NGAP=eth0
- AMF_INTERFACE_NAME_FOR_N11=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0
- SMF_INSTANCE_ID_0=1 - SMF_INSTANCE_ID_0=1
...@@ -70,6 +72,9 @@ services: ...@@ -70,6 +72,9 @@ services:
- SMF_SELECTION=no - SMF_SELECTION=no
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- EXTERNAL_AUSF=no - EXTERNAL_AUSF=no
- EXTERNAL_UDM=no
- EXTERNAL_NSSF=no
- USE_HTTP2=no
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- AUSF_IPV4_ADDRESS=0.0.0.0 - AUSF_IPV4_ADDRESS=0.0.0.0
...@@ -83,7 +88,7 @@ services: ...@@ -83,7 +88,7 @@ services:
depends_on: depends_on:
- mysql - mysql
volumes: volumes:
- ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - ./healthscripts/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -94,7 +99,7 @@ services: ...@@ -94,7 +99,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai-smf: oai-smf:
container_name: "oai-smf" container_name: "oai-smf"
image: oai-smf:latest image: oai-smf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -113,23 +118,50 @@ services: ...@@ -113,23 +118,50 @@ services:
- UDM_IPV4_ADDRESS=0.0.0.0 - UDM_IPV4_ADDRESS=0.0.0.0
- UDM_PORT=80 - UDM_PORT=80
- UDM_API_VERSION=v2 - UDM_API_VERSION=v2
- UDM_FQDN=oai-udm - UDM_FQDN=localhost
- UPF_IPV4_ADDRESS=192.168.70.134 - UPF_IPV4_ADDRESS=192.168.70.134
- UPF_FQDN_0=oai-spgwu - UPF_FQDN_0=oai-spgwu
- NRF_IPV4_ADDRESS=0.0.0.0 - NRF_IPV4_ADDRESS=192.168.70.130
- NRF_PORT=80 - NRF_PORT=80
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- NRF_FQDN=oai-nrf - USE_LOCAL_SUBSCRIPTION_INFO=no #Set to yes if SMF uses local subscription information instead of from an UDM
- USE_NETWORK_INSTANCE=no #Set yes if network instance is to be used for given UPF
- NRF_FQDN=localhost
- REGISTER_NRF=no - REGISTER_NRF=no
- DISCOVER_UPF=no - DISCOVER_UPF=no
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- DNN_RANGE1=12.1.1.2 - 12.1.1.128 - HTTP_VERSION=1 # Default: 1
- DNN_RANGE0=12.2.1.2 - 12.2.1.128 - UE_MTU=1500
- DNN_NI1=default - DNN_NI0=oai
- TYPE0=IPv4
- DNN_RANGE0=12.1.1.2 - 12.1.1.100
- NSSAI_SST0=1
- NSSAI_SD0=0xFFFFFF
- SESSION_AMBR_UL0=200Mbps
- SESSION_AMBR_DL0=400Mbps
- DNN_NI1=oai.ipv4
- TYPE1=IPv4
- DNN_RANGE1=12.1.1.101 - 12.1.1.200
- NSSAI_SST1=1
- NSSAI_SD1=1
- SESSION_AMBR_UL1=100Mbps
- SESSION_AMBR_DL1=200Mbps
- DNN_NI2=default
- TYPE2=IPv4
- DNN_RANGE2=12.1.1.201 - 12.1.1.253
- NSSAI_SST2=222
- NSSAI_SD2=123
- SESSION_AMBR_UL2=50Mbps
- SESSION_AMBR_DL2=100Mbps
- DNN_NI3=ims
- TYPE3=IPv4v6
- DNN_RANGE3=14.1.1.2 - 14.1.1.253
- DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 # only needed when ims is being used
- ENABLE_USAGE_REPORTING=no # Set yes if UE USAGE REPORTING is to be done at UPF
depends_on: depends_on:
- oai-amf - oai-amf
volumes: volumes:
- ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -140,7 +172,7 @@ services: ...@@ -140,7 +172,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-spgwu: oai-spgwu:
container_name: "oai-spgwu" container_name: "oai-spgwu"
image: oai-spgwu-tiny:latest image: oai-spgwu-tiny:v1.3.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
...@@ -158,16 +190,22 @@ services: ...@@ -158,16 +190,22 @@ services:
- GW_ID=1 - GW_ID=1
- REALM=openairinterface.org - REALM=openairinterface.org
- ENABLE_5G_FEATURES=yes - ENABLE_5G_FEATURES=yes
- REGISTER_NRF=no - REGISTER_NRF=yes
- USE_FQDN_NRF=yes - USE_FQDN_NRF=yes
- UPF_FQDN_5G=oai-spgwu - UPF_FQDN_5G=oai-spgwu
- NRF_IPV4_ADDRESS=0.0.0.0 - NRF_IPV4_ADDRESS=192.168.70.130
- NRF_PORT=80 - NRF_PORT=80
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- NSSAI_SST_0=222 - NSSAI_SST_0=1
- NSSAI_SD_0=123 - NSSAI_SD_0=0xFFFFFF
- DNN_0=default - DNN_0=oai
- NSSAI_SST_1=1
- NSSAI_SD_1=1
- DNN_1=oai.ipv4
- NSSAI_SST_2=222
- NSSAI_SD_2=123
- DNN_2=default
depends_on: depends_on:
- oai-smf - oai-smf
cap_add: cap_add:
...@@ -177,7 +215,7 @@ services: ...@@ -177,7 +215,7 @@ services:
- ALL - ALL
privileged: true privileged: true
volumes: volumes:
- ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - ./healthscripts/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
interval: 10s interval: 10s
...@@ -186,10 +224,10 @@ services: ...@@ -186,10 +224,10 @@ services:
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.134 ipv4_address: 192.168.70.134
oai-ext-dn: oai-traffic-gen:
image: trf-gen-cn5g:latest image: trf-gen-cn5g:latest
privileged: true privileged: true
container_name: oai-ext-dn container_name: oai-traffic-gen
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity" "ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity"
depends_on: depends_on:
......
docker-compose/docker-compose-mini-nrf.yaml
+ 63
− 26
View file @ 6b9d7878
...@@ -4,8 +4,8 @@ services: ...@@ -4,8 +4,8 @@ services:
container_name: "mysql" container_name: "mysql"
image: mysql:5.7 image: mysql:5.7
volumes: volumes:
- ./oai_db1.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./database/oai_db1.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./mysql-healthcheck1.sh:/tmp/mysql-healthcheck.sh - ./healthscripts/mysql-healthcheck1.sh:/tmp/mysql-healthcheck.sh
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- MYSQL_DATABASE=oai_db - MYSQL_DATABASE=oai_db
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-nrf: oai-nrf:
container_name: "oai-nrf" container_name: "oai-nrf"
image: oai-nrf:latest image: oai-nrf:v1.4.0
environment: environment:
- NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80 - NRF_INTERFACE_PORT_FOR_SBI=80
...@@ -34,7 +34,7 @@ services: ...@@ -34,7 +34,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.130 ipv4_address: 192.168.70.130
volumes: volumes:
- ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - ./healthscripts/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -42,7 +42,7 @@ services: ...@@ -42,7 +42,7 @@ services:
retries: 5 retries: 5
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oai-amf:latest image: oai-amf:v1.4.0
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
...@@ -62,10 +62,12 @@ services: ...@@ -62,10 +62,12 @@ services:
- PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MCC=208
- PLMN_SUPPORT_MNC=95 - PLMN_SUPPORT_MNC=95
- PLMN_SUPPORT_TAC=0xa000 - PLMN_SUPPORT_TAC=0xa000
- SST_0=222 - SST_0=1
- SD_0=123 - SD_0=0xFFFFFF
- SST_1=1 - SST_1=1
- SD_1=12 - SD_1=1
- SST_2=222
- SD_2=123
- AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_NGAP=eth0
- AMF_INTERFACE_NAME_FOR_N11=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0
- SMF_INSTANCE_ID_0=1 - SMF_INSTANCE_ID_0=1
...@@ -85,11 +87,14 @@ services: ...@@ -85,11 +87,14 @@ services:
- OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d - OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d
- NRF_IPV4_ADDRESS=192.168.70.130 - NRF_IPV4_ADDRESS=192.168.70.130
- NRF_PORT=80 - NRF_PORT=80
- EXTERNAL_NRF=yes - EXTERNAL_NRF=no
- NF_REGISTRATION=yes - NF_REGISTRATION=yes
- SMF_SELECTION=yes - SMF_SELECTION=yes
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- EXTERNAL_AUSF=no - EXTERNAL_AUSF=no
- EXTERNAL_UDM=no
- EXTERNAL_NSSF=no
- USE_HTTP2=no
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- AUSF_IPV4_ADDRESS=0.0.0.0 - AUSF_IPV4_ADDRESS=0.0.0.0
...@@ -104,7 +109,7 @@ services: ...@@ -104,7 +109,7 @@ services:
- mysql - mysql
- oai-nrf - oai-nrf
volumes: volumes:
- ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - ./healthscripts/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -115,7 +120,7 @@ services: ...@@ -115,7 +120,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai-smf: oai-smf:
container_name: "oai-smf" container_name: "oai-smf"
image: oai-smf:latest image: oai-smf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -127,32 +132,58 @@ services: ...@@ -127,32 +132,58 @@ services:
- SMF_API_VERSION=v1 - SMF_API_VERSION=v1
- DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100 - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
- DEFAULT_DNS_SEC_IPV4_ADDRESS=8.8.8.8 - DEFAULT_DNS_SEC_IPV4_ADDRESS=8.8.8.8
- AMF_IPV4_ADDRESS=192.168.70.132 - AMF_IPV4_ADDRESS=0.0.0.0
- AMF_PORT=80 - AMF_PORT=80
- AMF_API_VERSION=v1 - AMF_API_VERSION=v1
- AMF_FQDN=oai-amf - AMF_FQDN=localhost
- UDM_IPV4_ADDRESS=192.168.70.137 - UDM_IPV4_ADDRESS=0.0.0.0
- UDM_PORT=80 - UDM_PORT=80
- UDM_API_VERSION=v2 - UDM_API_VERSION=v2
- UDM_FQDN=oai-udm - UDM_FQDN=localhost
- UPF_IPV4_ADDRESS=192.168.70.134 - UPF_IPV4_ADDRESS=192.168.70.134
- UPF_FQDN_0=oai-spgwu - UPF_FQDN_0=oai-spgwu
- NRF_IPV4_ADDRESS=192.168.70.130 - NRF_IPV4_ADDRESS=192.168.70.130
- NRF_PORT=80 - NRF_PORT=80
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- USE_LOCAL_SUBSCRIPTION_INFO=no #Set to yes if SMF uses local subscription information instead of from an UDM
- USE_NETWORK_INSTANCE=no #Set yes if network instance is to be used for given UPF
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- REGISTER_NRF=yes - REGISTER_NRF=yes
- DISCOVER_UPF=yes - DISCOVER_UPF=yes
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- DNN_RANGE1=12.1.1.2 - 12.1.1.128 - HTTP_VERSION=1 # Default: 1
- DNN_RANGE0=12.2.1.2 - 12.2.1.128
- DNN_NI1=default
- UE_MTU=1500 - UE_MTU=1500
- DNN_NI0=oai
- TYPE0=IPv4
- DNN_RANGE0=12.1.1.2 - 12.1.1.100
- NSSAI_SST0=1
- NSSAI_SD0=0xFFFFFF
- SESSION_AMBR_UL0=200Mbps
- SESSION_AMBR_DL0=400Mbps
- DNN_NI1=oai.ipv4
- TYPE1=IPv4
- DNN_RANGE1=12.1.1.101 - 12.1.1.200
- NSSAI_SST1=1
- NSSAI_SD1=1
- SESSION_AMBR_UL1=100Mbps
- SESSION_AMBR_DL1=200Mbps
- DNN_NI2=default
- TYPE2=IPv4
- DNN_RANGE2=12.1.1.201 - 12.1.1.253
- NSSAI_SST2=222
- NSSAI_SD2=123
- SESSION_AMBR_UL2=50Mbps
- SESSION_AMBR_DL2=100Mbps
- DNN_NI3=ims
- TYPE3=IPv4v6
- DNN_RANGE3=14.1.1.2 - 14.1.1.253
- DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 # only needed when ims is being used
- ENABLE_USAGE_REPORTING=no # Set yes if UE USAGE REPORTING is to be done at UPF
depends_on: depends_on:
- oai-nrf - oai-nrf
- oai-amf - oai-amf
volumes: volumes:
- ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -163,7 +194,7 @@ services: ...@@ -163,7 +194,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-spgwu: oai-spgwu:
container_name: "oai-spgwu" container_name: "oai-spgwu"
image: oai-spgwu-tiny:latest image: oai-spgwu-tiny:v1.3.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
...@@ -188,9 +219,15 @@ services: ...@@ -188,9 +219,15 @@ services:
- NRF_PORT=80 - NRF_PORT=80
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- NSSAI_SST_0=222 - NSSAI_SST_0=1
- NSSAI_SD_0=123 - NSSAI_SD_0=0xFFFFFF
- DNN_0=default - DNN_0=oai
- NSSAI_SST_1=1
- NSSAI_SD_1=1
- DNN_1=oai.ipv4
- NSSAI_SST_2=222
- NSSAI_SD_2=123
- DNN_2=default
depends_on: depends_on:
- oai-nrf - oai-nrf
- oai-smf - oai-smf
...@@ -201,7 +238,7 @@ services: ...@@ -201,7 +238,7 @@ services:
- ALL - ALL
privileged: true privileged: true
volumes: volumes:
- ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - ./healthscripts/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
interval: 10s interval: 10s
...@@ -210,10 +247,10 @@ services: ...@@ -210,10 +247,10 @@ services:
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.134 ipv4_address: 192.168.70.134
oai-ext-dn: oai-traffic-gen:
image: trf-gen-cn5g:latest image: trf-gen-cn5g:latest
privileged: true privileged: true
container_name: oai-ext-dn container_name: oai-traffic-gen
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity" "ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity"
depends_on: depends_on:
......
docker-compose/docker-compose-no-privilege.yaml
+ 89
− 53
View file @ 6b9d7878
# In this docker-compose spgwu is not privileged access, it is good example for security purpose
version: '3.8' version: '3.8'
services: services:
oai-nrf:
container_name: "oai-nrf"
image: oai-nrf:latest
environment:
- NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80
- NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090
- NRF_API_VERSION=v1
- INSTANCE=0
- PID_DIRECTORY=/var/run
networks:
public_net:
ipv4_address: 192.168.70.130
volumes:
- ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
mysql: mysql:
container_name: "mysql" container_name: "mysql"
image: mysql:5.7 image: mysql:5.7
volumes: volumes:
- ./oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./database/oai_db1.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh - ./healthscripts/mysql-healthcheck1.sh:/tmp/mysql-healthcheck.sh
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- MYSQL_DATABASE=oai_db - MYSQL_DATABASE=oai_db
...@@ -40,19 +21,39 @@ services: ...@@ -40,19 +21,39 @@ services:
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-nrf:
container_name: "oai-nrf"
image: oai-nrf:v1.4.0
environment:
- NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80
- NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090
- NRF_API_VERSION=v1
- INSTANCE=0
- PID_DIRECTORY=/var/run
networks:
public_net:
ipv4_address: 192.168.70.130
volumes:
- ./healthscripts/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
oai-amf: oai-amf:
container_name: "oai-amf" container_name: "oai-amf"
image: oai-amf:latest image: oai-amf:v1.4.0
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
- MCC=208 - MCC=208
- MNC=99 - MNC=95
- REGION_ID=128 - REGION_ID=128
- AMF_SET_ID=1 - AMF_SET_ID=1
- SERVED_GUAMI_MCC_0=208 - SERVED_GUAMI_MCC_0=208
- SERVED_GUAMI_MNC_0=99 - SERVED_GUAMI_MNC_0=95
- SERVED_GUAMI_REGION_ID_0=128 - SERVED_GUAMI_REGION_ID_0=128
- SERVED_GUAMI_AMF_SET_ID_0=1 - SERVED_GUAMI_AMF_SET_ID_0=1
- SERVED_GUAMI_MCC_1=460 - SERVED_GUAMI_MCC_1=460
...@@ -60,17 +61,19 @@ services: ...@@ -60,17 +61,19 @@ services:
- SERVED_GUAMI_REGION_ID_1=10 - SERVED_GUAMI_REGION_ID_1=10
- SERVED_GUAMI_AMF_SET_ID_1=1 - SERVED_GUAMI_AMF_SET_ID_1=1
- PLMN_SUPPORT_MCC=208 - PLMN_SUPPORT_MCC=208
- PLMN_SUPPORT_MNC=99 - PLMN_SUPPORT_MNC=95
- PLMN_SUPPORT_TAC=0xa000 - PLMN_SUPPORT_TAC=0xa000
- SST_0=222 - SST_0=1
- SD_0=123 - SD_0=0xFFFFFF
- SST_1=1 - SST_1=1
- SD_1=1 - SD_1=1
- SST_2=222
- SD_2=123
- AMF_INTERFACE_NAME_FOR_NGAP=eth0 - AMF_INTERFACE_NAME_FOR_NGAP=eth0
- AMF_INTERFACE_NAME_FOR_N11=eth0 - AMF_INTERFACE_NAME_FOR_N11=eth0
- SMF_INSTANCE_ID_0=1 - SMF_INSTANCE_ID_0=1
- SMF_FQDN_0=oai-smf - SMF_FQDN_0=oai-smf
- SMF_IPV4_ADDR_0=0.0.0.0 - SMF_IPV4_ADDR_0=192.168.70.133
- SMF_HTTP_VERSION_0=v1 - SMF_HTTP_VERSION_0=v1
- SELECTED_0=true - SELECTED_0=true
- SMF_INSTANCE_ID_1=2 - SMF_INSTANCE_ID_1=2
...@@ -85,22 +88,29 @@ services: ...@@ -85,22 +88,29 @@ services:
- OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d - OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d
- NRF_IPV4_ADDRESS=192.168.70.130 - NRF_IPV4_ADDRESS=192.168.70.130
- NRF_PORT=80 - NRF_PORT=80
- EXTERNAL_NRF=yes - EXTERNAL_NRF=no
- NF_REGISTRATION=yes - NF_REGISTRATION=yes
- SMF_SELECTION=yes - SMF_SELECTION=yes
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- EXTERNAL_AUSF=no
- EXTERNAL_UDM=no
- EXTERNAL_NSSF=no
- USE_HTTP2=no
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- AUSF_IPV4_ADDRESS=127.0.0.1 - AUSF_IPV4_ADDRESS=0.0.0.0
- AUSF_PORT=80 - AUSF_PORT=80
- AUSF_API_VERSION=v1 - AUSF_API_VERSION=v1
- UDM_IPV4_ADDRESS=127.0.0.1 - AUSF_FQDN=localhost
- UDM_IPV4_ADDRESS=0.0.0.0
- UDM_PORT=80 - UDM_PORT=80
- UDM_API_VERSION=v2 - UDM_API_VERSION=v2
- UDM_FQDN=localhost
depends_on: depends_on:
- mysql - mysql
- oai-nrf
volumes: volumes:
- ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - ./healthscripts/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -111,7 +121,7 @@ services: ...@@ -111,7 +121,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai-smf: oai-smf:
container_name: "oai-smf" container_name: "oai-smf"
image: oai-smf:latest image: oai-smf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -126,8 +136,8 @@ services: ...@@ -126,8 +136,8 @@ services:
- AMF_IPV4_ADDRESS=0.0.0.0 - AMF_IPV4_ADDRESS=0.0.0.0
- AMF_PORT=80 - AMF_PORT=80
- AMF_API_VERSION=v1 - AMF_API_VERSION=v1
- AMF_FQDN=oai-amf - AMF_FQDN=localhost
- UDM_IPV4_ADDRESS=127.0.0.1 - UDM_IPV4_ADDRESS=0.0.0.0
- UDM_PORT=80 - UDM_PORT=80
- UDM_API_VERSION=v2 - UDM_API_VERSION=v2
- UDM_FQDN=localhost - UDM_FQDN=localhost
...@@ -136,14 +146,45 @@ services: ...@@ -136,14 +146,45 @@ services:
- NRF_IPV4_ADDRESS=192.168.70.130 - NRF_IPV4_ADDRESS=192.168.70.130
- NRF_PORT=80 - NRF_PORT=80
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- USE_LOCAL_SUBSCRIPTION_INFO=no #Set to yes if SMF uses local subscription information instead of from an UDM
- USE_NETWORK_INSTANCE=no #Set yes if network instance is to be used for given UPF
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- REGISTER_NRF=yes - REGISTER_NRF=yes
- DISCOVER_UPF=yes - DISCOVER_UPF=yes
- USE_FQDN_DNS=yes - USE_FQDN_DNS=yes
- HTTP_VERSION=1 # Default: 1
- UE_MTU=1500
- DNN_NI0=oai
- TYPE0=IPv4
- DNN_RANGE0=12.1.1.2 - 12.1.1.100
- NSSAI_SST0=1
- NSSAI_SD0=0xFFFFFF
- SESSION_AMBR_UL0=200Mbps
- SESSION_AMBR_DL0=400Mbps
- DNN_NI1=oai.ipv4
- TYPE1=IPv4
- DNN_RANGE1=12.1.1.101 - 12.1.1.200
- NSSAI_SST1=1
- NSSAI_SD1=1
- SESSION_AMBR_UL1=100Mbps
- SESSION_AMBR_DL1=200Mbps
- DNN_NI2=default
- TYPE2=IPv4
- DNN_RANGE2=12.1.1.201 - 12.1.1.253
- NSSAI_SST2=222
- NSSAI_SD2=123
- SESSION_AMBR_UL2=50Mbps
- SESSION_AMBR_DL2=100Mbps
- DNN_NI3=ims
- TYPE3=IPv4v6
- DNN_RANGE3=14.1.1.2 - 14.1.1.253
- DEFAULT_CSCF_IPV4_ADDRESS=127.0.0.1 # only needed when ims is being used
- ENABLE_USAGE_REPORTING=no # Set yes if UE USAGE REPORTING is to be done at UPF
depends_on: depends_on:
- oai-nrf - oai-nrf
- oai-amf
volumes: volumes:
- ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -154,7 +195,7 @@ services: ...@@ -154,7 +195,7 @@ services:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
oai-spgwu: oai-spgwu:
container_name: "oai-spgwu" container_name: "oai-spgwu"
image: oai-spgwu-tiny:latest image: oai-spgwu-tiny:v1.3.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
...@@ -179,9 +220,15 @@ services: ...@@ -179,9 +220,15 @@ services:
- NRF_PORT=80 - NRF_PORT=80
- NRF_API_VERSION=v1 - NRF_API_VERSION=v1
- NRF_FQDN=oai-nrf - NRF_FQDN=oai-nrf
- NSSAI_SST_0=222 - NSSAI_SST_0=1
- NSSAI_SD_0=123 - NSSAI_SD_0=0xFFFFFF
- DNN_0=default - DNN_0=oai
- NSSAI_SST_1=1
- NSSAI_SD_1=1
- DNN_1=oai.ipv4
- NSSAI_SST_2=222
- NSSAI_SD_2=123
- DNN_2=default
depends_on: depends_on:
- oai-nrf - oai-nrf
cap_add: cap_add:
...@@ -200,7 +247,7 @@ services: ...@@ -200,7 +247,7 @@ services:
- net.ipv4.conf.all.accept_redirects=0 - net.ipv4.conf.all.accept_redirects=0
- net.ipv4.conf.default.accept_redirects=0 - net.ipv4.conf.default.accept_redirects=0
volumes: volumes:
- ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - ./healthscripts/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
interval: 10s interval: 10s
...@@ -209,17 +256,6 @@ services: ...@@ -209,17 +256,6 @@ services:
networks: networks:
public_net: public_net:
ipv4_address: 192.168.70.134 ipv4_address: 192.168.70.134
oai-ext-dn:
image: trf-gen-cn5g:latest
privileged: true
container_name: oai-ext-dn
entrypoint: /bin/bash -c \
"ip route add 12.1.1.0/24 via 192.168.70.134 dev eth0; sleep infinity"
depends_on:
- oai-spgwu
networks:
public_net:
ipv4_address: 192.168.70.135
networks: networks:
# public_net: # public_net:
# external: # external:
......
docker-compose/docker-compose-slicing-basic-nrf.yaml
+ 30
− 30
View file @ 6b9d7878
...@@ -4,8 +4,8 @@ services: ...@@ -4,8 +4,8 @@ services:
container_name: mysql container_name: mysql
image: mysql:5.7 image: mysql:5.7
volumes: volumes:
- ./oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql - ./database/oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
- ./mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh - ./healthscripts/mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- MYSQL_DATABASE=oai_db - MYSQL_DATABASE=oai_db
...@@ -22,7 +22,7 @@ services: ...@@ -22,7 +22,7 @@ services:
ipv4_address: 192.168.70.131 ipv4_address: 192.168.70.131
oai-nssf: oai-nssf:
container_name: "oai-nssf" container_name: "oai-nssf"
image: oai-nssf:latest image: oai-nssf:v1.4.0
environment: environment:
- INSTANCE=0 - INSTANCE=0
- TZ=Europe/Paris - TZ=Europe/Paris
...@@ -42,7 +42,7 @@ services: ...@@ -42,7 +42,7 @@ services:
- ALL - ALL
privileged: true privileged: true
volumes: volumes:
- ./nssf_slice_config.yaml:/openair-nssf/etc/nssf_slice_config.yaml - ./healthscripts/nssf_slice_config.yaml:/openair-nssf/etc/nssf_slice_config.yaml
healthcheck: healthcheck:
test: /bin/bash -c "pgrep oai_nssf" test: /bin/bash -c "pgrep oai_nssf"
interval: 10s interval: 10s
...@@ -53,7 +53,7 @@ services: ...@@ -53,7 +53,7 @@ services:
ipv4_address: 192.168.70.132 ipv4_address: 192.168.70.132
oai_udr: oai_udr:
container_name: oai-udr container_name: oai-udr
image: oai-udr:latest image: oai-udr:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -73,7 +73,7 @@ services: ...@@ -73,7 +73,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.133 ipv4_address: 192.168.70.133
volumes: volumes:
- ./udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh - ./healthscripts/udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh" test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh"
interval: 10s interval: 10s
...@@ -81,7 +81,7 @@ services: ...@@ -81,7 +81,7 @@ services:
retries: 5 retries: 5
oai_udm: oai_udm:
container_name: oai-udm container_name: oai-udm
image: oai-udm:latest image: oai-udm:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -101,7 +101,7 @@ services: ...@@ -101,7 +101,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.134 ipv4_address: 192.168.70.134
volumes: volumes:
- ./udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh - ./healthscripts/udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh" test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh"
interval: 10s interval: 10s
...@@ -109,7 +109,7 @@ services: ...@@ -109,7 +109,7 @@ services:
retries: 5 retries: 5
oai_ausf: oai_ausf:
container_name: oai-ausf container_name: oai-ausf
image: oai-ausf:latest image: oai-ausf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE_ID=0 - INSTANCE_ID=0
...@@ -128,7 +128,7 @@ services: ...@@ -128,7 +128,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.135 ipv4_address: 192.168.70.135
volumes: volumes:
- ./ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh - ./healthscripts/ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh" test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -136,7 +136,7 @@ services: ...@@ -136,7 +136,7 @@ services:
retries: 5 retries: 5
oai_nrf_slice12: oai_nrf_slice12:
container_name: oai-nrf-slice12 container_name: oai-nrf-slice12
image: oai-nrf:latest image: oai-nrf:v1.4.0
environment: environment:
- NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80 - NRF_INTERFACE_PORT_FOR_SBI=80
...@@ -148,7 +148,7 @@ services: ...@@ -148,7 +148,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.136 ipv4_address: 192.168.70.136
volumes: volumes:
- ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - ./healthscripts/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -156,7 +156,7 @@ services: ...@@ -156,7 +156,7 @@ services:
retries: 5 retries: 5
oai_nrf_slice3: oai_nrf_slice3:
container_name: oai-nrf-slice3 container_name: oai-nrf-slice3
image: oai-nrf:latest image: oai-nrf:v1.4.0
environment: environment:
- NRF_INTERFACE_NAME_FOR_SBI=eth0 - NRF_INTERFACE_NAME_FOR_SBI=eth0
- NRF_INTERFACE_PORT_FOR_SBI=80 - NRF_INTERFACE_PORT_FOR_SBI=80
...@@ -168,7 +168,7 @@ services: ...@@ -168,7 +168,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.137 ipv4_address: 192.168.70.137
volumes: volumes:
- ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh - ./healthscripts/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh" test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -176,7 +176,7 @@ services: ...@@ -176,7 +176,7 @@ services:
retries: 5 retries: 5
oai_amf: oai_amf:
container_name: oai-amf container_name: oai-amf
image: oai-amf:latest image: oai-amf:v1.4.0
environment: environment:
- TZ=Europe/paris - TZ=Europe/paris
- INSTANCE=0 - INSTANCE=0
...@@ -249,7 +249,7 @@ services: ...@@ -249,7 +249,7 @@ services:
- vpp_upf_slice3 - vpp_upf_slice3
- oai_ausf - oai_ausf
volumes: volumes:
- ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh - ./healthscripts/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh" test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -260,7 +260,7 @@ services: ...@@ -260,7 +260,7 @@ services:
ipv4_address: 192.168.70.138 ipv4_address: 192.168.70.138
oai_smf_slice1: oai_smf_slice1:
container_name: oai-smf-slice1 container_name: oai-smf-slice1
image: oai-smf:latest image: oai-smf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -295,7 +295,7 @@ services: ...@@ -295,7 +295,7 @@ services:
- oai_amf - oai_amf
- oai_nrf_slice12 - oai_nrf_slice12
volumes: volumes:
- ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -306,7 +306,7 @@ services: ...@@ -306,7 +306,7 @@ services:
ipv4_address: 192.168.70.139 ipv4_address: 192.168.70.139
oai_smf_slice2: oai_smf_slice2:
container_name: oai-smf-slice2 container_name: oai-smf-slice2
image: oai-smf:latest image: oai-smf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -341,7 +341,7 @@ services: ...@@ -341,7 +341,7 @@ services:
- oai_amf - oai_amf
- oai_nrf_slice12 - oai_nrf_slice12
volumes: volumes:
- ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -352,7 +352,7 @@ services: ...@@ -352,7 +352,7 @@ services:
ipv4_address: 192.168.70.140 ipv4_address: 192.168.70.140
oai_smf_slice3: oai_smf_slice3:
container_name: oai-smf-slice3 container_name: oai-smf-slice3
image: oai-smf:latest image: oai-smf:v1.4.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- INSTANCE=0 - INSTANCE=0
...@@ -390,7 +390,7 @@ services: ...@@ -390,7 +390,7 @@ services:
extra_hosts: extra_hosts:
- "gw1.vppupf.node.5gcn.mnc95.mcc208.3gppnetwork.org:192.168.70.202" - "gw1.vppupf.node.5gcn.mnc95.mcc208.3gppnetwork.org:192.168.70.202"
volumes: volumes:
- ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh" test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s interval: 10s
...@@ -401,7 +401,7 @@ services: ...@@ -401,7 +401,7 @@ services:
ipv4_address: 192.168.70.141 ipv4_address: 192.168.70.141
oai_spgwu_slice1: oai_spgwu_slice1:
container_name: oai-spgwu-slice1 container_name: oai-spgwu-slice1
image: oai-spgwu-tiny:latest image: oai-spgwu-tiny:v1.3.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
...@@ -438,7 +438,7 @@ services: ...@@ -438,7 +438,7 @@ services:
- ALL - ALL
privileged: true privileged: true
volumes: volumes:
- ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - ./healthscripts/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
interval: 10s interval: 10s
...@@ -449,7 +449,7 @@ services: ...@@ -449,7 +449,7 @@ services:
ipv4_address: 192.168.70.142 ipv4_address: 192.168.70.142
oai_spgwu_slice2: oai_spgwu_slice2:
container_name: oai-spgwu-slice2 container_name: oai-spgwu-slice2
image: oai-spgwu-tiny:latest image: oai-spgwu-tiny:v1.3.0
environment: environment:
- TZ=Europe/Paris - TZ=Europe/Paris
- PID_DIRECTORY=/var/run - PID_DIRECTORY=/var/run
...@@ -485,7 +485,7 @@ services: ...@@ -485,7 +485,7 @@ services:
- ALL - ALL
privileged: true privileged: true
volumes: volumes:
- ./spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh - ./healthscripts/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
healthcheck: healthcheck:
test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh" test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
interval: 10s interval: 10s
...@@ -495,7 +495,7 @@ services: ...@@ -495,7 +495,7 @@ services:
public_net: public_net:
ipv4_address: 192.168.70.143 ipv4_address: 192.168.70.143
vpp_upf_slice3: vpp_upf_slice3:
image: oai-upf-vpp:latest image: oai-upf-vpp:v1.4.0
privileged: true privileged: true
container_name: vpp-upf-slice3 container_name: vpp-upf-slice3
environment: environment:
...@@ -535,10 +535,10 @@ services: ...@@ -535,10 +535,10 @@ services:
ipv4_address: 192.168.72.144 ipv4_address: 192.168.72.144
public_net_core: public_net_core:
ipv4_address: 192.168.73.144 ipv4_address: 192.168.73.144
oai_ext_dn: oai-traffic-gen:
image: trf-gen-cn5g:latest image: trf-gen-cn5g:v1.4
privileged: true privileged: true
container_name: oai-ext-dn container_name: oai-traffic-gen
entrypoint: /bin/bash -c \ entrypoint: /bin/bash -c \
"iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\ "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
"ip route add 12.2.1.2/32 via 192.168.70.142 dev eth0;"\ "ip route add 12.2.1.2/32 via 192.168.70.142 dev eth0;"\
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment