Commit 1575962d authored by yangjian's avatar yangjian

update v1.5.3

parent 2aa8dad7
......@@ -2,7 +2,7 @@ version: '3.3'
services:
openxg-amf-0:
container_name: "openxg-amf-0"
image: openxg-amf:v1.5.2
image: openxg-amf:v1.5.3
privileged: true
stdin_open: true
tty: true
......@@ -20,7 +20,6 @@ services:
- TAC=100
- INTERFACE_NAME=eth0
- SMF_SBI_ADDR=10.0.0.9
- UPF_IP=10.0.0.8
# MYSQL
- AMF_MySQL_SERVER_ADDR=10.0.0.2
- AMF_MySQL_USERNAME=root
......@@ -29,7 +28,7 @@ services:
openxg-smf-0:
container_name: "openxg-smf-0"
image: openxg-smf:v1.5.2
image: openxg-smf:v1.5.3
privileged: true
stdin_open: true
tty: true
......@@ -52,7 +51,7 @@ services:
openxg-upf-0:
container_name: "openxg-upf-0"
image: openxg-upf:v1.5.2
image: openxg-upf:v1.5.3
privileged: true
stdin_open: true
tty: true
......
......@@ -2,7 +2,7 @@ version: '3.8'
services:
openxg-gnb-0-0:
container_name: "openxg-gnb-0-0"
image: openxg-ueransim:v1.5.2
image: openxg-ueransim:v1.5.3
privileged: true
stdin_open: true
tty: true
......@@ -44,7 +44,7 @@ services:
- BROADCASTPORT=1111
openxg-ue-0-0-0:
container_name: "openxg-ue-0-0-0"
image: openxg-ueransim:v1.5.2
image: openxg-ueransim:v1.5.3
privileged: true
stdin_open: true
tty: true
......
......@@ -64,40 +64,40 @@ else
echo_success "phpmyadmin/phpmyadmin:latest is successfully pulled!"
fi
if [[ "$(docker images -q openxg-amf:v1.5.2 2> /dev/null)" != "" ]]; then
echo_success "openxg-amf:v1.5.2 already exists!"
if [[ "$(docker images -q openxg-amf:v1.5.3 2> /dev/null)" != "" ]]; then
echo_success "openxg-amf:v1.5.3 already exists!"
else
docker pull $REMOTE_URL/diankeyuan/openxg-amf:v1.5.2
docker tag $REMOTE_URL/diankeyuan/openxg-amf:v1.5.2 openxg-amf:v1.5.2
docker rmi $REMOTE_URL/diankeyuan/openxg-amf:v1.5.2
echo_success "openxg-amf:v1.5.2 is successfully pulled!"
docker pull $REMOTE_URL/diankeyuan/openxg-amf:v1.5.3
docker tag $REMOTE_URL/diankeyuan/openxg-amf:v1.5.3 openxg-amf:v1.5.3
docker rmi $REMOTE_URL/diankeyuan/openxg-amf:v1.5.3
echo_success "openxg-amf:v1.5.3 is successfully pulled!"
fi
if [[ "$(docker images -q openxg-smf:v1.5.2 2> /dev/null)" != "" ]]; then
echo_success "openxg-smf:v1.5.2 already exists!"
if [[ "$(docker images -q openxg-smf:v1.5.3 2> /dev/null)" != "" ]]; then
echo_success "openxg-smf:v1.5.3 already exists!"
else
docker pull $REMOTE_URL/diankeyuan/openxg-smf:v1.5.2
docker tag $REMOTE_URL/diankeyuan/openxg-smf:v1.5.2 openxg-smf:v1.5.2
docker rmi $REMOTE_URL/diankeyuan/openxg-smf:v1.5.2
echo_success "openxg-smf:v1.5.2 is successfully pulled!"
docker pull $REMOTE_URL/diankeyuan/openxg-smf:v1.5.3
docker tag $REMOTE_URL/diankeyuan/openxg-smf:v1.5.3 openxg-smf:v1.5.3
docker rmi $REMOTE_URL/diankeyuan/openxg-smf:v1.5.3
echo_success "openxg-smf:v1.5.3 is successfully pulled!"
fi
if [[ "$(docker images -q openxg-upf:v1.5.2 2> /dev/null)" != "" ]]; then
echo_success "openxg-upf:v1.5.2 already exists!"
if [[ "$(docker images -q openxg-upf:v1.5.3 2> /dev/null)" != "" ]]; then
echo_success "openxg-upf:v1.5.3 already exists!"
else
docker pull $REMOTE_URL/diankeyuan/openxg-upf:v1.5.2
docker tag $REMOTE_URL/diankeyuan/openxg-upf:v1.5.2 openxg-upf:v1.5.2
docker rmi $REMOTE_URL/diankeyuan/openxg-upf:v1.5.2
echo_success "openxg-upf:v1.5.2 is successfully pulled!"
docker pull $REMOTE_URL/diankeyuan/openxg-upf:v1.5.3
docker tag $REMOTE_URL/diankeyuan/openxg-upf:v1.5.3 openxg-upf:v1.5.3
docker rmi $REMOTE_URL/diankeyuan/openxg-upf:v1.5.3
echo_success "openxg-upf:v1.5.3 is successfully pulled!"
fi
if [[ "$(docker images -q openxg-ueransim:v1.5.2 2> /dev/null)" != "" ]]; then
echo_success "openxg-ueransim:v1.5.2 already exists!"
if [[ "$(docker images -q openxg-ueransim:v1.5.3 2> /dev/null)" != "" ]]; then
echo_success "openxg-ueransim:v1.5.3 already exists!"
else
docker pull $REMOTE_URL/diankeyuan/openxg-ueransim:v1.5.2
docker tag $REMOTE_URL/diankeyuan/openxg-ueransim:v1.5.2 openxg-ueransim:v1.5.2
docker rmi $REMOTE_URL/diankeyuan/openxg-ueransim:v1.5.2
echo_success "openxg-ueransim:v1.5.2 is successfully pulled!"
docker pull $REMOTE_URL/diankeyuan/openxg-ueransim:v1.5.3
docker tag $REMOTE_URL/diankeyuan/openxg-ueransim:v1.5.3 openxg-ueransim:v1.5.3
docker rmi $REMOTE_URL/diankeyuan/openxg-ueransim:v1.5.3
echo_success "openxg-ueransim:v1.5.3 is successfully pulled!"
fi
rm $DOCKER_CONFIG
......
......@@ -75,12 +75,11 @@ start_5gc() {
-e "TAC=100" \
-e "INTERFACE_NAME=eth0" \
-e "SMF_SBI_ADDR=10.$2.0.9" \
-e "UPF_IP=10.$2.0.8" \
-e "AMF_MySQL_SERVER_ADDR=10.$5.0.2" \
-e "AMF_MySQL_USERNAME=root" \
-e "AMF_MySQL_PASSWORD=123456" \
-e "AMF_MySQL_DATABASE=amfusers" \
openxg-amf:v1.5.2 > /dev/null
openxg-amf:v1.5.3 > /dev/null
echo "Start SMF: openxg-smf-$2"
docker run -itd --log-opt max-size=10m --privileged=true \
......@@ -94,7 +93,7 @@ start_5gc() {
-e "SMF_IMS_IPV4_RANGE=12.$2.200.2 - 12.$2.255.253" \
-e "SMF_CTNET_IPV4_RANGE=12.$2.0.3 - 12.$2.199.253" \
-e "SMF_INTERNET_IPV4_RANGE=12.$2.0.3 - 12.$2.199.253" \
openxg-smf:v1.5.2 > /dev/null
openxg-smf:v1.5.3 > /dev/null
echo "Start UPF: openxg-upf-$2"
docker run -itd --log-opt max-size=10m --privileged=true \
......@@ -104,7 +103,7 @@ start_5gc() {
-e "INTERFACE_NAME=eth0" \
-e "UPF_PDN_NETWORK_IPV4=12.$2.0.0/16" \
-e "SMF_N4_ADDR=10.$2.0.9" \
openxg-upf:v1.5.2 > /dev/null
openxg-upf:v1.5.3 > /dev/null
}
start_gnb() {
......@@ -137,12 +136,12 @@ start_gnb() {
-e "ENCONDINGMODE=1" \
-e "BROADCASTIP=127.0.0.1" \
-e "BROADCASTPORT=1111" \
openxg-ueransim:v1.5.2 \
openxg-ueransim:v1.5.3 \
/bin/bash -c "/ueransim/bin/nr-gnb -c /ueransim/etc/gnb.yaml" > /dev/null
}
create_ue() {
start_ue() {
# -v "$SRC/docker-compose/lib/nr-ue:/ueransim/bin/nr-ue" \
docker create -it --log-opt max-size=10m --privileged=true \
docker run -itd --log-opt max-size=10m --privileged=true \
--name $1 \
--network docker-openxg --ip $2 \
-v "$SRC/template/ue.template:/ueransim/etc/ue.template" \
......@@ -157,7 +156,7 @@ create_ue() {
-e "AMF_VALUE=8000" \
-e "CONTROLPORT=9988" \
-e "CONTROLIP=127.0.0.1" \
openxg-ueransim:v1.5.2 \
openxg-ueransim:v1.5.3 \
/bin/bash -c "/ueransim/bin/nr-ue -c /ueransim/etc/ue.yaml" > /dev/null
}
......@@ -222,8 +221,8 @@ for ((i=0; i<fivegc_value; i++)); do
gnb_ue_ipv4=$(ip_increment "$gnb_ue_ipv4")
imsi=$(($imsi+1))
echo "create UE: openxg-ue-$i-$j-$k imsi($imsi)"
create_ue openxg-ue-$i-$j-$k $gnb_ue_ipv4 $mcc $mnc $gnb_ip $imsi
echo "Start UE: openxg-ue-$i-$j-$k imsi($imsi)"
start_ue openxg-ue-$i-$j-$k $gnb_ue_ipv4 $mcc $mnc $gnb_ip $imsi
done
......@@ -236,13 +235,3 @@ for ((i=0; i<fivegc_value; i++)); do
fi
done
for ((x=0; x<fivegc_value; x++)); do
for ((y=0; y<gnb_value; y++)); do
for ((z=0; z<ue_value; z++)); do
echo "start UE: $(docker start openxg-ue-$x-$y-$z)"
done
done
done
......@@ -114,8 +114,6 @@ AMF =
# };
};
UPF_IP = "{{ env["UPF_IP"] }}"
SUPPORT_FEATURES:
{
# STRING, {"yes", "no"},
......
Markdown is supported
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