FIXES: Correct issues revealed in BD Lab deployment

[it/test.git] / ric_robot_suite / helm / nanobot / configmap-src / public / testsuites / ricdeployment.robot

diff --git a/ric_robot_suite/helm/nanobot/configmap-src/public/testsuites/ricdeployment.robot b/ric_robot_suite/helm/nanobot/configmap-src/public/testsuites/ricdeployment.robot
index 3417675..79c5e55 100644 (file)
--- a/ric_robot_suite/helm/nanobot/configmap-src/public/testsuites/ricdeployment.robot
+++ b/ric_robot_suite/helm/nanobot/configmap-src/public/testsuites/ricdeployment.robot
@@ -18,6 +18,8 @@ Documentation   Tests for the existence and functionality of RIC components
 
 Resource       /robot/resources/global_properties.robot
 
+Resource       /robot/resources/ric/ric_utils.robot
+
 Library  KubernetesEntity  ${GLOBAL_RICPLT_NAMESPACE}
 Library  Collections
 Library  String
@@ -25,18 +27,9 @@ Library  String
 *** Test Cases ***
 Ensure RIC components are deployed and available
   [Tags]  etetests  k8stests  ci_tests
-  :FOR  ${component}  IN  @{GLOBAL_RICPLT_COMPONENTS}
-  \  ${deploymentName} =  Get From Dictionary  ${GLOBAL_RICPLT_COMPONENTS}  ${Component}
-  \  ${deploy} =          Deployment           ${deploymentName}
-  \  ${status} =          Most Recent Availability Condition                @{deploy.status.conditions}
-  \  Should Be Equal As Strings  ${status}  True  ignore_case=True  msg=${Component} is not available
-
-*** Keywords ***
-Most Recent Availability Condition
-  # this makes the probably-unsafe assumption that the conditions are ordered
-  # temporally.
-  [Arguments]  @{Conditions}
-  ${status} =  Set Variable  'False'
-  :FOR  ${Condition}  IN  @{Conditions}
-  \  ${status} =  Set Variable If  '${Condition.type}' == 'Available'  ${Condition.status}  ${status}
-  [Return]  ${status}
+  FOR  ${component}  IN  @{GLOBAL_RICPLT_COMPONENTS}
+     ${controllerName} =  Get From Dictionary              ${GLOBAL_RICPLT_COMPONENTS}  ${Component}
+     ${cType}  ${name} =  Split String  ${controllerName}  |
+     ${ctrl} =            Run Keyword   ${cType}           ${name}
+     Component Should Be Ready          ${ctrl}
+  END