From d330867d04d27f9be28ab3a50c9bbe94148eedda Mon Sep 17 00:00:00 2001
From: Boris Djalal <boris.djalal@eurecom.fr>
Date: Thu, 2 May 2019 14:05:47 +0200
Subject: [PATCH] Reading air_interface from xml when doing Terminate action.
Signed-off-by: Boris Djalal <boris.djalal@eurecom.fr>
---
ci-scripts/main.py | 10 ++++++++++
ci-scripts/xml_files/terminate_gnb_usrp.xml | 1 +
ci-scripts/xml_files/terminate_nr_ue_usrp.xml | 1 +
3 files changed, 12 insertions(+)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 25a1c71d03..c632dde883 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -3097,6 +3097,11 @@ def GetParametersFromXML(action):
SSH.eNB_instance = test.findtext('eNB_instance')
if (SSH.eNB_instance is None):
SSH.eNB_instance = '0'
+ SSH.air_interface = test.findtext('air_interface')
+ if (SSH.air_interface is None):
+ SSH.air_interface = 'lte'
+ else:
+ SSH.air_interface = SSH.air_interface.lower()
if action == 'Attach_UE':
nbMaxUEtoAttach = test.findtext('nbMaxUEtoAttach')
@@ -3139,6 +3144,11 @@ def GetParametersFromXML(action):
SSH.eNB_instance = test.findtext('UE_instance')
if (SSH.UE_instance is None):
SSH.UE_instance = '0'
+ SSH.air_interface = test.findtext('air_interface')
+ if (SSH.air_interface is None):
+ SSH.air_interface = 'lte'
+ else:
+ SSH.air_interface = SSH.air_interface.lower()
if action == 'Ping' or action == 'Ping_CatM_module':
SSH.ping_args = test.findtext('ping_args')
diff --git a/ci-scripts/xml_files/terminate_gnb_usrp.xml b/ci-scripts/xml_files/terminate_gnb_usrp.xml
index 461bbb37b9..10f67da863 100644
--- a/ci-scripts/xml_files/terminate_gnb_usrp.xml
+++ b/ci-scripts/xml_files/terminate_gnb_usrp.xml
@@ -32,6 +32,7 @@
<testCase id="090109">
<class>Terminate_eNB</class>
<desc>Terminate gNB</desc>
+ <air_interface>NR</air_interface>
</testCase>
<testCase id="000001">
diff --git a/ci-scripts/xml_files/terminate_nr_ue_usrp.xml b/ci-scripts/xml_files/terminate_nr_ue_usrp.xml
index 06cef3d59b..c79e9f7b95 100644
--- a/ci-scripts/xml_files/terminate_nr_ue_usrp.xml
+++ b/ci-scripts/xml_files/terminate_nr_ue_usrp.xml
@@ -32,6 +32,7 @@
<testCase id="090103">
<class>Terminate_OAI_UE</class>
<desc>Terminate NR UE</desc>
+ <air_interface>NR</air_interface>
</testCase>
<testCase id="000001">
--
2.26.2