Skip to content
Snippets Groups Projects
Commit 714e2347 authored by Raphael Defosseux's avatar Raphael Defosseux
Browse files

fix(test): removing all SMF healthchecks in docker-compose files 


Signed-off-by: default avatarRaphael Defosseux <raphael.defosseux@eurecom.fr>
parent ab8e0986
No related branches found
No related tags found
1 merge request!61fix(test): removing all healthcheck mounted versions
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 110 deletions
docker-compose/docker-compose-basic-nonrf.yaml
+ 0
− 7
View file @ 714e2347
......@@ -228,13 +228,6 @@ services:
- oai-amf
extra_hosts:
- "oai-spgwu:192.168.70.134"
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
docker-compose/docker-compose-basic-nrf-http2.yaml
+ 0
− 7
View file @ 714e2347
......@@ -252,13 +252,6 @@ services:
depends_on:
- oai-nrf
- oai-amf
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
docker-compose/docker-compose-basic-nrf.yaml
+ 0
− 7
View file @ 714e2347
......@@ -255,13 +255,6 @@ services:
depends_on:
- oai-nrf
- oai-amf
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
docker-compose/docker-compose-basic-vpp-nonrf.yaml
+ 0
− 7
View file @ 714e2347
......@@ -206,13 +206,6 @@ services:
- "gw1.vppupf.node.5gcn.mnc95.mcc208.3gppnetwork.org:192.168.70.202"
depends_on:
- oai-amf
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
docker-compose/docker-compose-basic-vpp-nrf-http2.yaml
+ 0
− 7
View file @ 714e2347
......@@ -229,13 +229,6 @@ services:
- "gw1.vppupf.node.5gcn.mnc95.mcc208.3gppnetwork.org:192.168.70.202"
depends_on:
- oai-amf
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
docker-compose/docker-compose-basic-vpp-nrf.yaml
+ 0
− 7
View file @ 714e2347
......@@ -221,13 +221,6 @@ services:
- "gw1.vppupf.node.5gcn.mnc95.mcc208.3gppnetwork.org:192.168.70.202"
depends_on:
- oai-amf
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
docker-compose/docker-compose-mini-nonrf.yaml
+ 0
− 7
View file @ 714e2347
......@@ -152,15 +152,8 @@ services:
- ENABLE_USAGE_REPORTING=no # Set yes if UE USAGE REPORTING is to be done at UPF
depends_on:
- oai-amf
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
extra_hosts:
- "oai-spgwu:192.168.70.134"
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
docker-compose/docker-compose-mini-nrf.yaml
+ 0
− 7
View file @ 714e2347
......@@ -167,13 +167,6 @@ services:
depends_on:
- oai-nrf
- oai-amf
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
docker-compose/docker-compose-no-privilege.yaml
+ 0
− 7
View file @ 714e2347
......@@ -169,13 +169,6 @@ services:
depends_on:
- oai-nrf
- oai-amf
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
docker-compose/docker-compose-slicing-basic-nrf.yaml
+ 0
− 21
View file @ 714e2347
......@@ -249,13 +249,6 @@ services:
depends_on:
- oai_amf
- oai_nrf_slice12
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.139
......@@ -295,13 +288,6 @@ services:
depends_on:
- oai_amf
- oai_nrf_slice12
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.140
......@@ -344,13 +330,6 @@ services:
- oai_nrf_slice3
extra_hosts:
- "gw1.vppupf.node.5gcn.mnc95.mcc208.3gppnetwork.org:192.168.70.202"
volumes:
- ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
healthcheck:
test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.141
......
docker-compose/healthscripts/smf-healthcheck.sh deleted 100755 → 0
+ 0
− 20
View file @ ab8e0986
#!/bin/bash
set -eo pipefail
STATUS=0
SMF_IP_SBI_INTERFACE=$(ifconfig $SMF_INTERFACE_NAME_FOR_SBI | grep inet | awk {'print $2'})
#Check if entrypoint properly configured the conf file and no parameter is unset(optional)
SMF_SBI_PORT_STATUS=$(netstat -tnpl | grep -o "$SMF_IP_SBI_INTERFACE:$SMF_INTERFACE_PORT_FOR_SBI")
NB_UNREPLACED_AT=`cat /openair-smf/etc/*.conf | grep -v contact@openairinterface.org | grep -c @ || true`
if [ $NB_UNREPLACED_AT -ne 0 ]; then
STATUS=-1
echo "Healthcheck error: UNHEALTHY configuration file is not configured properly"
fi
if [[ -z $SMF_SBI_PORT_STATUS ]]; then
STATUS=-1
echo "Healthcheck error: UNHEALTHY SBI TCP/HTTP port $SMF_INTERFACE_PORT_FOR_SBI is not listening."
fi
exit $STATUS
docs/DEBUG_5G_CORE.md
+ 0
− 6
View file @ 714e2347
......@@ -229,15 +229,9 @@ services:
depends_on:
- oai-amf
volumes:
- ./healthchecks/smf-healthcheck.sh:/tmp/smf-healthcheck.sh
- ./entrypoints/smf-entrypoint.sh:/openair-smf/bin/smf-entrypoint.sh
- ./confs/smf.conf:/openair-smf/etc/smf.conf
- ./logs/smf.log:/openair-smf/etc/smf.log:rw
healthcheck:
test: /bin/bash -c "/tmp/smf-healthcheck.sh"
interval: 10s
timeout: 5s
retries: 5
networks:
public_net:
ipv4_address: 192.168.70.133
......
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