From 78c7fb9f9bcc5fdc7be076546b5616b8ee9c4e50 Mon Sep 17 00:00:00 2001
From: Remi Hardy <remi.hardy@openairinterface.org>
Date: Tue, 1 Sep 2020 16:52:41 +0200
Subject: [PATCH] bug fixing + completing fr1 automation
---
ci-scripts/args_parse.py | 2 +-
ci-scripts/cls_cots_ue.py | 8 ++--
ci-scripts/cots_ue_ctl.yaml | 2 +
.../fr1_toggle_cots_ue_airplaneOFF.xml | 40 +++++++++++++++++++
.../fr1_toggle_cots_ue_airplaneON.xml | 40 +++++++++++++++++++
5 files changed, 88 insertions(+), 4 deletions(-)
create mode 100644 ci-scripts/xml_files/fr1_toggle_cots_ue_airplaneOFF.xml
create mode 100644 ci-scripts/xml_files/fr1_toggle_cots_ue_airplaneON.xml
diff --git a/ci-scripts/args_parse.py b/ci-scripts/args_parse.py
index 1249f52172..84b3a84514 100644
--- a/ci-scripts/args_parse.py
+++ b/ci-scripts/args_parse.py
@@ -34,7 +34,7 @@
import sys # arg
import re # reg
import yaml
-
+import constants as CONST
#-----------------------------------------------------------
# Parsing Command Line Arguements
diff --git a/ci-scripts/cls_cots_ue.py b/ci-scripts/cls_cots_ue.py
index bb17f426d7..08f55e91ac 100644
--- a/ci-scripts/cls_cots_ue.py
+++ b/ci-scripts/cls_cots_ue.py
@@ -53,7 +53,7 @@ class CotsUe:
def Check_Airplane(self):
mySSH = sshconnection.SSHConnection()
mySSH.open(self.ADBIPAddr, self.ADBUserName, self.ADBPassWord)
- status=mySSH.cde_check_value('sudo adb shell settings get global airplane_mode_on ', ['0','1'],5)
+ status=mySSH.cde_check_value('adb shell settings get global airplane_mode_on ', ['0','1'],5)
mySSH.close()
return status
@@ -66,7 +66,9 @@ class CotsUe:
if target_id in cots_ue_ctl:
mySSH = sshconnection.SSHConnection()
mySSH.open(self.ADBIPAddr, self.ADBUserName, self.ADBPassWord)
- mySSH.command('sudo adb start-server','\$',5)
+ logging.info(str(self.ADBIPAddr)+' '+str(self.ADBUserName)+' '+str(self.ADBPassWord))
+ mySSH.command('adb start-server','\$',5)
+ mySSH.command('adb devices','\$',5)
logging.info("Toggling COTS UE Airplane mode to : "+target_state_str)
#get current state
current_state = self.Check_Airplane()
@@ -90,7 +92,7 @@ class CotsUe:
logging.error("Current state is : "+ str(current_state))
else:
print("Airplane mode is already "+ target_state_str)
- mySSH.command('sudo adb kill-server','\$',5)
+ mySSH.command('adb kill-server','\$',5)
mySSH.close()
#ue id is NOT in the dictionary
else:
diff --git a/ci-scripts/cots_ue_ctl.yaml b/ci-scripts/cots_ue_ctl.yaml
index 503a6d974b..517030bd94 100644
--- a/ci-scripts/cots_ue_ctl.yaml
+++ b/ci-scripts/cots_ue_ctl.yaml
@@ -1,4 +1,6 @@
oppo:
+ - adb shell input keyevent KEYCODE_POWER
+ - adb shell input swipe 300 700 300 0
- adb shell am start -a android.settings.AIRPLANE_MODE_SETTINGS
- adb shell input keyevent 20
- adb shell input tap 968 324
diff --git a/ci-scripts/xml_files/fr1_toggle_cots_ue_airplaneOFF.xml b/ci-scripts/xml_files/fr1_toggle_cots_ue_airplaneOFF.xml
new file mode 100644
index 0000000000..4cbae60060
--- /dev/null
+++ b/ci-scripts/xml_files/fr1_toggle_cots_ue_airplaneOFF.xml
@@ -0,0 +1,40 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+ contact@openairinterface.org
+
+-->
+<testCaseList>
+ <htmlTabRef>test-airplane-mode</htmlTabRef>
+ <htmlTabName>AirplaneToggle</htmlTabName>
+ <htmlTabIcon>tasks</htmlTabIcon>
+ <TestCaseRequestedList>
+ 010000
+ </TestCaseRequestedList>
+ <TestCaseExclusionList></TestCaseExclusionList>
+
+ <testCase id="010000">
+ <class>COTS_UE_Airplane</class>
+ <desc>Toggle COTS Airplane mode ON</desc>
+ <cots_id>oppo</cots_id>
+ <cots_run_mode>OFF</cots_run_mode>
+ </testCase>
+
+
+</testCaseList>
diff --git a/ci-scripts/xml_files/fr1_toggle_cots_ue_airplaneON.xml b/ci-scripts/xml_files/fr1_toggle_cots_ue_airplaneON.xml
new file mode 100644
index 0000000000..86c85f88b2
--- /dev/null
+++ b/ci-scripts/xml_files/fr1_toggle_cots_ue_airplaneON.xml
@@ -0,0 +1,40 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1 (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+ contact@openairinterface.org
+
+-->
+<testCaseList>
+ <htmlTabRef>test-airplane-mode</htmlTabRef>
+ <htmlTabName>AirplaneToggle</htmlTabName>
+ <htmlTabIcon>tasks</htmlTabIcon>
+ <TestCaseRequestedList>
+ 010000
+ </TestCaseRequestedList>
+ <TestCaseExclusionList></TestCaseExclusionList>
+
+ <testCase id="010000">
+ <class>COTS_UE_Airplane</class>
+ <desc>Toggle COTS Airplane mode ON</desc>
+ <cots_id>oppo</cots_id>
+ <cots_run_mode>ON</cots_run_mode>
+ </testCase>
+
+
+</testCaseList>
--
2.26.2