From b50194c39ad637019aec1135eec6e5895ca27489 Mon Sep 17 00:00:00 2001 From: ss412g Date: Wed, 11 Sep 2019 14:14:56 +0300 Subject: [PATCH] Automation fixes Change-Id: I6eb803ce12dd081c3b9db89091227e826a09ea81 Signed-off-by: ss412g --- .../ConfigurationUpdate_prepartations tests.robot | 57 ------------------ .../Tests/ENDC-Setup/ENDC_Setup_request_test.robot | 2 +- .../Get_all_nodes_run_setup_and_get_all.robot | 5 +- Automation/Tests/Get-All-Nodes/scripts.py | 67 --------------------- ...Loadinformation_adding_data_and_overwrite.robot | 2 +- .../Loadinformation_verify_saving.robot | 2 +- .../__pycache__/config.cpython-36.pyc | Bin 197 -> 0 bytes .../__pycache__/loadscripts.cpython-36.pyc | Bin 1047 -> 0 bytes ...Lost_Connetion_CONNECTING_TO_DISCONNECTED.robot | 2 +- .../Tests/RedButton/RedButton_CONNECTED.robot | 2 +- .../RedButton_CONNECTED_SHUTDOWN_CONNECTED.robot | 4 +- .../Tests/RedButton/RedButton_CONNECTING.robot | 58 ------------------ .../Tests/RedButton/RedButton_DISCONNECTED.robot | 6 +- .../RedButton/RedButton_SHUTDOWN_SHUTDOWN.robot | 2 +- .../Tests/Reset_RAN_TO_RIC/Reset_RAN_Found.robot | 2 +- .../Tests/Reset_RAN_TO_RIC_2/Reset_RNIB.robot | 2 +- .../Reset_RAN_TO_RIC_2/Reset_Verify_logs.robot | 12 +++- .../Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot | 5 +- .../Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot | 7 +-- .../Tests/Reset_RIC_TO_RAN/Reset_unhappy.robot | 9 +-- Automation/Tests/Resource/Keywords.robot | 2 + Automation/Tests/Resource/configuration.yaml | 10 --- Automation/Tests/Resource/resource.robot | 2 +- .../Tests/X2-Setup/X2_Setup_reuqest_test.robot | 2 +- 24 files changed, 37 insertions(+), 225 deletions(-) delete mode 100755 Automation/Tests/ConfigurationUpdate/ConfigurationUpdate_prepartations tests.robot delete mode 100755 Automation/Tests/Get-All-Nodes/scripts.py delete mode 100755 Automation/Tests/LoadInfomation/__pycache__/config.cpython-36.pyc delete mode 100755 Automation/Tests/LoadInfomation/__pycache__/loadscripts.cpython-36.pyc delete mode 100755 Automation/Tests/RedButton/RedButton_CONNECTING.robot delete mode 100644 Automation/Tests/Resource/configuration.yaml diff --git a/Automation/Tests/ConfigurationUpdate/ConfigurationUpdate_prepartations tests.robot b/Automation/Tests/ConfigurationUpdate/ConfigurationUpdate_prepartations tests.robot deleted file mode 100755 index 4f4ef3f..0000000 --- a/Automation/Tests/ConfigurationUpdate/ConfigurationUpdate_prepartations tests.robot +++ /dev/null @@ -1,57 +0,0 @@ -############################################################################## -# -# Copyright (c) 2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# 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. -# -############################################################################## - - -*** Settings *** -Resource ../Resource/resource.robot -Resource ../Resource/Keywords.robot -Library OperatingSystem -Library REST ${url} - - -*** Variables *** -${Run_Config} docker exec gnbe2_simu pkill gnbe2_simu -INT -${Save_e2_log} docker logs --tail 300 gnbe2_simu > gnb.log -${Save_e2mgr_log} docker logs --tail 300 e2mgr > e2mgr.log - -*** Test Cases *** -X2 - Setup and Get - Post Request setup node b x-2 - Get Request node b enb test1 - - -Run Configuration update - Run ${Run_Config} - Sleep 1s - -Remove log files - Remove File ${EXECDIR}/gnb.log - Remove File ${EXECDIR}/e2mgr.log - -Save logs - Sleep 1s - Run ${Save_e2_log} - Run ${Save_e2mgr_log} - - - - - - - - diff --git a/Automation/Tests/ENDC-Setup/ENDC_Setup_request_test.robot b/Automation/Tests/ENDC-Setup/ENDC_Setup_request_test.robot index ff7b4f5..33db346 100755 --- a/Automation/Tests/ENDC-Setup/ENDC_Setup_request_test.robot +++ b/Automation/Tests/ENDC-Setup/ENDC_Setup_request_test.robot @@ -30,7 +30,7 @@ Library REST ${url} *** Test Cases *** Run Endc setup request Post Request setup node b endc-setup - Integer response status 200 + Integer response status 204 Get request gnb Sleep 1s diff --git a/Automation/Tests/Get-All-Nodes-Real/Get_all_nodes_run_setup_and_get_all.robot b/Automation/Tests/Get-All-Nodes-Real/Get_all_nodes_run_setup_and_get_all.robot index 0277458..7048558 100755 --- a/Automation/Tests/Get-All-Nodes-Real/Get_all_nodes_run_setup_and_get_all.robot +++ b/Automation/Tests/Get-All-Nodes-Real/Get_all_nodes_run_setup_and_get_all.robot @@ -18,7 +18,6 @@ *** Settings *** Suite Setup Prepare Enviorment -Library Process Resource ../Resource/resource.robot Resource ../Resource/Keywords.robot Library OperatingSystem @@ -28,7 +27,7 @@ Library REST ${url} *** Test Cases *** Run x2 setup Post Request setup node b x-2 - Integer response status 200 + Integer response status 204 Sleep 2s GET /v1/nodeb/test1 Integer response status 200 @@ -39,7 +38,7 @@ Run x2 setup Run endc setup Post Request setup node b endc-setup - Integer response status 200 + Integer response status 204 Sleep 2s GET /v1/nodeb/test2 Integer response status 200 diff --git a/Automation/Tests/Get-All-Nodes/scripts.py b/Automation/Tests/Get-All-Nodes/scripts.py deleted file mode 100755 index b022d75..0000000 --- a/Automation/Tests/Get-All-Nodes/scripts.py +++ /dev/null @@ -1,67 +0,0 @@ -############################################################################## -# -# Copyright (c) 2019 AT&T Intellectual Property. -# -# Licensed under the Apache License, Version 2.0 (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.apache.org/licenses/LICENSE-2.0 -# -# 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. -# -############################################################################## - -import config -import redis - - -def flush(): - - c = config.redis_ip_address - - p = config.redis_ip_port - - r = redis.Redis(host=c, port=p, db=0) - - r.flushall() - - return True - - -def add(): - - c = config.redis_ip_address - - p = config.redis_ip_port - - r = redis.Redis(host=c, port=p, db=0) - - r.flushall() - - r.set("{e2Manager},ENB:02f829:007a80", "\n\x05test1\x12\t10.0.2.15\x18\xc9+ \x01*\x10\n\x0602f829\x12\x06007a800\x01:3\b\x01\x12/\bc\x12\x0f02f829:0007ab50\x1a\x040102\"\x0602f829*\n\n\b\b\x01\x10\x01\x18\x04 \x040\x01") - - r.set("{e2Manager},RAN:test1","\x12\t10.0.2.15\x18\xc9+ \x03H\x01R\x02\b\t") - - r.set("{e2Manager},PCI:test1:63" , "\b\x01\x12/\bc\x12\x0f02f829:0007ab50\x1a\x040102\"\x0602f829*\n\n\b\b\x01\x10\x01\x18\x04 \x040\x01") - - r.set("{e2Manager},CELL:02f829:0007ab50" , "\b\x01\x12/\bc\x12\x0f02f829:0007ab50\x1a\x040102\"\x0602f829*\n\n\b\b\x01\x10\x01\x18\x04 \x040\x01") - - r.sadd("{e2Manager},ENB" , "\n\x05test1\x12\x10\n\x0602f829\x12\x06007a80") - - - r.set("{e2Manager},GNB:03f829:002234", "\n\x05test2\x12\t10.0.2.16\x18\xc9+ \x01*\x10\n\x0702f829\x12\x070012340\x02BI\nG\nE\bc\x12\x1102f829:0008ab0120*\x0602f8290\x01:$\n\"\n\t\bd\"\x05\b\t\x12\x01\t\x12\t\bd\"\x05\b\t\x12\x01\t\x1a\x04\b\x01\x10\x01\"\x04\b\x01\x10\x01") - - r.set("{e2Manager},RAN:test2", "\n\x05test2\x12\t10.0.2.15\x18\xc9+ \x01*\x10\n\x0702f829\x12\x070012340\x03BI\nG\nE\bc\x12\x1103f829:0008ab0120*\x0602f8290\x01:$\n\"\n\t\bd\"\x05\b\t\x12\x01\t\x12\t\bd\"\x05\b\t\x12\x01\t\x1a\x04\b\x01\x10\x01\"\x04\b\x01\x10\x01") - - r.set("{e2Manager},PCI:test2:63", "\b\x02\x1aG\nE\bc\x12\x1102f829:0008ab0120*\x0702f8290\x01:$\n\"\n\t\bd\"\x05\b\t\x12\x01\t\x12\t\bd\"\x05\b\t\x12\x01\t\x1a\x04\b\x01\x10\x01\"\x04\b\x01\x10\x01") - - r.set("{e2Manager},NRCELL:02f829:0007ab0120", "\b\x02\x1aG\nE\bc\x12\x1102f829:0007ab0120*\x0602f8290\x01:$\n\"\n\t\bd\"\x05\b\t\x12\x01\t\x12\t\bd\"\x05\b\t\x12\x01\t\x1a\x04\b\x01\x10\x01\"\x04\b\x01\x10\x01") - - r.sadd("{e2Manager},GNB","\n\x05test2\x12\x10\n\x0603f829\x12\x06001234") - - return True diff --git a/Automation/Tests/LoadInfomation/Loadinformation_adding_data_and_overwrite.robot b/Automation/Tests/LoadInfomation/Loadinformation_adding_data_and_overwrite.robot index d94482a..91d4960 100644 --- a/Automation/Tests/LoadInfomation/Loadinformation_adding_data_and_overwrite.robot +++ b/Automation/Tests/LoadInfomation/Loadinformation_adding_data_and_overwrite.robot @@ -40,7 +40,7 @@ Adding Load information to overwrite on Trigger X-2 Setup for load information Post Request setup node b x-2 - Integer response status 200 + Integer response status 204 Sleep 1s GET /v1/nodeb/test1 Integer response status 200 diff --git a/Automation/Tests/LoadInfomation/Loadinformation_verify_saving.robot b/Automation/Tests/LoadInfomation/Loadinformation_verify_saving.robot index e02b5eb..3702c78 100644 --- a/Automation/Tests/LoadInfomation/Loadinformation_verify_saving.robot +++ b/Automation/Tests/LoadInfomation/Loadinformation_verify_saving.robot @@ -39,7 +39,7 @@ Verify Load information doesn't exist in redis Trigger X-2 Setup for load information Post Request setup node b x-2 - Integer response status 200 + Integer response status 204 Sleep 1s GET /v1/nodeb/test1 Integer response status 200 diff --git a/Automation/Tests/LoadInfomation/__pycache__/config.cpython-36.pyc b/Automation/Tests/LoadInfomation/__pycache__/config.cpython-36.pyc deleted file mode 100755 index 088660ea1ebaf6bed490821d278ac15425d88e1a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmXr!<>fLAjf}NpW?*>CfCLzUYzH7N<^d8Z3{eazj8Tj!Ou-DA%(pmm@{<#DGV+T{ zGG9wDF!*UQ-4ZBDP01{d&n$>fOi3w9EiS&r3l}NKFDhBdP{aZ>2u%F4($C1xP1P?= zD$Oe?)eopl&PXiE4JgXbN=+^)*7q+;%+vSDPfYR5OUutqEXmBz(@)ONOUq2xE2zB1 VVUwGmQks)$Ck%2N6OdqG1OWagH?aT! diff --git a/Automation/Tests/LoadInfomation/__pycache__/loadscripts.cpython-36.pyc b/Automation/Tests/LoadInfomation/__pycache__/loadscripts.cpython-36.pyc deleted file mode 100755 index 507c7d15b8ef474a95989d770fab459735e2cbb3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1047 zcma))&ubGw6vtAVk?Y^D&neUx)xw!qa@oMA}@{1g67K|T4 zs0|QKIPH_hqNfeYEzaJPhQ)2}K+m|#3((t~9+0Z{8@?dB5h^wt!hv`Uq3R%-^ymcD zno!Mp_Lz(*hnyeT1oBSU*y=glp3*UU&18)`2ZXy21acR4C4~%CX6$aNw6TY&)W+hi z>^dxavrqFM^Ut%d^AEG{v+4ZH`lYqvYEWx$*6!DXAh;K{g5d4dccS(@Ou~+klZ~Cd zM^EZnD1H0o)2eISC{5aN$5f=?v1-P{X2`h|N}2LnO0@z)EEk@NWm_xMw&WVDESWQyESYb?N>&l+T!HnI>C|B7Y&t;XCbz+b=tgv+d*sA(5NTBp1W zhd8r7cVUA~ED<3b86Yok9Wyu!bU9A+LteJTtz)cmYB@0P!64;XUu+>Ah15OjF|XoP F{sN=T