vpp docker-compose fix

docker-compose/docker-compose-basic-vpp-nrf.yaml

@@ -4,8 +4,8 @@ services:
         container_name: "mysql"
         image: mysql:5.7
         volumes:
-            - ./oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
-            - ./mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh
+            - ./database/oai_db2.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ./healthscripts/mysql-healthcheck2.sh:/tmp/mysql-healthcheck.sh
         environment:
             - TZ=Europe/Paris
             - MYSQL_DATABASE=oai_db
@@ -31,15 +31,13 @@ services:
             - UDR_INTERFACE_NAME_FOR_NUDR=eth0
             - UDR_INTERFACE_PORT_FOR_NUDR=80
             - UDR_INTERFACE_HTTP2_PORT_FOR_NUDR=8080
-            - USE_HTTP2=no
             - UDR_API_VERSION=v1
             - MYSQL_IPV4_ADDRESS=192.168.70.131
             - MYSQL_USER=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
             - WAIT_MYSQL=120
-            - USE_FQDN_DNS=yes
+            - USE_FQDN_DNS=no
             - REGISTER_NRF=yes
             - NRF_IPV4_ADDRESS=192.168.70.130
             - NRF_PORT=80
@@ -52,7 +50,7 @@ services:
             public_net:
                 ipv4_address: 192.168.70.136
         volumes:
-            - ./udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh
+            - ./healthscripts/udr-healthcheck.sh:/openair-udr/bin/udr-healthcheck.sh
         healthcheck:
             test: /bin/bash -c "/openair-udr/bin/udr-healthcheck.sh"
             interval: 10s
@@ -68,10 +66,8 @@ services:
             - UDM_NAME=OAI_UDM
             - SBI_IF_NAME=eth0
             - SBI_PORT=80
-            - SBI_HTTP2_PORT=8080
-            - USE_HTTP2=no
             - UDM_VERSION_NB=v1
-            - USE_FQDN_DNS=yes
+            - USE_FQDN_DNS=no
             - UDR_IP_ADDRESS=192.168.70.136
             - UDR_PORT=80
             - UDR_VERSION_NB=v1
@@ -87,7 +83,7 @@ services:
             public_net:
                 ipv4_address: 192.168.70.137
         volumes:
-            - ./udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh
+            - ./healthscripts/udm-healthcheck.sh:/openair-udm/bin/udm-healthcheck.sh
         healthcheck:
             test: /bin/bash -c "/openair-udm/bin/udm-healthcheck.sh"
             interval: 10s
@@ -103,9 +99,7 @@ services:
             - AUSF_NAME=OAI_AUSF
             - SBI_IF_NAME=eth0
             - SBI_PORT=80
-            - USE_HTTP2
-            - SBI_HTTP2_PORT
-            - USE_FQDN_DNS=yes
+            - USE_FQDN_DNS=no
             - UDM_IP_ADDRESS=192.168.70.137
             - UDM_PORT=80
             - UDM_VERSION_NB=v1
@@ -121,7 +115,7 @@ services:
             public_net:
                 ipv4_address: 192.168.70.138
         volumes:
-            - ./ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh
+            - ./healthscripts/ausf-healthcheck.sh:/openair-ausf/bin/ausf-healthcheck.sh
         healthcheck:
             test: /bin/bash -c "/openair-ausf/bin/ausf-healthcheck.sh"
             interval: 10s
@@ -141,7 +135,7 @@ services:
             public_net:
                 ipv4_address: 192.168.70.130
         volumes:
-            - ./nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
+            - ./healthscripts/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
         healthcheck:
             test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
             interval: 10s
@@ -169,12 +163,10 @@ services:
             - PLMN_SUPPORT_MCC=208
             - PLMN_SUPPORT_MNC=95
             - PLMN_SUPPORT_TAC=0xa000
-            - SST_0=1
-            - SD_0=0xFFFFFF
+            - SST_0=222
+            - SD_0=123
             - SST_1=1
-            - SD_1=1
-            - SST_2=222
-            - SD_2=123
+            - SD_1=12
             - AMF_INTERFACE_NAME_FOR_NGAP=eth0
             - AMF_INTERFACE_NAME_FOR_N11=eth0
             - SMF_INSTANCE_ID_0=1
@@ -194,14 +186,11 @@ services:
             - OPERATOR_KEY=63bfa50ee6523365ff14c1f45f88737d
             - NRF_IPV4_ADDRESS=192.168.70.130
             - NRF_PORT=80
-            - EXTERNAL_NRF=no
+            - EXTERNAL_NRF=yes
             - NF_REGISTRATION=yes
             - SMF_SELECTION=yes
-            - USE_FQDN_DNS=yes
+            - USE_FQDN_DNS=no
             - EXTERNAL_AUSF=yes
-            - EXTERNAL_UDM=no
-            - EXTERNAL_NSSF=no
-            - USE_HTTP2=no
             - NRF_API_VERSION=v1
             - NRF_FQDN=oai-nrf
             - AUSF_IPV4_ADDRESS=192.168.70.138
@@ -218,7 +207,7 @@ services:
             - oai-ext-dn
             - oai-ausf
         volumes:
-            - ./amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
+            - ./healthscripts/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
         healthcheck:
             test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
             interval: 10s
@@ -268,7 +257,7 @@ services:
         depends_on:
             - oai-amf
         volumes:
-             - ./smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
+             - ./healthscripts/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
         healthcheck:
              test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
              interval: 10s
@@ -319,7 +308,7 @@ services:
             public_net_core:
                 ipv4_address: 192.168.73.134
     oai-ext-dn:
-        image: image: trf-gen-cn5g:latest
+        image: trf-gen-cn5g:latest
         privileged: true
         container_name: "oai-ext-dn"
         entrypoint: /bin/bash -c \