Automation fixes

Change-Id: I6eb803ce12dd081c3b9db89091227e826a09ea81
Signed-off-by: ss412g <shuky.har-noy@intl.att.com>

diff --git a/Automation/Tests/ConfigurationUpdate/ConfigurationUpdate_prepartations tests.robot b/Automation/Tests/ConfigurationUpdate/ConfigurationUpdate_prepartations tests.robot
deleted file mode 100755 (executable)
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 (executable)
--- 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 (executable)
--- 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 (executable)
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 (file)
--- 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 (file)
--- 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 (executable)
index 088660e..0000000
Binary files a/Automation/Tests/LoadInfomation/__pycache__/config.cpython-36.pyc and /dev/null differ

diff --git a/Automation/Tests/LoadInfomation/__pycache__/loadscripts.cpython-36.pyc b/Automation/Tests/LoadInfomation/__pycache__/loadscripts.cpython-36.pyc
deleted file mode 100755 (executable)
index 507c7d1..0000000
Binary files a/Automation/Tests/LoadInfomation/__pycache__/loadscripts.cpython-36.pyc and /dev/null differ

diff --git a/Automation/Tests/Lost_Connection/Lost_Connetion_CONNECTING_TO_DISCONNECTED.robot b/Automation/Tests/Lost_Connection/Lost_Connetion_CONNECTING_TO_DISCONNECTED.robot
index 8415c47..96ad4f1 100644 (file)
--- a/Automation/Tests/Lost_Connection/Lost_Connetion_CONNECTING_TO_DISCONNECTED.robot
+++ b/Automation/Tests/Lost_Connection/Lost_Connetion_CONNECTING_TO_DISCONNECTED.robot
@@ -38,7 +38,7 @@ Pre Condition for Connecting - no simu
 Prepare Ran in Connecting connectionStatus
     Sleep  1s
     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/RedButton/RedButton_CONNECTED.robot b/Automation/Tests/RedButton/RedButton_CONNECTED.robot
index 4887907..e172706 100755 (executable)
--- a/Automation/Tests/RedButton/RedButton_CONNECTED.robot
+++ b/Automation/Tests/RedButton/RedButton_CONNECTED.robot
@@ -29,7 +29,7 @@ Library     REST      ${url}
 
 Prepare Ran in Connected connectionStatus
     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/RedButton/RedButton_CONNECTED_SHUTDOWN_CONNECTED.robot b/Automation/Tests/RedButton/RedButton_CONNECTED_SHUTDOWN_CONNECTED.robot
index d546377..e0f5dd4 100755 (executable)
--- a/Automation/Tests/RedButton/RedButton_CONNECTED_SHUTDOWN_CONNECTED.robot
+++ b/Automation/Tests/RedButton/RedButton_CONNECTED_SHUTDOWN_CONNECTED.robot
@@ -33,7 +33,7 @@ ${restart_docker_sim}      docker restart gnbe2_simu
 
 Prepare Ran in Connected connectionStatus
     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
@@ -63,7 +63,7 @@ Restart simualtor
 
 repare Ran in Connected connectionStatus
     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/RedButton/RedButton_CONNECTING.robot b/Automation/Tests/RedButton/RedButton_CONNECTING.robot
deleted file mode 100755 (executable)
index bf38ec0..0000000
--- a/Automation/Tests/RedButton/RedButton_CONNECTING.robot
+++ /dev/null
@@ -1,58 +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 ***
-Suite Setup   Prepare Enviorment
-Resource   ../Resource/resource.robot
-Resource   ../Resource/Keywords.robot
-Library     OperatingSystem
-Library    Collections
-Library     REST      ${url}
-Suite Teardown   Start E2
-
-
-
-*** Test Cases ***
-
-Pre Condition for Connecting - no E2
-    Run And Return Rc And Output    ${stop_docker_e2}
-    ${result}=  Run And Return Rc And Output     ${docker_command}
-    Should Be Equal As Integers    ${result[1]}    4
-
-
-Prepare Ran in Connecting connectionStatus
-    Sleep  1s
-    Post Request setup node b x-2
-    Integer     response status       200
-    Sleep  1s
-    GET      /v1/nodeb/test1
-    Integer  response status  200
-    String   response body ranName    test1
-    String   response body connectionStatus    CONNECTING
-
-Disconnect Ran
-   PUT    /v1/nodeb/shutdown
-   Integer   response status   500
-
-
-Verfiy Shutdown ConnectionStatus
-    Sleep    1s
-    GET      /v1/nodeb/test1
-    Integer  response status  200
-    String   response body ranName    test1
-    String   response body connectionStatus    SHUTTING_DOWN
-

diff --git a/Automation/Tests/RedButton/RedButton_DISCONNECTED.robot b/Automation/Tests/RedButton/RedButton_DISCONNECTED.robot
index b9a021f..0c2763a 100755 (executable)
--- a/Automation/Tests/RedButton/RedButton_DISCONNECTED.robot
+++ b/Automation/Tests/RedButton/RedButton_DISCONNECTED.robot
@@ -38,9 +38,9 @@ Pre Condition for Connecting - no E2ADAPTER
 
 Prepare Ran in Connecting connectionStatus
     Post Request setup node b endc-setup
-    Integer     response status       200
+    Integer     response status       204
     Sleep  1s
-    GET      /v1/nodeb/test1
+    GET      /v1/nodeb/test2
     Integer  response status  200
     String   response body ranName    test2
     String   response body connectionStatus    DISCONNECTED
@@ -53,7 +53,7 @@ Disconnect Ran
 
 Verfiy Shutdown ConnectionStatus
     Sleep    1s
-    GET      /v1/nodeb/test1
+    GET      /v1/nodeb/test2
     Integer  response status  200
     String   response body ranName    test2
     String   response body connectionStatus    SHUT_DOWN

diff --git a/Automation/Tests/RedButton/RedButton_SHUTDOWN_SHUTDOWN.robot b/Automation/Tests/RedButton/RedButton_SHUTDOWN_SHUTDOWN.robot
index 1bbe20f..05d32d7 100755 (executable)
--- a/Automation/Tests/RedButton/RedButton_SHUTDOWN_SHUTDOWN.robot
+++ b/Automation/Tests/RedButton/RedButton_SHUTDOWN_SHUTDOWN.robot
@@ -29,7 +29,7 @@ Library     REST      ${url}
 
 Prepare Ran in Connected connectionStatus
     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/Reset_RAN_TO_RIC/Reset_RAN_Found.robot b/Automation/Tests/Reset_RAN_TO_RIC/Reset_RAN_Found.robot
index aa52bf9..a615002 100644 (file)
--- a/Automation/Tests/Reset_RAN_TO_RIC/Reset_RAN_Found.robot
+++ b/Automation/Tests/Reset_RAN_TO_RIC/Reset_RAN_Found.robot
@@ -31,7 +31,7 @@ Library     REST      ${url}
 
 Prepare Ran in Connected connectionStatus
     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/Reset_RAN_TO_RIC_2/Reset_RNIB.robot b/Automation/Tests/Reset_RAN_TO_RIC_2/Reset_RNIB.robot
index d0319b6..ffffac1 100644 (file)
--- a/Automation/Tests/Reset_RAN_TO_RIC_2/Reset_RNIB.robot
+++ b/Automation/Tests/Reset_RAN_TO_RIC_2/Reset_RNIB.robot
@@ -32,7 +32,7 @@ Library     REST      ${url}
 
 Prepare Ran in Connected connectionStatus
     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/Reset_RAN_TO_RIC_2/Reset_Verify_logs.robot b/Automation/Tests/Reset_RAN_TO_RIC_2/Reset_Verify_logs.robot
index 583d11b..162c109 100644 (file)
--- a/Automation/Tests/Reset_RAN_TO_RIC_2/Reset_Verify_logs.robot
+++ b/Automation/Tests/Reset_RAN_TO_RIC_2/Reset_Verify_logs.robot
@@ -23,6 +23,7 @@ Library     OperatingSystem
 Library     Process
 Library     ${CURDIR}/Reset_Ran_To_Ric_RNIB_Down_Verify_logs.py
 Resource   ../Resource/Keywords.robot
+Test Teardown  Start Redis with 4 dockers
 
 
 
@@ -35,4 +36,13 @@ Verify logs - Reset Sent by simulator
 Verify logs - e2mgr logs
    ${result}    Reset_Ran_To_Ric_RNIB_Down_Verify_logs.verify   ${EXECDIR}
    log to console   ${result}
-   Should Be Equal As Strings    ${result}      True
\ No newline at end of file
+   Should Be Equal As Strings    ${result}      True
+
+
+*** Keywords ***
+Start Redis with 4 dockers
+     Run And Return Rc And Output    ${redis_remove}
+     Run And Return Rc And Output    ${start_redis}
+     ${result}=  Run And Return Rc And Output     ${docker_command}
+     Should Be Equal As Integers    ${result[1]}    4
+     Sleep  5s

diff --git a/Automation/Tests/Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot b/Automation/Tests/Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot
index e5de9ce..20e4258 100755 (executable)
--- a/Automation/Tests/Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot
+++ b/Automation/Tests/Reset_RIC_TO_RAN/Reset_Happy_no_cause.robot
@@ -17,7 +17,7 @@
 ##############################################################################
 
 *** Settings ***
-Suite Setup   Prepare Enviorment
+Suite Setup  Prepare Enviorment
 Resource   ../Resource/resource.robot
 Resource   ../Resource/Keywords.robot
 Library     OperatingSystem
@@ -26,10 +26,9 @@ Library     REST      ${url}
 
 
 *** Test Cases ***
-
 Prepare Ran in Connected connectionStatus
     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/Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot b/Automation/Tests/Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot
index 2a64b09..7d03300 100755 (executable)
--- a/Automation/Tests/Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot
+++ b/Automation/Tests/Reset_RIC_TO_RAN/Reset_Happy_with_cause.robot
@@ -17,7 +17,7 @@
 ##############################################################################
 
 *** Settings ***
-Suite Setup   Prepare Enviorment
+Suite Setup  Prepare Enviorment
 Resource   ../Resource/resource.robot
 Resource   ../Resource/Keywords.robot
 Library     OperatingSystem
@@ -26,10 +26,9 @@ Library     REST      ${url}
 
 
 *** Test Cases ***
-
 Prepare Ran in Connected connectionStatus
     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
@@ -37,7 +36,7 @@ Prepare Ran in Connected connectionStatus
     String   response body connectionStatus    CONNECTED
 
 
-Send Reset reqeust with no cause
+Send Reset reqeust with cause
     Set Headers     ${header}
     PUT    /v1/nodeb/test1/reset    ${resetcausejson}
     Integer  response status  204
\ No newline at end of file

diff --git a/Automation/Tests/Reset_RIC_TO_RAN/Reset_unhappy.robot b/Automation/Tests/Reset_RIC_TO_RAN/Reset_unhappy.robot
index 91fd82f..189e2df 100755 (executable)
--- a/Automation/Tests/Reset_RIC_TO_RAN/Reset_unhappy.robot
+++ b/Automation/Tests/Reset_RIC_TO_RAN/Reset_unhappy.robot
@@ -16,7 +16,7 @@
 #
 ##############################################################################
 *** Settings ***
-Suite Setup   Prepare Enviorment
+Suite Setup  Prepare Enviorment
 Resource   ../Resource/resource.robot
 Resource   ../Resource/Keywords.robot
 Library     OperatingSystem
@@ -24,11 +24,6 @@ Library    Collections
 Library     REST      ${url}
 Suite Teardown   Start E2
 
-*** Variables ***
-${stop_docker_e2}      docker stop e2
-
-
-
 *** Test Cases ***
 
 Pre Condition for Connecting - no E2
@@ -40,7 +35,7 @@ Pre Condition for Connecting - no E2
 Prepare Ran in Connecting connectionStatus
     Sleep  1s
     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/Resource/Keywords.robot b/Automation/Tests/Resource/Keywords.robot
index b5caaaf..94fc870 100755 (executable)
--- a/Automation/Tests/Resource/Keywords.robot
+++ b/Automation/Tests/Resource/Keywords.robot
@@ -68,7 +68,9 @@ Prepare Enviorment
      Run And Return Rc And Output    ${docker_Remove}
      Run And Return Rc And Output    ${run_simu_regular}
      Run And Return Rc And Output    ${restart_e2adapter}
+     Sleep  2s
      ${result}=  Run And Return Rc And Output     ${docker_command}
+     log to console   ${result}
      Should Be Equal As Integers    ${result[1]}    5
 
 Start E2

diff --git a/Automation/Tests/Resource/configuration.yaml b/Automation/Tests/Resource/configuration.yaml
deleted file mode 100644 (file)
index 676daf3..0000000
--- a/Automation/Tests/Resource/configuration.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-logging:
-  logLevel: info
-http:
-  port: 3800
-rmr:
-  port: 3801
-  maxMsgSize: 4096
-notificationResponseBuffer: 100
-bigRedButtonTimeoutSec: 5
-maxConnectionAttempts: 300

diff --git a/Automation/Tests/Resource/resource.robot b/Automation/Tests/Resource/resource.robot
index 42d7ed1..118ca24 100755 (executable)
--- a/Automation/Tests/Resource/resource.robot
+++ b/Automation/Tests/Resource/resource.robot
@@ -26,7 +26,7 @@ ${json}    {"ranIp": "10.0.2.15","ranPort": 5577,"ranName":"test1"}
 ${endcjson}    {"ranIp": "10.0.2.15","ranPort": 49999,"ranName":"test2"}
 ${resetcausejson}   {"cause": "misc:not-enough-user-plane-processing-resources"}
 ${header}  {"Content-Type": "application/json"}
-${docker_command}  docker ps | grep 1.0 | wc --lines
+${docker_command}  docker ps | grep Up | wc --lines
 ${run_simu_load}   docker run -d --name gnbe2_simu --env gNBipv4=localhost  --env gNBport=36422  --env duration=600000000000 --env indicationReportRate=1000000000 --env indicationInsertRate=0 -p 5577:36422/sctp snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/gnbe2_simu:1.0.6
 ${stop_simu}  docker stop gnbe2_simu
 ${run_simu_regular}  docker run -d --name gnbe2_simu --env gNBipv4=localhost  --env gNBport=36422 --env duration=600000000000 --env indicationReportRate=0 --env indicationInsertRate=0 -p 5577:36422/sctp snapshot.docker.ranco-dev-tools.eastus.cloudapp.azure.com:10001/gnbe2_simu:1.0.6

diff --git a/Automation/Tests/X2-Setup/X2_Setup_reuqest_test.robot b/Automation/Tests/X2-Setup/X2_Setup_reuqest_test.robot
index aa61d40..477cb63 100755 (executable)
--- a/Automation/Tests/X2-Setup/X2_Setup_reuqest_test.robot
+++ b/Automation/Tests/X2-Setup/X2_Setup_reuqest_test.robot
@@ -26,7 +26,7 @@ Library     REST      ${url}
 *** Test Cases ***
 X2 - Setup Test
     Post Request setup node b x-2
-    Integer     response status       200
+    Integer     response status       204
 
 X2 - Get Nodeb
     Get Request Node B Enb test1