Fixes for ATT workflow test
- Fix container logging
- Do not reinstall voltha after each test case
Change-Id: Ieaa215e67eae7d06915998df6482043fc30fb90e
diff --git a/src/test/cord-api/Framework/Kubernetes.robot b/src/test/cord-api/Framework/Kubernetes.robot
index 2ffe980..b90b5af 100644
--- a/src/test/cord-api/Framework/Kubernetes.robot
+++ b/src/test/cord-api/Framework/Kubernetes.robot
@@ -60,14 +60,16 @@
[Return] ${result}
Log Kubernetes Container Log Since Time
- [Arguments] ${datetime} ${container_name}
- ${rc} ${output}= Run And Return Rc And Output ${export_kubeconfig}; kubectl logs --timestamps --since-time=${datetime} ${container_name}
+ [Arguments] ${datetime} ${container}
+ ${rc} ${namespace}= Run And Return Rc And Output ${export_kubeconfig}; kubectl get pods --all-namespaces | grep ' ${container}' | head -1 | awk '{print $1}'
+ ${rc} ${container_name}= Run And Return Rc And Output ${export_kubeconfig}; kubectl get pods --all-namespaces | grep ' ${container}' | head -1 | awk '{print $2}'
+ ${rc} ${output}= Run And Return Rc And Output ${export_kubeconfig}; kubectl logs --timestamps -n ${namespace} --since-time=${datetime} ${container_name}
Log ${output}
Log Kubernetes Containers Logs Since Time
- [Arguments] ${datetime} ${container_list}
- : FOR ${container_name} IN @{container_list}
- \ Log Kubernetes Container Log Since Time ${datetime} ${container_name}
+ [Arguments] ${datetime} ${containers}
+ : FOR ${container} IN @{containers}
+ \ Log Kubernetes Container Log Since Time ${datetime} ${container}
Get Kubernetes POD Name By Prefix
[Arguments] ${prefix}
diff --git a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.robot b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.robot
index 7383c8a..e41a7a1 100644
--- a/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.robot
+++ b/src/test/cord-api/Tests/WorkflowValidations/ATT_Test001.robot
@@ -333,10 +333,9 @@
Set Suite Variable ${k8s_node_user}
Set Suite Variable ${k8s_node_pass}
@{container_list}= Create List
- ${container_name}= Get Kubernetes POD Name By Prefix onos
- Append To List ${container_list} ${container_name}
- ${container_name}= Get Kubernetes POD Name By Prefix xos-core
- Append To List ${container_list} ${container_name}
+ Append To List ${container_list} onos
+ Append To List ${container_list} xos-core
+ Append To List ${container_list} vcore
Set Suite Variable ${container_list}
${datetime}= Get Current Datetime On Kubernetes Node ${k8s_node_ip} ${k8s_node_user} ${k8s_node_pass}
Set Suite Variable ${datetime}
@@ -376,7 +375,6 @@
Wait Until Keyword Succeeds 120s 10s Check Remote System Reachability False ${olt_ip}
Wait Until Keyword Succeeds 120s 10s Check Remote System Reachability True ${olt_ip}
Wait Until Keyword Succeeds 120s 10s Openolt is Up ${olt_ip} ${olt_user} ${olt_pass}
- Wait Until Keyword Succeeds 300s 10s Reinstall Voltha
Create Whitelist
${AttWhiteListDict}= utils.listToDict ${AttWhiteListList} 0
@@ -398,6 +396,10 @@
${SubscriberDict}= utils.listToDict ${SubscriberList} 0
Wait Until Keyword Succeeds 120s 15s CORD Post ${VOLT_SUBSCRIBER} ${SubscriberDict}
+Remove Subscriber
+ ${subscriber_id}= Retrieve Subscriber ${c_tag}
+ CORD Delete ${VOLT_SUBSCRIBER} ${subscriber_id}
+
Create VOLT
${VoltDeviceDict}= utils.listToDict ${VoltDeviceList} 0
CORD Post ${VOLT_DEVICE} ${VoltDeviceDict}