From a9f0b72dc94c2f0b1196b4f5bd13ef463298b017 Mon Sep 17 00:00:00 2001 From: Amichai Date: Sat, 1 Aug 2020 21:12:43 +0000 Subject: [PATCH] [RIC-571] Fix automation tests Change-Id: I385d3c6503fb8b950d5021a0213c1b60f54dec5e Signed-off-by: Amichai --- Automation/Tests/Resource/Keywords.robot | 14 +++++++++----- Automation/Tests/Scripts/k8s_helper.py | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/Automation/Tests/Resource/Keywords.robot b/Automation/Tests/Resource/Keywords.robot index 6d1fdd8..29b933b 100644 --- a/Automation/Tests/Resource/Keywords.robot +++ b/Automation/Tests/Resource/Keywords.robot @@ -29,9 +29,6 @@ Library OperatingSystem Library Process Variables ../Scripts/variables.py -*** Variables *** -${e2adapter} ${e2adapter_pod_name} - *** Keywords *** Get Request nodeb [Arguments] ${nodeb_name}=${ranName} @@ -176,6 +173,11 @@ Stop e2adapter Run And Return Rc And Output ${stop_e2adapter} Sleep 5s +Restart e2adapter + Log to Console Restarting e2adapter + Stop e2adapter + Start e2adapter + Flush And Populate DB [Arguments] ${set_new_timestamp}=${True} Log To Console Flushing and populating DB @@ -192,8 +194,10 @@ Stop All Pods Except Simulator Send eNB Setup Request Log To Console Sending eNB setup request form e2adapter - ${send_enb_setup} Evaluate "kubectl -n ricplt exec -it ${e2adapter} cli send-e2setup-req 10.0.2.15" - Sleep 3s + Restart e2adapter + Wait until keyword succeeds 2 min 3 sec Validate Required Dockers + ${e2adapter_pod} = Run And Return Rc And Output kubectl get pods -n ricplt | /bin/grep e2adapter | /bin/grep Running | awk '{{print $1}}' + ${send_enb_setup} Evaluate "kubectl -n ricplt exec -it ${e2adapter_pod[1]} cli send-e2setup-req 10.0.2.15" Run And Return Rc And Output ${send_enb_setup} Start Redis Monitor diff --git a/Automation/Tests/Scripts/k8s_helper.py b/Automation/Tests/Scripts/k8s_helper.py index 4fe6dd8..a1cce5f 100644 --- a/Automation/Tests/Scripts/k8s_helper.py +++ b/Automation/Tests/Scripts/k8s_helper.py @@ -32,7 +32,7 @@ def extract_service_ip(service_name): return service_ip.strip() def extract_pod_name(pod_base_name): - k8s_command = "kubectl get pods -n ricplt | /bin/grep {} | awk \'{{print $1}}\'" \ + k8s_command = "kubectl get pods -n ricplt | /bin/grep {} | /bin/grep Running | awk \'{{print $1}}\'" \ .format(pod_base_name) pod_name = subprocess.check_output(["/bin/bash", "-c", k8s_command], universal_newlines=True) -- 2.16.6