From cf864cbb593f3a4c94bf8619c05cd6fed6b536d3 Mon Sep 17 00:00:00 2001 From: hardy Date: Mon, 15 Mar 2021 11:00:22 +0100 Subject: [PATCH] updaing ci files for benetel test --- ci-scripts/conf_files/benetel-4g.conf | 6 +++--- ci-scripts/conf_files/benetel-5g.conf | 6 +++--- ci-scripts/xml_files/benetel_multi_node_build.xml | 4 ++-- ci-scripts/xml_files/benetel_nsa_base.xml | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ci-scripts/conf_files/benetel-4g.conf b/ci-scripts/conf_files/benetel-4g.conf index aab3876d96..9423ebe56e 100644 --- a/ci-scripts/conf_files/benetel-4g.conf +++ b/ci-scripts/conf_files/benetel-4g.conf @@ -176,7 +176,7 @@ eNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; + mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; ipv6 = "192:168:30::17"; active = "yes"; preference = "ipv4"; @@ -195,9 +195,9 @@ eNBs = NETWORK_INTERFACES : { ENB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.196"; + ENB_IPV4_ADDRESS_FOR_S1_MME = "CI_ENB_IP_ADDR"; ENB_INTERFACE_NAME_FOR_S1U = "eth0"; - ENB_IPV4_ADDRESS_FOR_S1U = "192.168.18.196"; + ENB_IPV4_ADDRESS_FOR_S1U = "CI_ENB_IP_ADDR"; ENB_PORT_FOR_S1U = 2152; # Spec 2152 ENB_IPV4_ADDRESS_FOR_X2C = "127.0.0.1"; ENB_PORT_FOR_X2C = 36422; # Spec 36422 diff --git a/ci-scripts/conf_files/benetel-5g.conf b/ci-scripts/conf_files/benetel-5g.conf index 504d5e7b34..0dfe7854ee 100644 --- a/ci-scripts/conf_files/benetel-5g.conf +++ b/ci-scripts/conf_files/benetel-5g.conf @@ -210,7 +210,7 @@ gNBs = ////////// MME parameters: - mme_ip_address = ( { ipv4 = "192.168.18.99"; + mme_ip_address = ( { ipv4 = "CI_MME_IP_ADDR"; ipv6 = "192:168:30::17"; active = "yes"; preference = "ipv4"; @@ -234,9 +234,9 @@ gNBs = { GNB_INTERFACE_NAME_FOR_S1_MME = "eth0"; - GNB_IPV4_ADDRESS_FOR_S1_MME = "192.168.18.187/24"; + GNB_IPV4_ADDRESS_FOR_S1_MME = "CI_GNB_IP_ADDR"; GNB_INTERFACE_NAME_FOR_S1U = "eth0"; - GNB_IPV4_ADDRESS_FOR_S1U = "192.168.18.187/24"; + GNB_IPV4_ADDRESS_FOR_S1U = "CI_GNB_IP_ADDR"; GNB_PORT_FOR_S1U = 2152; # Spec 2152 GNB_IPV4_ADDRESS_FOR_X2C = "127.0.0.2/24"; GNB_PORT_FOR_X2C = 36422; # Spec 36422 diff --git a/ci-scripts/xml_files/benetel_multi_node_build.xml b/ci-scripts/xml_files/benetel_multi_node_build.xml index 7b4eacef3a..6f9ebdd1d1 100644 --- a/ci-scripts/xml_files/benetel_multi_node_build.xml +++ b/ci-scripts/xml_files/benetel_multi_node_build.xml @@ -33,7 +33,7 @@ Build_eNB Build eNB - -w USRP -c --eNB --ninja + --eNB -t benetel4g -w None 0 0 True @@ -49,7 +49,7 @@ Build_eNB Build gNB - -w USRP -c --gNB --ninja + --gNB -t benetel5g -w None 1 1 True diff --git a/ci-scripts/xml_files/benetel_nsa_base.xml b/ci-scripts/xml_files/benetel_nsa_base.xml index 3c584f121c..cf0b69debf 100644 --- a/ci-scripts/xml_files/benetel_nsa_base.xml +++ b/ci-scripts/xml_files/benetel_nsa_base.xml @@ -21,7 +21,7 @@ --> - TEST-FR1-TM1 + BENETEL TEST-FR1-TM1 FR1 tasks