Upgrade RF syntax for v3.2 compatibility

[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 a1e23da14aa3890936be93a70bf9e3a823a4a728..e6b4a8256b852dcbc7bc186239a41125b54af3ec 100644 (file)
--- a/csit/suites/nic/cli/console.robot
+++ b/csit/suites/nic/cli/console.robot
@@ -38,38 +38,40 @@ Verify NIC Command Add and Remove
     ...    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 availible for the test case to be run.
+    ...    until the intent:add command is available for the test case to be run.
     [Tags]    NIC
-    Wait Until Keyword Succeeds    10 min    5 sec    Verify Intent:Add Command is Availible
-    : FOR    ${intent}    IN    @{all_intents}
-    \    ${id}=    Add Intent    @{intent}
-    \    Append To List    ${all_intents_ids}    ${id}
+    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}
+    END
     ${size}=    Get Length    ${all_intents}
-    : FOR    ${index}    IN RANGE    ${size}
-    \    ${intent}=    Get From List    ${all_intents}    ${index}
-    \    ${intent_id}=    Get From List    ${all_intents_ids}    ${index}
-    \    Verify Intent Added    ${intent_id}    ${intent}
+    FOR    ${index}    IN RANGE    ${size}
+        ${intent}=    Get From List    ${all_intents}    ${index}
+        ${intent_id}=    Get From List    ${all_intents_ids}    ${index}
+        Verify Intent Added    ${intent_id}    ${intent}
+    END
     ${output}=    Issue Command On Karaf Console    intent:compile
     ${size}=    Get Length    ${all_intent_validations}
-    : FOR    ${index}    IN RANGE    ${size}
-    \    ${compiled_intent_validation}=    Get From List    ${all_intent_validations}    ${index}
-    \    ${intent_validation_line}=    Get Lines Containing String    ${output}    ${compiled_intent_validation}
-    \    ${policy}=    Get From List    ${all_intent_validations_policies}    ${index}
-    \    Should Contain    ${intent_validation_line}    ${policy}
-    : FOR    ${intent_id}    IN    @{all_intents_ids}
-    \    Remove Intent    ${intent_id}
+    FOR    ${index}    IN RANGE    ${size}
+        ${compiled_intent_validation}=    Get From List    ${all_intent_validations}    ${index}
+        ${intent_validation_line}=    Get Lines Containing String    ${output}    ${compiled_intent_validation}
+        ${policy}=    Get From List    ${all_intent_validations_policies}    ${index}
+        Should Contain    ${intent_validation_line}    ${policy}
+    END
+    FOR    ${intent_id}    IN    @{all_intents_ids}
+        Remove Intent    ${intent_id}
+    END
     ${output}=    Issue Command On Karaf Console    intent:list -c
-    : FOR    ${intent_id}    IN    @{all_intents_ids}
-    \    Should Not Contain    ${output}    ${id}
+    FOR    ${intent_id}    IN    @{all_intents_ids}
+        Should Not Contain    ${output}    ${id}
+    END
 
 *** 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
-    Start Suite
-    Verify Feature Is Installed    odl-nic-core
-    Verify Feature Is Installed    odl-nic-console
+    [Documentation]    Installing NIC Console related features (odl-nic-core-mdsal)
+    Start Mininet
+    Verify Feature Is Installed    odl-nic-core-mdsal
 
 Add Intent
     [Arguments]    ${intent_from}    ${intent_to}    ${intent_permission}
@@ -81,13 +83,12 @@ Add Intent
     ${id}=    Get From List    ${output_split}    3
     [Return]    ${id}
 
-Verify Intent:Add Command is Availible
-    [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 availible. 
+Verify Intent:Add Command is Available
+    [Documentation]    Verifies that 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