diff --git a/ci-scripts/ci_ueinfra.yaml b/ci-scripts/ci_ueinfra.yaml
index 619e8fba15..ccb03299c5 100644
--- a/ci-scripts/ci_ueinfra.yaml
+++ b/ci-scripts/ci_ueinfra.yaml
@@ -30,6 +30,8 @@ nrmodule2_quectel:
HostUsername : nrmodule2
HostPassword : linux
HostSourceCodePath : none
+ StartCommands :
+ - sudo -S ip link set dev wwan1 mtu 1500
dummy:
ID: ''
State : ''
diff --git a/ci-scripts/cls_oaicitest.py b/ci-scripts/cls_oaicitest.py
index f1ab8c106f..0b6ed88f85 100644
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -400,10 +400,18 @@ class OaiCiTest():
if status==0:
HTML.CreateHtmlTestRow(Module_UE.UEIPAddress, 'OK', CONST.ALL_PROCESSES_OK)
logging.debug('UE IP addresss : '+ Module_UE.UEIPAddress)
+ #execute additional commands from yaml file after UE attach
+ SSH = sshconnection.SSHConnection()
+ SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
+ for startcommand in Module_UE.StartCommands:
+ cmd = 'echo ' + EPC.Password + ' | ' + startcommand
+ SSH.command(cmd,'\$',5)
+ SSH.close()
else: #status==-1 failed to retrieve IP address
HTML.CreateHtmlTestRow('N/A', 'KO', CONST.UE_IP_ADDRESS_ISSUE)
self.AutoTerminateUEandeNB(HTML,RAN,COTS_UE,EPC,InfraUE)
return
+
def InitializeOAIUE(self,HTML,RAN,EPC,COTS_UE,InfraUE):
@@ -2231,12 +2239,6 @@ class OaiCiTest():
def Iperf_Module(self, lock, UE_IPAddress, device_id, idx, ue_num, statusQueue,EPC, Module_UE):
SSH = sshconnection.SSHConnection()
- #RH temporary quick n dirty for test
- SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
- cmd = 'echo ' + EPC.Password + ' | sudo -S ip link set dev tun5 mtu 1358'
- SSH.command(cmd,'\$',5)
- SSH.close()
-
#kill iperf processes before (in case there are still some remaining)
SSH.open(Module_UE.HostIPAddress, Module_UE.HostUsername, Module_UE.HostPassword)
diff --git a/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
index db0802fdd7..3c355c48fa 100644
--- a/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
@@ -14,7 +14,7 @@ eNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
- plmn_list = ( { mcc = 208; mnc = 99; mnc_length = 2; } );
+ plmn_list = ( { mcc = 208; mnc = 97; mnc_length = 2; } );
tr_s_preference = "local_mac"
diff --git a/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf b/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
index 24dbdbd74b..e7dbe4dd5f 100644
--- a/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf
@@ -13,7 +13,7 @@ gNBs =
// Tracking area code, 0x0000 and 0xfffe are reserved values
tracking_area_code = 1;
- plmn_list = ({mcc = 208; mnc = 99; mnc_length = 2;});
+ plmn_list = ({mcc = 208; mnc = 97; mnc_length = 2;});
tr_s_preference = "local_mac"
diff --git a/ci-scripts/xml_files/fr1_enb_build.xml b/ci-scripts/xml_files/fr1_enb_build.xml
new file mode 100644
index 0000000000..084f58a591
--- /dev/null
+++ b/ci-scripts/xml_files/fr1_enb_build.xml
@@ -0,0 +1,50 @@
+
+
+ build-tab
+ Build
+ wrench
+
+ 000001
+ 000002
+
+
+
+
+ Build_eNB
+ Build eNB
+ -w USRP -c --eNB --ninja
+ 0
+ 0
+ True
+ True
+
+
+
+ WaitEndBuild_eNB
+ Wait for end of Build eNB
+ 0
+ 0
+
+
+
diff --git a/ci-scripts/xml_files/fr1_lte_2x2_quectel.xml b/ci-scripts/xml_files/fr1_lte_2x2_quectel.xml
new file mode 100644
index 0000000000..6afd92ef43
--- /dev/null
+++ b/ci-scripts/xml_files/fr1_lte_2x2_quectel.xml
@@ -0,0 +1,145 @@
+
+
+ TEST-LTE-TM2
+ LTE 2x2 Ping DL UL with QUECTEL
+ tasks
+ 1
+
+ 030000
+ 000002
+ 010000
+ 000001
+ 050000
+ 050001
+ 000001
+ 010002
+ 080000
+
+
+
+
+ Initialize_UE
+ Initialize Quectel
+ nrmodule2_quectel
+ yes
+
+
+
+
+ Terminate_UE
+ Terminate Quectel
+ nrmodule2_quectel
+
+
+
+
+ Initialize_eNB
+ Initialize eNB
+ -O ci-scripts/conf_files/enb.band38.nsa_2x2.100PRB.usrpn310.conf
+ 0
+ 0
+ lte
+ yes
+ 192.168.18.241
+
+
+
+
+ Initialize_eNB
+ Initialize gNB
+ -O ci-scripts/conf_files/gnb.band78.nsa_2x2.106PRB.usrpn310.conf -q
+ 1
+ 1
+ nr
+ 192.168.18.240
+
+
+
+ IdleSleep
+ Sleep
+ 5
+
+
+
+ IdleSleep
+ Sleep
+ 20
+
+
+
+
+ Ping
+ Ping: 20 pings in 20sec
+ nrmodule2_quectel
+ -c 20 -s 2048
+ 50
+
+
+
+ Ping
+ Ping: 100 pings in 20sec
+ nrmodule2_quectel
+ -c 100 -i 0.2 -s 2048
+ 50
+
+
+
+ Iperf
+ iperf (DL/20Mbps/UDP)(60 sec)(single-ue profile)
+ -u -b 20M -t 60
+ DL
+ nrmodule2_quectel
+ 50
+ single-ue
+
+
+
+ Iperf
+ iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)
+ -u -b 3M -t 60
+ UL
+ nrmodule2_quectel
+ 50
+ single-ue
+
+
+
+
+ Terminate_eNB
+ Terminate eNB
+ 0
+ 0
+ lte
+
+
+
+ Terminate_eNB
+ Terminate gNB
+ 1
+ 1
+ nr
+
+
+
+
diff --git a/ci-scripts/xml_files/fr1_oai_cn_deploy.xml b/ci-scripts/xml_files/fr1_oai_cn_deploy.xml
index 919def7aa3..1ccc952c56 100644
--- a/ci-scripts/xml_files/fr1_oai_cn_deploy.xml
+++ b/ci-scripts/xml_files/fr1_oai_cn_deploy.xml
@@ -33,7 +33,7 @@
Deploy_EPC
Deploy all EPC containers
- yaml_files/fr1_epc_tim
+ yaml_files/fr1_epc_20897
diff --git a/ci-scripts/yaml_files/fr1_epc_tim/docker-compose.yml b/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
similarity index 96%
rename from ci-scripts/yaml_files/fr1_epc_tim/docker-compose.yml
rename to ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
index 73a6b3a1ff..31eee2ca3d 100644
--- a/ci-scripts/yaml_files/fr1_epc_tim/docker-compose.yml
+++ b/ci-scripts/yaml_files/fr1_epc_20897/docker-compose.yml
@@ -51,7 +51,7 @@ services:
LTE_K: FEC86BA6EB707ED08905757B1BB44B8F
APN1: oai.ipv4
APN2: oai2.ipv4
- FIRST_IMSI: 208990100001127
+ FIRST_IMSI: 208970100001127
NB_USERS: 5
healthcheck:
test: /bin/bash -c "pgrep oai_hss"
@@ -78,7 +78,7 @@ services:
HSS_FQDN: hss.openairinterface.org
HSS_REALM: openairinterface.org
MCC: '208'
- MNC: '99'
+ MNC: '97'
MME_GID: 32768
MME_CODE: 3
TAC_0: 1
@@ -97,15 +97,15 @@ services:
PEER_MME_IPV4_ADDRESS_FOR_S10_0: 0.0.0.0
PEER_MME_IPV4_ADDRESS_FOR_S10_1: 0.0.0.0
MCC_SGW_0: '208'
- MNC3_SGW_0: '099'
+ MNC3_SGW_0: '097'
TAC_LB_SGW_0: '01'
TAC_HB_SGW_0: '00'
MCC_MME_0: '208'
- MNC3_MME_0: '099'
+ MNC3_MME_0: '097'
TAC_LB_MME_0: '02'
TAC_HB_MME_0: '00'
MCC_MME_1: '208'
- MNC3_MME_1: '099'
+ MNC3_MME_1: '097'
TAC_LB_MME_1: '03'
TAC_HB_MME_1: '00'
TAC_LB_SGW_TEST_0: '03'
@@ -138,8 +138,8 @@ services:
UE_IP_ADDRESS_POOL_1: '12.1.1.2 - 12.1.1.254'
UE_IP_ADDRESS_POOL_2: '12.0.0.2 - 12.0.0.254'
MCC: '208'
- MNC: '99'
- MNC03: '099'
+ MNC: '97'
+ MNC03: '097'
TAC: 1
GW_ID: 1
REALM: openairinterface.org
@@ -168,8 +168,8 @@ services:
NETWORK_UE_IP: '12.1.1.0/24'
NETWORK_UE_NAT_OPTION: 'yes'
MCC: '208'
- MNC: '99'
- MNC03: '099'
+ MNC: '97'
+ MNC03: '097'
TAC: 1
GW_ID: 1
REALM: openairinterface.org
diff --git a/ci-scripts/yaml_files/fr1_epc_tim/docker-compose.yml.orig b/ci-scripts/yaml_files/fr1_epc_tim/docker-compose.yml.orig
deleted file mode 100644
index 28ae154838..0000000000
--- a/ci-scripts/yaml_files/fr1_epc_tim/docker-compose.yml.orig
+++ /dev/null
@@ -1,203 +0,0 @@
-version: '3.8'
-
-services:
- cassandra:
- image: cassandra:2.1
- container_name: prod-cassandra
- networks:
- private_net:
- ipv4_address: 192.168.68.2
- environment:
- CASSANDRA_CLUSTER_NAME: "OAI HSS Cluster"
- CASSANDRA_ENDPOINT_SNITCH: GossipingPropertyFileSnitch
- healthcheck:
- test: /bin/bash -c "nodetool status"
- interval: 10s
- timeout: 5s
- retries: 5
-
- db_init:
- image: cassandra:2.1
- container_name: prod-db-init
- depends_on: [cassandra]
- deploy:
- restart_policy:
- condition: on-failure
- max_attempts: 10
- networks:
- private_net:
- ipv4_address: 192.168.68.4
- volumes:
- - ./oai_db.cql:/home/oai_db.cql
- entrypoint: /bin/bash -c "cqlsh --file /home/oai_db.cql 192.168.68.2 && echo 'OK'"
-
- oai_hss:
- image: oai-hss:production
- container_name: prod-oai-hss
- privileged: true
- depends_on: [cassandra]
- networks:
- private_net:
- ipv4_address: 192.168.68.3
- public_net:
- ipv4_address: 192.168.61.2
- environment:
- REALM: openairinterface.org
- HSS_FQDN: hss.openairinterface.org
- PREFIX: /openair-hss/etc
- cassandra_Server_IP: 192.168.68.2
- OP_KEY: 1006020f0a478bf6b699f15c062e42b3
- LTE_K: fec86ba6eb707ed08905757b1bb44b8f
- APN1: oai.ipv4
- APN2: internet
- FIRST_IMSI: 222010100001120
- NB_USERS: 10
- healthcheck:
- test: /bin/bash -c "pgrep oai_hss"
- interval: 10s
- timeout: 5s
- retries: 5
-
- oai_mme:
- image: oai-mme:production
- container_name: prod-oai-mme
- privileged: true
- depends_on: [oai_hss]
- networks:
- public_net:
- ipv4_address: 192.168.61.3
- environment:
- REALM: openairinterface.org
- PREFIX: /openair-mme/etc
- INSTANCE: 1
- PID_DIRECTORY: /var/run
- HSS_IP_ADDR: 192.168.61.2
- HSS_HOSTNAME: hss
- HSS_FQDN: hss.openairinterface.org
- HSS_REALM: openairinterface.org
- MCC: '222'
- MNC: '01'
- MME_GID: 32768
- MME_CODE: 3
- TAC_0: 1
- TAC_1: 2
- TAC_2: 3
- MME_FQDN: mme.openairinterface.org
- MME_S6A_IP_ADDR: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S1_MME: eth0
- MME_IPV4_ADDRESS_FOR_S1_MME: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S11: eth0
- MME_IPV4_ADDRESS_FOR_S11: 192.168.61.3
- MME_INTERFACE_NAME_FOR_S10: lo
- MME_IPV4_ADDRESS_FOR_S10: 127.0.0.10
- OUTPUT: CONSOLE
- SGW_IPV4_ADDRESS_FOR_S11_0: 192.168.61.4
- PEER_MME_IPV4_ADDRESS_FOR_S10_0: 0.0.0.0
- PEER_MME_IPV4_ADDRESS_FOR_S10_1: 0.0.0.0
- MCC_SGW_0: '222'
- MNC3_SGW_0: '001'
- TAC_LB_SGW_0: '01'
- TAC_HB_SGW_0: '00'
- MCC_MME_0: '222'
- MNC3_MME_0: '001'
- TAC_LB_MME_0: '02'
- TAC_HB_MME_0: '00'
- MCC_MME_1: '222'
- MNC3_MME_1: '001'
- TAC_LB_MME_1: '03'
- TAC_HB_MME_1: '00'
- TAC_LB_SGW_TEST_0: '03'
- TAC_HB_SGW_TEST_0: '00'
- SGW_IPV4_ADDRESS_FOR_S11_TEST_0: 0.0.0.0
- healthcheck:
- test: /bin/bash -c "pgrep oai_mme"
- interval: 10s
- timeout: 5s
- retries: 5
-
- oai_spgwc:
- image: oai-spgwc:production
- privileged: true
- depends_on: [oai_mme]
- container_name: prod-oai-spgwc
- networks:
- public_net:
- ipv4_address: 192.168.61.4
- environment:
- PID_DIRECTORY: /var/run
- SGW_INTERFACE_NAME_FOR_S11: eth0
- SGW_IP_FOR_S5_S8_CP: 127.0.0.11/8
- PGW_IP_FOR_S5_S8_CP: 127.0.0.12/8
- PGW_INTERFACE_NAME_FOR_SX: eth0
- DEFAULT_APN: oai.ipv4
- DEFAULT_DNS_IPV4_ADDRESS: 192.168.18.129
- DEFAULT_DNS_SEC_IPV4_ADDRESS: 8.8.4.4
- UE_IP_ADDRESS_POOL: '12.1.1.2 - 12.1.1.254'
- PUSH_PROTOCOL_OPTION: 'yes'
- healthcheck:
- test: /bin/bash -c "pgrep oai_spgwc"
- interval: 10s
- timeout: 5s
- retries: 5
-
- oai_spgwu:
- image: oai-spgwu-tiny:production
- privileged: true
- container_name: prod-oai-spgwu-tiny
- depends_on: [oai_spgwc]
- networks:
- public_net:
- ipv4_address: 192.168.61.5
- environment:
- PID_DIRECTORY: /var/run
- INSTANCE: 1
- SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP: eth0
- PGW_INTERFACE_NAME_FOR_SGI: eth0
- SGW_INTERFACE_NAME_FOR_SX: eth0
- SPGWC0_IP_ADDRESS: 192.168.61.4
- NETWORK_UE_IP: '12.1.1.0/24'
- NETWORK_UE_NAT_OPTION: 'yes'
- healthcheck:
- test: /bin/bash -c "pgrep oai_spgwu"
- interval: 10s
- timeout: 5s
- retries: 5
-
- flexran_rtc:
- image: flexran-rtc:production
- privileged: true
- container_name: prod-flexran-rtc
- networks:
- public_net:
- ipv4_address: 192.168.61.10
- healthcheck:
- test: /bin/bash -c "pgrep rt_controller"
- interval: 10s
- timeout: 5s
- retries: 5
-
- trf_gen:
- image: trf-gen:production
- privileged: true
- container_name: prod-trf-gen
- networks:
- public_net:
- ipv4_address: 192.168.61.11
- entrypoint: /bin/bash -c "ip route add 12.1.1.0/24 via 192.168.61.5 dev eth0; sleep infinity"
- healthcheck:
- test: /bin/bash -c "ping -c 2 192.168.61.5"
- interval: 10s
- timeout: 5s
- retries: 5
-
-networks:
- private_net:
- name: prod-oai-private-net
- ipam:
- config:
- - subnet: 192.168.68.0/26
- public_net:
- name: prod-oai-public-net
- ipam:
- config:
- - subnet: 192.168.61.0/26