FIXED typo in NIC cli keyword

[integration/test.git] / csit / suites / nic / cli / console.robot

diff --git a/csit/suites/nic/cli/console.robot b/csit/suites/nic/cli/console.robot
index 34639838cc64445030a298a907debf71e25212af..4a7ed16e4d89e2558a23899f91b0e136f1c0e7b9 100644 (file)
--- a/csit/suites/nic/cli/console.robot
+++ b/csit/suites/nic/cli/console.robot
@@ -37,7 +37,10 @@ Verify NIC Command Add and Remove
     [Documentation]    Verification of NIC Console command add and remove. It first creates the intents
     ...    and stores the intent ids, then verifies that the intents were added. Finally, it compiles the intents
     ...    to verify that intents were properly merged and also validates intents were removed at the end per the cleanup procedure.
+    ...    The command "Wait Until Keyword Succeeds" is used to poll for 10 minutes
+    ...    until the intent:add command is available for the test case to be run.
     [Tags]    NIC
+    Wait Until Keyword Succeeds    1 min    5 sec    Verify Intent:Add Command is Available
     : FOR    ${intent}    IN    @{all_intents}
     \    ${id}=    Add Intent    @{intent}
     \    Append To List    ${all_intents_ids}    ${id}
@@ -61,23 +64,27 @@ Verify NIC Command Add and Remove
 
 *** Keywords ***
 Setup NIC Console Environment
-    [Documentation]    Installing NIC Console related features (odl-nic-core, odl-nic-console)
-    Install a Feature    odl-nic-core
-    Install a Feature    odl-nic-console
+    [Documentation]    Installing NIC Console related features (odl-nic-core-mdsal, odl-nic-console)
     Start Suite
-    Verify Feature Is Installed    odl-nic-core
+    Verify Feature Is Installed    odl-nic-core-mdsal
     Verify Feature Is Installed    odl-nic-console
 
 Add Intent
     [Arguments]    ${intent_from}    ${intent_to}    ${intent_permission}
     [Documentation]    Adds an intent to the controller, and returns the id of the intent created.
-    ${output}=    Issue Command On Karaf Console    intent:add -f ${intent_from} -t ${intent_to} -a ${intent_permission}    timeout=60
+    ${output}=    Issue Command On Karaf Console    intent:add -f ${intent_from} -t ${intent_to} -a ${intent_permission}
     Should Contain    ${output}    Intent created
     ${output}=    Fetch From Left    ${output}    )
     ${output_split}=    Split String    ${output}    ${SPACE}
     ${id}=    Get From List    ${output_split}    3
     [Return]    ${id}
 
+Verify Intent:Add Command is Available
+    [Documentation]    Verifies that odl-nic-console is up and intent:add command is available to be used.
+    ...    Should be used with the command "Wait Until Keyword Succeeds" to poll until command is available.
+    ${output}=    Issue Command On Karaf Console    intent:add
+    Should Not Contain    ${output}    Command not found
+
 Verify Intent Added
     [Arguments]    ${id}    ${intent}
     [Documentation]    This will check if the id exists via intent:list -c, then compares intent details with arguments passed in with Add Intent