Skip to content

Commit 6b3ddaa

Browse files
niloyshniloysh
committed
Update ueransim and slicing to be on par with local config
1 parent cdaf0ad commit 6b3ddaa

31 files changed

+282
-316
lines changed

‎networks5g/network-attachments-ovs.yaml

+6-4
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,16 @@ apiVersion: "k8s.cni.cncf.io/v1"
3636
kind: NetworkAttachmentDefinition
3737
metadata:
3838
name: n4network
39+
annotations:
40+
k8s.v1.cni.cncf.io/resourceName: ovs-cni.network.kubevirt.io/n4br
3941
spec:
4042
config: '{
4143
"cniVersion": "0.3.1",
42-
"type": "macvlan",
43-
"master": "eth0",
44-
"mode": "bridge",
44+
"type": "ovs",
45+
"bridge": "n4br",
46+
"mtu": 1450,
4547
"ipam": {
4648
"type": "static"
4749
}
4850
}'
49-
---
51+
---

‎open5gs/common/amf/amf-deployment.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ spec:
2121
{ "name": "n2network", "interface": "n2", "ips": [ "10.10.2.1/24" ] }
2222
]'
2323
spec:
24-
nodeSelector:
25-
kubernetes.io/hostname: cn231
24+
# nodeSelector:
25+
# kubernetes.io/hostname: cn231
2626
initContainers:
2727
- name: wait-scp
2828
image: busybox:1.32.0
@@ -55,11 +55,11 @@ spec:
5555
add: ["NET_ADMIN"]
5656
resources:
5757
requests:
58+
memory: "256Mi"
59+
cpu: "200m"
60+
limits:
5861
memory: "512Mi"
5962
cpu: "500m"
60-
limits:
61-
memory: "1024Mi"
62-
cpu: "1000m"
6363
dnsPolicy: ClusterFirst
6464
restartPolicy: Always
6565
volumes:

‎open5gs/common/ausf/ausf-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ spec:
4040
name: ausf-volume
4141
resources:
4242
requests:
43+
memory: "256Mi"
44+
cpu: "200m"
45+
limits:
4346
memory: "512Mi"
4447
cpu: "500m"
45-
limits:
46-
memory: "1024Mi"
47-
cpu: "1000m"
4848
dnsPolicy: ClusterFirst
4949
restartPolicy: Always
5050
volumes:

‎open5gs/common/bsf/bsf-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ spec:
4040
name: bsf-volume
4141
resources:
4242
requests:
43+
memory: "256Mi"
44+
cpu: "200m"
45+
limits:
4346
memory: "512Mi"
4447
cpu: "500m"
45-
limits:
46-
memory: "1024Mi"
47-
cpu: "1000m"
4848
dnsPolicy: ClusterFirst
4949
restartPolicy: Always
5050
volumes:

‎open5gs/common/nrf/nrf-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,11 @@ spec:
5252
periodSeconds: 20
5353
resources:
5454
requests:
55+
memory: "256Mi"
56+
cpu: "200m"
57+
limits:
5558
memory: "512Mi"
5659
cpu: "500m"
57-
limits:
58-
memory: "1024Mi"
59-
cpu: "1000m"
6060
dnsPolicy: ClusterFirst
6161
restartPolicy: Always
6262
volumes:

‎open5gs/common/nssf/nssf-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ spec:
4040
name: nssf-volume
4141
resources:
4242
requests:
43+
memory: "256Mi"
44+
cpu: "200m"
45+
limits:
4346
memory: "512Mi"
4447
cpu: "500m"
45-
limits:
46-
memory: "1024Mi"
47-
cpu: "1000m"
4848
dnsPolicy: ClusterFirst
4949
restartPolicy: Always
5050
volumes:

‎open5gs/common/pcf/pcf-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ spec:
4949
name: pcf-volume
5050
resources:
5151
requests:
52+
memory: "256Mi"
53+
cpu: "200m"
54+
limits:
5255
memory: "512Mi"
5356
cpu: "500m"
54-
limits:
55-
memory: "1024Mi"
56-
cpu: "1000m"
5757
dnsPolicy: ClusterFirst
5858
restartPolicy: Always
5959
volumes:

‎open5gs/common/scp/scp-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ spec:
5858
periodSeconds: 20
5959
resources:
6060
requests:
61+
memory: "256Mi"
62+
cpu: "200m"
63+
limits:
6164
memory: "512Mi"
6265
cpu: "500m"
63-
limits:
64-
memory: "1024Mi"
65-
cpu: "1000m"
6666
dnsPolicy: ClusterFirst
6767
restartPolicy: Always
6868
volumes:

‎open5gs/common/udm/udm-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ spec:
4040
name: udm-volume
4141
resources:
4242
requests:
43+
memory: "256Mi"
44+
cpu: "200m"
45+
limits:
4346
memory: "512Mi"
4447
cpu: "500m"
45-
limits:
46-
memory: "1024Mi"
47-
cpu: "1000m"
4848
dnsPolicy: ClusterFirst
4949
restartPolicy: Always
5050
volumes:

‎open5gs/common/udr/udr-deployment.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,11 @@ spec:
4242
name: udr-volume
4343
resources:
4444
requests:
45+
memory: "256Mi"
46+
cpu: "200m"
47+
limits:
4548
memory: "512Mi"
4649
cpu: "500m"
47-
limits:
48-
memory: "1024Mi"
49-
cpu: "1000m"
5050
dnsPolicy: ClusterFirst
5151
restartPolicy: Always
5252
volumes:

‎open5gs/slices/slice1/smf1/smf-deployment.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ spec:
2525
{ "name": "n4network", "interface": "n4", "ips": [ "10.10.4.11/24" ] }
2626
]'
2727
spec:
28-
nodeSelector:
29-
kubernetes.io/hostname: cn231
28+
# nodeSelector:
29+
# kubernetes.io/hostname: cn231
3030
initContainers:
3131
- name: wait-ausf
3232
image: busybox:1.32.0
@@ -57,11 +57,11 @@ spec:
5757
add: ["NET_ADMIN"]
5858
resources:
5959
requests:
60+
memory: "256Mi"
61+
cpu: "200m"
62+
limits:
6063
memory: "512Mi"
6164
cpu: "500m"
62-
limits:
63-
memory: "1024Mi"
64-
cpu: "1000m"
6565
dnsPolicy: ClusterFirst
6666
restartPolicy: Always
6767
volumes:

‎open5gs/slices/slice1/upf1/upf-deployment.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ spec:
2525
{ "name": "n4network", "interface": "n4", "ips": [ "10.10.4.1/24" ] }
2626
]'
2727
spec:
28-
nodeSelector:
29-
kubernetes.io/hostname: cn231
28+
# nodeSelector:
29+
# kubernetes.io/hostname: cn231
3030
initContainers:
3131
- name: wait-smf
3232
image: busybox:1.32.0
@@ -48,11 +48,11 @@ spec:
4848
protocol: UDP
4949
resources:
5050
requests:
51+
memory: "256Mi"
52+
cpu: "200m"
53+
limits:
5154
memory: "512Mi"
5255
cpu: "500m"
53-
limits:
54-
memory: "1024Mi"
55-
cpu: "1000m"
5656
securityContext:
5757
privileged: true
5858
restartPolicy: Always

‎open5gs/slices/slice2/smf2/smf-configmap.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ data:
3939
port: 9090
4040
subnet:
4141
- addr: 10.46.0.1/16
42-
dnn: internet
42+
dnn: streaming
4343
dns:
4444
- 8.8.8.8
4545
- 8.8.4.4
@@ -53,7 +53,7 @@ data:
5353
- sst: 2
5454
sd: 000002
5555
dnn:
56-
- internet
56+
- streaming
5757
5858
scp:
5959
sbi:
@@ -63,5 +63,5 @@ data:
6363
upf:
6464
pfcp:
6565
- addr: 10.10.4.2
66-
dnn: internet
66+
dnn: streaming
6767

‎open5gs/slices/slice2/smf2/smf-deployment.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ spec:
2525
{ "name": "n4network", "interface": "n4", "ips": [ "10.10.4.12/24" ] }
2626
]'
2727
spec:
28-
nodeSelector:
29-
kubernetes.io/hostname: cn201
28+
# nodeSelector:
29+
# kubernetes.io/hostname: cn201
3030
initContainers:
3131
- name: wait-ausf
3232
image: busybox:1.32.0
@@ -57,11 +57,11 @@ spec:
5757
add: ["NET_ADMIN"]
5858
resources:
5959
requests:
60+
memory: "256Mi"
61+
cpu: "200m"
62+
limits:
6063
memory: "512Mi"
6164
cpu: "500m"
62-
limits:
63-
memory: "1024Mi"
64-
cpu: "1000m"
6565
dnsPolicy: ClusterFirst
6666
restartPolicy: Always
6767
volumes:

‎open5gs/slices/slice2/upf2/upf-configmap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ data:
1818
- dev: n3
1919
subnet:
2020
- addr: 10.46.0.1/16
21-
dnn: internet
21+
dnn: streaming
2222
metrics:
2323
- addr: 0.0.0.0
2424
port: 9090

‎open5gs/slices/slice2/upf2/upf-deployment.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ spec:
2525
{ "name": "n4network", "interface": "n4", "ips": [ "10.10.4.2/24" ] }
2626
]'
2727
spec:
28-
nodeSelector:
29-
kubernetes.io/hostname: cn201
28+
# nodeSelector:
29+
# kubernetes.io/hostname: cn201
3030

3131
initContainers:
3232
- name: wait-smf
@@ -49,11 +49,11 @@ spec:
4949
protocol: UDP
5050
resources:
5151
requests:
52+
memory: "256Mi"
53+
cpu: "200m"
54+
limits:
5255
memory: "512Mi"
5356
cpu: "500m"
54-
limits:
55-
memory: "1024Mi"
56-
cpu: "1000m"
5757
securityContext:
5858
privileged: true
5959
restartPolicy: Always

‎ueransim/ueransim-gnb/config/open5gs-gnb.yaml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
mcc: '001' # Mobile Country Code value
2+
mnc: '01' # Mobile Network Code value (2 or 3 digits)
3+
4+
nci: '0x000000010' # NR Cell Identity (36-bit)
5+
idLength: 32 # NR gNB ID length in bits [22...32]
6+
tac: 1 # Tracking Area Code
7+
8+
linkIp: 0.0.0.0 # gNB's local IP address for Radio Link Simulation (Usually same with local IP)
9+
ngapIp: 10.10.2.22 # gNB's local IP address for N2 Interface (Usually same with local IP)
10+
gtpIp: 10.10.3.22 # gNB's local IP address for N3 Interface (Usually same with local IP)
11+
12+
# List of AMF address information
13+
amfConfigs:
14+
- address: 10.10.2.1
15+
port: 38412
16+
17+
# List of supported S-NSSAIs by this gNB
18+
slices:
19+
- sst: 1
20+
sd: 000001
21+
- sst: 2
22+
sd: 000002
23+
24+
# Indicates whether or not SCTP stream number errors should be ignored.
25+
ignoreStreamIds: true

‎ueransim/ueransim-gnb/config/wrapper.sh

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#!/bin/bash
2+
/ueransim/nr-gnb --config /ueransim/config/open5gs-gnb.yaml

‎ueransim/ueransim-gnb/gnb-configmap.yaml

-40
This file was deleted.

0 commit comments

Comments
 (0)