From 03a495713da87075e7ee5ea366fc66f60ea8a4a5 Mon Sep 17 00:00:00 2001 From: adetalhouet Date: Wed, 3 Feb 2016 14:08:36 -0500 Subject: [PATCH] Rename NIC features Feature file was remodel in NIC: https://git.opendaylight.org/gerrit/#/c/33996/ This patch address the feature name changed. Change-Id: I287ac82f787bf19e768f0558d4fd71c70532b767 Signed-off-by: adetalhouet --- csit/suites/nic/cli/console.robot | 10 +++++----- .../nic/vtn_renderer/vtn_renderer_nic_cli_test.robot | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/csit/suites/nic/cli/console.robot b/csit/suites/nic/cli/console.robot index 4ae0023237..cf8c0ee15c 100644 --- a/csit/suites/nic/cli/console.robot +++ b/csit/suites/nic/cli/console.robot @@ -38,9 +38,9 @@ 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 1 min 5 sec Verify Intent:Add Command is Availible + 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} @@ -64,9 +64,9 @@ Verify NIC Command Add and Remove *** Keywords *** Setup NIC Console Environment - [Documentation] Installing NIC Console related features (odl-nic-core, 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 @@ -81,7 +81,7 @@ Add Intent 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. + ... 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 diff --git a/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot b/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot index 58a834280f..431dfa18e7 100644 --- a/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot +++ b/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot @@ -51,17 +51,17 @@ Verify Invalid VTN Renderer Command Add and Remove in CLI [Tags] NIC : FOR ${intent} IN @{all_invalid_Intent} \ ${id}= Add Intent From Karaf Console @{intent} - \ ${output}= Issue Command On Karaf Console log:display |grep "Invalid Address" + \ ${output}= Issue Command On Karaf Console log:display | grep "Invalid Address" \ Should Contain ${output} Invalid Address *** Keywords *** Verify VTNBundle - ${output}= Issue Command On Karaf Console bundle:list |grep vtn-renderer + ${output}= Issue Command On Karaf Console bundle:list | grep vtn-renderer Should Contain ${output} Active Setup NIC Console Environment - [Documentation] Installing NIC Console related features (odl-nic-core, odl-nic-console) - Verify Feature Is Installed odl-nic-core + [Documentation] Installing NIC Console related features (odl-nic-core-mdsal, odl-nic-console, odl-nic-console) + Verify Feature Is Installed odl-nic-core-mdsal Verify Feature Is Installed odl-nic-console Verify Feature Is Installed odl-nic-renderer-vtn Clean Mininet System -- 2.36.6