Merge branch 'api_version_udm_udr' into 'master'

Temporarily update API version of UDM/UDR to v2 instead of v1

See merge request oai/cn5g/oai-cn5g-fed!23

charts/oai-smf/values.yaml

@@ -72,7 +72,7 @@ config:
   amfFqdn: "oai-amf-svc" # configure if NRF is not used
   udmIpv4Address: "127.0.0.1" # configure if UDM is used
   udmPort: "80" # configure if UDM is used
-  udmApiVersion: "v1" # configure if UDM is used
+  udmApiVersion: "v2" # configure if UDM is used
   udmFqdn: "localhost" # configure if UDM is used
   nrfIpv4Address: "127.0.0.1" # configure if NRF can only be reached using ip-address
   nrfPort : "80" 

ci-scripts/charts/oai-smf/values.yaml

@@ -71,7 +71,7 @@ config:
   amfFqdn: "oai-smf-svc"
   udmIpv4Address: "127.0.0.1"
   udmPort: "80"
-  udmApiVersion: "v1"
+  udmApiVersion: "v2"
   udmFqdn: "localhost"
   nrfIpv4Address: "127.0.0.1"
   nrfPort : "80"

ci-scripts/charts/oai-udr/values.yaml

@@ -59,7 +59,7 @@ config:
   udrInterfaceNameForNudr: "eth0"
   udrInterfaceHttp1PortForNudr: "80"
   udrInterfaceHttp2PortForNudr: "8080"
-  udrApiVersion: "v1"
+  udrApiVersion: "v2"
   mySqlServer: "mysql"
   mySqlUser: "root"
   mySqlPass: "linux"

ci-scripts/dsTesterDockerCompose/docker-compose.tplt

@@ -40,7 +40,7 @@ services:
             - UDR_INTERFACE_NAME_FOR_NUDR=eth0
             - UDR_INTERFACE_PORT_FOR_NUDR=80
             - UDR_INTERFACE_HTTP2_PORT_FOR_NUDR=8080
-            - UDR_API_VERSION=v1
+            - UDR_API_VERSION=v2
             - MYSQL_IPV4_ADDRESS=192.168.61.194
             - MYSQL_USER=test
             - MYSQL_PASS=test
@@ -270,7 +270,7 @@ services:
             - AMF_FQDN=cicd_oai_amf
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UDM_FQDN=localhost
             - UPF_IPV4_ADDRESS=192.168.61.198
             - UPF_FQDN_0=cicd_oai_upf

docker-compose/docker-compose-no-nrf.yaml

@@ -105,7 +105,7 @@ services:
             - AMF_FQDN=oai-amf
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UDM_FQDN=localhost
             - UPF_IPV4_ADDRESS=192.168.70.134
             - UPF_FQDN_0=oai-upf

docker-compose/docker-compose-no-privilege.yaml

@@ -125,7 +125,7 @@ services:
             - AMF_FQDN=oai-amf
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UDM_FQDN=localhost
             - UPF_IPV4_ADDRESS=192.168.70.134
             - UPF_FQDN_0=oai-spgwu

docker-compose/docker-compose-vpp-upf.yaml

@@ -100,7 +100,7 @@ services:
             - AMF_API_VERSION=v1
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UPF_IPV4_ADDRESS=192.168.71.202
             - NRF_IPV4_ADDRESS=0.0.0.0
             - NRF_PORT=80

docker-compose/docker-compose.yaml

@@ -125,7 +125,7 @@ services:
             - AMF_FQDN=oai-amf
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UDM_FQDN=localhost
             - UPF_IPV4_ADDRESS=192.168.70.134
             - UPF_FQDN_0=oai-spgwu