diff --git a/ci-scripts/Jenkinsfile-trig-nsa b/ci-scripts/Jenkinsfile-trig-nsa
index 4a56270e90..7b4238d678 100644
--- a/ci-scripts/Jenkinsfile-trig-nsa
+++ b/ci-scripts/Jenkinsfile-trig-nsa
@@ -88,7 +88,15 @@ pipeline {
// booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
//]
//calling OAIUE N310
- build job: "RAN-SA-OAIUE-N310-CN5G", wait : true, propagate : false, parameters: [
+ //build job: "RAN-SA-OAIUE-N310-CN5G", wait : true, propagate : false, parameters: [
+ // string(name: 'eNB_MR', value: String.valueOf(MR)),
+ // string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
+ // string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
+ // string(name: 'eNB_TargetBranch', value: String.valueOf(TARGET_BRANCH)),
+ // booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
+ //]
+ //calling OAIUE N310-X300
+ build job: "RAN-SA-OAIUE-N310-X300-CN5G", wait : true, propagate : false, parameters: [
string(name: 'eNB_MR', value: String.valueOf(MR)),
string(name: 'eNB_Branch', value: String.valueOf(SRC_BRANCH)),
string(name: 'eNB_CommitID', value: String.valueOf(COMMIT_ID)),
@@ -96,7 +104,6 @@ pipeline {
booleanParam(name: 'eNB_mergeRequest', value: Boolean.valueOf(ALLOW_MERGE))
]
-
}
}
}
diff --git a/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf b/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
index d2e91fb872..758bb44879 100644
--- a/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
+++ b/ci-scripts/conf_files/enb.band38.lte_2x2.100PRB.usrpn310.conf
@@ -237,7 +237,7 @@ RUs = (
max_pdschReferenceSignalPower = -27;
max_rxgain = 75;
eNB_instances = [0];
- sdr_addrs = "mgmt_addr=192.168.18.241,addr=192.168.20.2,second_addr=192.168.10.2";
+ sdr_addrs = "mgmt_addr=192.168.18.241,addr=192.168.10.2";
}
);
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 6c8d5ba6f0..d1d32e2b58 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
@@ -237,7 +237,7 @@ RUs = (
max_pdschReferenceSignalPower = -27;
max_rxgain = 75;
eNB_instances = [0];
- sdr_addrs = "mgmt_addr=192.168.18.241,addr=192.168.20.2,second_addr=192.168.10.2";
+ sdr_addrs = "mgmt_addr=192.168.18.241,addr=192.168.10.2";
}
);
diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
index 86af12b53e..2516af9429 100644
--- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
+++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel.xml
@@ -24,7 +24,7 @@
TEST-NSA-FR1-TM2-Tab1
NSA 2x2 Ping DL UL with QUECTEL
tasks
- 5
+ 1
030000
040000
diff --git a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
index 2d17ff38e2..52cf1ec6e8 100644
--- a/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
+++ b/ci-scripts/xml_files/fr1_nsa_2x2_quectel_attach_detach.xml
@@ -24,7 +24,7 @@
TEST-NSA-FR1-TM2-Tab2
NSA 2x2 Attach-Detach with QUECTEL
tasks
- 5
+ 1
031000
041000
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
index 28eee1e224..cd79e49f2c 100644
--- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
@@ -22,7 +22,7 @@
-->
TEST-SA-FR1-Tab1
- SA Ping DL UL with OAI NR UE
+ SA Ping DL UL with OAI NR UE (N310)
tasks
1
@@ -40,9 +40,9 @@
Initialize_OAI_UE
- Initialize OAI UE
+ Initialize OAI UE (N310)
nr
- --sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "mgmt_addr=192.168.18.241,addr=192.168.20.2,second_addr=192.168.10.2" --numerology 1 -r 106 --band 78 -C 3319680000 --nokrnmod 1 --ue-txgain 0 --ue-rxgain 70 --ue-fo-compensation
+ --sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "mgmt_addr=192.168.18.241,second_addr=192.168.10.2" --numerology 1 -r 106 --band 78 -C 3319680000 --nokrnmod 1 --ue-txgain 0 --ue-rxgain 70 --ue-fo-compensation
diff --git a/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
new file mode 100644
index 0000000000..d527737b3c
--- /dev/null
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_x300.xml
@@ -0,0 +1,123 @@
+
+
+ TEST-SA-FR1-Tab2
+ SA Ping DL UL with OAI NR UE (X300)
+ tasks
+ 1
+
+ 040000
+ 000002
+ 010000
+ 000002
+ 050000
+ 050001
+ 000001
+ 010002
+ 080000
+
+
+
+
+ Initialize_OAI_UE
+ Initialize OAI UE (X300)
+ nr
+ --sa -O ../../../ci-scripts/conf_files/ue.sa.conf --usrp-args "addr=192.168.60.2" --numerology 1 -r 106 --band 78 -C 3319680000 --nokrnmod 1 --ue-txgain 0 --ue-rxgain 70 --ue-fo-compensation
+
+
+
+ Terminate_OAI_UE
+ Terminate OAI UE
+
+
+
+
+ Initialize_eNB
+ Initialize gNB
+ -O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf --sa --usrp-tx-thread-config 1
+ 0
+ 0
+ nr
+ yes
+ yes
+ 192.168.18.240
+
+
+
+ IdleSleep
+ Sleep
+ 5
+
+
+
+ IdleSleep
+ Sleep
+ 20
+
+
+
+
+ Ping
+ Ping from CN to UE: 20pings in 20sec
+ -c 20
+ 5
+
+
+
+ Ping
+ Ping from CN to UE: 100pings in 20sec
+ -c 100 -i 0.2
+ 5
+
+
+
+ Iperf
+ iperf (DL/60Mbps/UDP)(60 sec)(single-ue profile)
+ -u -b 60M -t 60
+ DL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+
+ Iperf
+ iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)
+ -u -b 3M -t 60
+ UL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+
+
+ Terminate_eNB
+ Terminate gNB
+ 0
+ 0
+ nr
+
+
+
+
diff --git a/ci-scripts/xml_files/fr1_sa_quectel_60MHz.xml b/ci-scripts/xml_files/fr1_sa_quectel_60MHz.xml
new file mode 100644
index 0000000000..2088678707
--- /dev/null
+++ b/ci-scripts/xml_files/fr1_sa_quectel_60MHz.xml
@@ -0,0 +1,129 @@
+
+
+ TEST-SA-FR1-Tab3
+ SA Ping DL UL with QUECTEL
+ tasks
+ 1
+
+ 040000
+ 000002
+ 010000
+ 000001
+ 050000
+ 050001
+ 070000
+ 070001
+ 000001
+ 010002
+ 080000
+
+
+
+
+ Initialize_UE
+ Initialize Quectel
+ nrmodule2_quectel
+ yes
+
+
+
+
+ Terminate_UE
+ Terminate Quectel
+ nrmodule2_quectel
+
+
+
+
+ Initialize_eNB
+ Initialize gNB
+ -O ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1
+ 0
+ 0
+ nr
+ yes
+ yes
+ 192.168.18.240
+
+
+
+ IdleSleep
+ Sleep
+ 5
+
+
+
+ IdleSleep
+ Sleep
+ 20
+
+
+
+
+ Ping
+ Ping: 20pings in 20sec
+ nrmodule2_quectel
+ -c 20
+ 5
+
+
+
+ Ping
+ Ping: 100pings in 20sec
+ nrmodule2_quectel
+ -c 100 -i 0,2
+ 5
+
+
+
+ Iperf
+ iperf (DL/140Mbps/UDP)(60 sec)(single-ue profile)
+ -u -b 140M -t 60
+ DL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+
+ Iperf
+ iperf (UL/3Mbps/UDP)(60 sec)(single-ue profile)
+ -u -b 3M -t 60
+ UL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+
+
+ Terminate_eNB
+ Terminate gNB
+ 0
+ 0
+ nr
+
+
+
+
diff --git a/ci-scripts/xml_files/fr1_sa_quectel_stages_60MHz.xml b/ci-scripts/xml_files/fr1_sa_quectel_stages_60MHz.xml
new file mode 100644
index 0000000000..4b2400a4ac
--- /dev/null
+++ b/ci-scripts/xml_files/fr1_sa_quectel_stages_60MHz.xml
@@ -0,0 +1,166 @@
+
+
+ TEST-SA-FR1-Tab4
+ SA Staged DL with QUECTEL
+ tasks
+ 1
+
+ 040000
+ 000002
+ 010000
+ 000001
+ 050000
+ 000001
+ 070000
+ 000001
+ 070001
+ 000001
+ 070002
+ 000001
+ 070003
+ 000001
+ 070004
+ 000001
+ 070005
+ 000001
+ 010002
+ 080000
+
+
+
+
+ Initialize_UE
+ Initialize Quectel
+ nrmodule2_quectel
+ yes
+
+
+
+
+ Terminate_UE
+ Terminate Quectel
+ nrmodule2_quectel
+
+
+
+
+ Initialize_eNB
+ Initialize gNB
+ -O ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf --sa -q --usrp-tx-thread-config 1
+ 0
+ 0
+ nr
+ yes
+ yes
+ 192.168.18.240
+
+
+
+ IdleSleep
+ Sleep
+ 5
+
+
+
+ IdleSleep
+ Sleep
+ 20
+
+
+
+
+ Ping
+ Ping: 20pings in 20sec
+ nrmodule2_quectel
+ -c 20
+ 5
+
+
+
+
+ Iperf
+ iperf (DL/10Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 10M -t 30
+ DL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+ Iperf
+ iperf (DL/20Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 20M -t 30
+ DL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+ Iperf
+ iperf (DL/40Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 40M -t 30
+ DL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+ Iperf
+ iperf (DL/60Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 60M -t 30
+ DL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+ Iperf
+ iperf (DL/90Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 90M -t 30
+ DL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+ Iperf
+ iperf (DL/140Mbps/UDP)(30 sec)(single-ue profile)
+ -u -b 140M -t 30
+ DL
+ nrmodule2_quectel
+ 5
+ single-ue
+
+
+
+
+ Terminate_eNB
+ Terminate gNB
+ 0
+ 0
+ nr
+
+
+
+