Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions composes/build/docker-compose-e2e-basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ services:
ipv4_address: 10.100.200.18
depends_on:
- free5gc-nrf
healthcheck:
test: ["CMD", "nc", "-z", "-w", "1", "amf.free5gc.org", "8000"]
interval: 1s
timeout: 1s
retries: 30

free5gc-ausf: # ausf
container_name: ausf
Expand Down Expand Up @@ -288,16 +293,26 @@ services:
ran-ue:
ipv4_address: 10.0.2.3
depends_on:
- free5gc-amf
- free5gc-ausf
- free5gc-chf
- free5gc-nrf
- free5gc-nssf
- free5gc-pcf
- free5gc-smf
- free5gc-udm
- free5gc-udr
- free5gc-upf
free5gc-amf:
Comment thread
Alonza0314 marked this conversation as resolved.
condition: service_healthy
free5gc-ausf:
condition: service_started
free5gc-chf:
condition: service_started
free5gc-nrf:
condition: service_started
free5gc-nssf:
condition: service_started
free5gc-pcf:
condition: service_started
free5gc-smf:
condition: service_started
free5gc-udm:
condition: service_started
free5gc-udr:
condition: service_started
free5gc-upf:
condition: service_started

ue:
container_name: ue
Expand Down Expand Up @@ -340,4 +355,4 @@ networks:
com.docker.network.bridge.name: br-ran-ue

volumes:
dbdata:
dbdata:
106 changes: 72 additions & 34 deletions composes/build/docker-compose-e2e-ulcl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,11 @@ services:
ipv4_address: 10.100.200.18
depends_on:
- free5gc-nrf
healthcheck:
test: ["CMD", "nc", "-z", "-w", "1", "amf.free5gc.org", "8000"]
interval: 1s
timeout: 1s
retries: 30

free5gc-ausf: # ausf
container_name: ausf
Expand Down Expand Up @@ -433,17 +438,28 @@ services:
ran-ue-0:
ipv4_address: 10.0.0.2
depends_on:
- free5gc-amf
- free5gc-ausf
- free5gc-chf
- free5gc-nrf
- free5gc-nssf
- free5gc-pcf
- free5gc-smf
- free5gc-udm
- free5gc-udr
- free5gc-i-upf-0
- free5gc-psa-upf-0
free5gc-amf:
condition: service_healthy
free5gc-ausf:
condition: service_started
free5gc-chf:
condition: service_started
free5gc-nrf:
condition: service_started
free5gc-nssf:
condition: service_started
free5gc-pcf:
condition: service_started
free5gc-smf:
condition: service_started
free5gc-udm:
condition: service_started
free5gc-udr:
condition: service_started
free5gc-i-upf-0:
condition: service_started
free5gc-psa-upf-0:
condition: service_started

ue-0:
container_name: ue-0
Expand Down Expand Up @@ -480,17 +496,28 @@ services:
ran-ue-1:
ipv4_address: 10.0.1.2
depends_on:
- free5gc-amf
- free5gc-ausf
- free5gc-chf
- free5gc-nrf
- free5gc-nssf
- free5gc-pcf
- free5gc-smf
- free5gc-udm
- free5gc-udr
- free5gc-i-upf-1
- free5gc-psa-upf-1
free5gc-amf:
condition: service_healthy
free5gc-ausf:
condition: service_started
free5gc-chf:
condition: service_started
free5gc-nrf:
condition: service_started
free5gc-nssf:
condition: service_started
free5gc-pcf:
condition: service_started
free5gc-smf:
condition: service_started
free5gc-udm:
condition: service_started
free5gc-udr:
condition: service_started
free5gc-i-upf-1:
condition: service_started
free5gc-psa-upf-1:
condition: service_started

ue-1:
container_name: ue-1
Expand Down Expand Up @@ -527,17 +554,28 @@ services:
ran-ue-2:
ipv4_address: 10.0.2.2
depends_on:
- free5gc-amf
- free5gc-ausf
- free5gc-chf
- free5gc-nrf
- free5gc-nssf
- free5gc-pcf
- free5gc-smf
- free5gc-udm
- free5gc-udr
- free5gc-i-upf-2
- free5gc-psa-upf-2
free5gc-amf:
condition: service_healthy
free5gc-ausf:
condition: service_started
free5gc-chf:
condition: service_started
free5gc-nrf:
condition: service_started
free5gc-nssf:
condition: service_started
free5gc-pcf:
condition: service_started
free5gc-smf:
condition: service_started
free5gc-udm:
condition: service_started
free5gc-udr:
condition: service_started
free5gc-i-upf-2:
condition: service_started
free5gc-psa-upf-2:
condition: service_started

ue-2:
container_name: ue-2
Expand Down Expand Up @@ -612,4 +650,4 @@ networks:
com.docker.network.bridge.name: br-ran-ue-2

volumes:
dbdata:
dbdata:
35 changes: 25 additions & 10 deletions composes/docker-compose-ci-e2e-basic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,11 @@ services:
ipv4_address: 10.100.200.18
depends_on:
- free5gc-nrf
healthcheck:
test: ["CMD", "nc", "-z", "-w", "1", "amf.free5gc.org", "8000"]
interval: 1s
timeout: 1s
retries: 30

free5gc-ausf: # ausf
container_name: ausf
Expand Down Expand Up @@ -252,16 +257,26 @@ services:
ran-ue:
ipv4_address: 10.0.2.3
depends_on:
- free5gc-amf
- free5gc-ausf
- free5gc-chf
- free5gc-nrf
- free5gc-nssf
- free5gc-pcf
- free5gc-smf
- free5gc-udm
- free5gc-udr
- free5gc-upf
free5gc-amf:
condition: service_healthy
free5gc-ausf:
condition: service_started
free5gc-chf:
condition: service_started
free5gc-nrf:
condition: service_started
free5gc-nssf:
condition: service_started
free5gc-pcf:
condition: service_started
free5gc-smf:
condition: service_started
free5gc-udm:
condition: service_started
free5gc-udr:
condition: service_started
free5gc-upf:
condition: service_started

ue:
container_name: ue
Expand Down
106 changes: 72 additions & 34 deletions composes/docker-compose-ci-e2e-ulcl.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,11 @@ services:
ipv4_address: 10.100.200.18
depends_on:
- free5gc-nrf
healthcheck:
test: ["CMD", "nc", "-z", "-w", "1", "amf.free5gc.org", "8000"]
interval: 1s
timeout: 1s
retries: 30

free5gc-ausf: # ausf
container_name: ausf
Expand Down Expand Up @@ -382,17 +387,28 @@ services:
ran-ue-0:
ipv4_address: 10.0.0.2
depends_on:
- free5gc-amf
- free5gc-ausf
- free5gc-chf
- free5gc-nrf
- free5gc-nssf
- free5gc-pcf
- free5gc-smf
- free5gc-udm
- free5gc-udr
- free5gc-i-upf-0
- free5gc-psa-upf-0
free5gc-amf:
condition: service_healthy
free5gc-ausf:
condition: service_started
free5gc-chf:
condition: service_started
free5gc-nrf:
condition: service_started
free5gc-nssf:
condition: service_started
free5gc-pcf:
condition: service_started
free5gc-smf:
condition: service_started
free5gc-udm:
condition: service_started
free5gc-udr:
condition: service_started
free5gc-i-upf-0:
condition: service_started
free5gc-psa-upf-0:
condition: service_started

ue-0:
container_name: ue-0
Expand Down Expand Up @@ -429,17 +445,28 @@ services:
ran-ue-1:
ipv4_address: 10.0.1.2
depends_on:
- free5gc-amf
- free5gc-ausf
- free5gc-chf
- free5gc-nrf
- free5gc-nssf
- free5gc-pcf
- free5gc-smf
- free5gc-udm
- free5gc-udr
- free5gc-i-upf-1
- free5gc-psa-upf-1
free5gc-amf:
condition: service_healthy
free5gc-ausf:
condition: service_started
free5gc-chf:
condition: service_started
free5gc-nrf:
condition: service_started
free5gc-nssf:
condition: service_started
free5gc-pcf:
condition: service_started
free5gc-smf:
condition: service_started
free5gc-udm:
condition: service_started
free5gc-udr:
condition: service_started
free5gc-i-upf-1:
condition: service_started
free5gc-psa-upf-1:
condition: service_started

ue-1:
container_name: ue-1
Expand Down Expand Up @@ -476,17 +503,28 @@ services:
ran-ue-2:
ipv4_address: 10.0.2.2
depends_on:
- free5gc-amf
- free5gc-ausf
- free5gc-chf
- free5gc-nrf
- free5gc-nssf
- free5gc-pcf
- free5gc-smf
- free5gc-udm
- free5gc-udr
- free5gc-i-upf-2
- free5gc-psa-upf-2
free5gc-amf:
condition: service_healthy
free5gc-ausf:
condition: service_started
free5gc-chf:
condition: service_started
free5gc-nrf:
condition: service_started
free5gc-nssf:
condition: service_started
free5gc-pcf:
condition: service_started
free5gc-smf:
condition: service_started
free5gc-udm:
condition: service_started
free5gc-udr:
condition: service_started
free5gc-i-upf-2:
condition: service_started
free5gc-psa-upf-2:
condition: service_started

ue-2:
container_name: ue-2
Expand Down Expand Up @@ -561,4 +599,4 @@ networks:
com.docker.network.bridge.name: br-ran-ue-2

volumes:
dbdata:
dbdata:
3 changes: 0 additions & 3 deletions test/api-udr-ti-data-action.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,6 @@ set -e
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
TI_DATA_JSON="$SCRIPT_DIR/json/ti-data.json"

SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
TI_DATA_JSON="$SCRIPT_DIR/json/ti-data.json"

# ti data request
case "$1" in
"put")
Expand Down
Loading