From 11827b2bab19e12ffa5f1d970198f6044aa75560 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Thu, 22 Jun 2017 16:43:57 -0700 Subject: [PATCH] Remove nic vtnrenderer csit per this email, vtnrenderer csit is no longer needed: https://lists.opendaylight.org/pipermail/nic-dev/2017-June/001713.html ideally, this patch will be merged after this patch in releng/builder: https://git.opendaylight.org/gerrit/#/c/59435/ Change-Id: I77aefbfab5d3ca5dcce8953e00033c7195cf37a5 Signed-off-by: Jamo Luhrsen --- csit/suites/nic/vtn_renderer/__init__.robot | 6 -- .../vtn_renderer_nic_cli_test.robot | 67 ------------------- .../vtn_renderer_nic_rest_test.robot | 27 -------- csit/testplans/nic-vtnrenderer.txt | 2 - 4 files changed, 102 deletions(-) delete mode 100644 csit/suites/nic/vtn_renderer/__init__.robot delete mode 100644 csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot delete mode 100644 csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot delete mode 100644 csit/testplans/nic-vtnrenderer.txt diff --git a/csit/suites/nic/vtn_renderer/__init__.robot b/csit/suites/nic/vtn_renderer/__init__.robot deleted file mode 100644 index 714cde20b3..0000000000 --- a/csit/suites/nic/vtn_renderer/__init__.robot +++ /dev/null @@ -1,6 +0,0 @@ -*** Settings *** -Documentation Test suite for NIC VTN Renderer(OF13) -Suite Setup Start NIC VTN Renderer Suite -Suite Teardown Stop NIC VTN Renderer Suite -Library SSHLibrary -Resource ../../../libraries/NicKeywords.robot 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 deleted file mode 100644 index 0119f9358a..0000000000 --- a/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot +++ /dev/null @@ -1,67 +0,0 @@ -*** Settings *** -Documentation Basic Tests for VTN Renderer using NIC CLI. -... -... Copyright (c) 2015 NEC. All rights reserved. -... -... This program and the accompanying materials are made available under the -... terms of the Eclipse Public License v1.0 which accompanies this distribution, -... and is available at http://www.eclipse.org/legal/epl-v10.html -Suite Setup Setup NIC Console Environment -Suite Teardown Stop NIC Vtn Rest Test Suite -Library SSHLibrary -Library Collections -Library ../../../libraries/Common.py -Resource ../../../libraries/NicKeywords.robot -Resource ../../../libraries/MininetKeywords.robot - -*** Variables *** -${switches} 8 -@{valid_intent1} 10.0.0.1 10.0.0.2 ALLOW -@{valid_intent2} 10.0.0.2 10.0.0.4 BLOCK -@{valid_intent3} 10.0.0.3 10.0.0.5 ALLOW -@{invalid_Intent1} 10.0.3.4.5 10.0.0.3 ALLOW -@{invalid_Intent2} 10.0.3.5 10.0.0.3 ALLOW -@{all_invalid_Intent} ${invalid_Intent1} ${invalid_Intent2} -@{all_valid_intent} ${valid_intent1} ${valid_intent2} ${valid_intent3} -@{all_intents_ids} - -*** Test Cases *** -Verify VTN Install - [Documentation] Verify if VTN manager bundles are installed. - Wait Until Keyword Succeeds 1000s 10s Verify VTNBundle - -Verify VTN Renderer Command Add and Remove in CLI - [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. - [Tags] NIC - : FOR ${intent} IN @{all_valid_intent} - \ ${id}= Add Intent From Karaf Console @{intent} - \ Append To List ${all_intents_ids} ${id} - Switch Connection ${mininet_conn_id} - Mininet Ping Should Succeed h1 h2 - Mininet Ping Should Succeed h3 h5 - Mininet Ping Should Not Succeed h2 h4 - : FOR ${intent_id} IN @{all_intents_ids} - \ Remove Intent From Karaf Console ${intent_id} - -Verify Invalid VTN Renderer Command Add in CLI - [Documentation] Invalid IP address for intent creation It first creates the intents - ... and stores the intent ids, but flow condition and flowfilter was not created. - [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 is specified in Intent configuration" - \ Should Contain ${output} Invalid address is specified in Intent configuration - -*** Keywords *** -Verify VTNBundle - ${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-mdsal, odl-nic-renderer-vtn) - Verify Feature Is Installed odl-nic-core-mdsal - Verify Feature Is Installed odl-nic-renderer-vtn - Clean Mininet System - Start Mininet Linear ${switches} diff --git a/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot b/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot deleted file mode 100644 index 023b7e822d..0000000000 --- a/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot +++ /dev/null @@ -1,27 +0,0 @@ -*** Settings *** -Documentation Test suite for NIC VTN Renderer -Suite Setup Start NIC VTN Rest Test Suite -Suite Teardown Stop NIC Vtn Rest Test Suite -Resource ../../../libraries/NicKeywords.robot - -*** Test Cases *** -Add Intent - [Documentation] Create a new intent . - Add Intent Using RestConf ${INTENT_ID} { "intent:intent" : { "intent:id": ${INTENT_ID} , "intent:actions" : [ { "order" : 1, "block" : {} } ], "intent:subjects" : [ { "order":1 , "end-point-group" : {name:"10.0.0.1"} }, { "order":2 , "end-point-group" : {name:"10.0.0.2"}} ] } } - -Verify Intent - [Documentation] Verify the Intent created. - Verify Intent Using RestConf ${INTENT_ID} - -Update Intent - [Documentation] Update the Intent created. - Update Intent Using RestConf ${INTENT_ID} { "intent:intent" : { "intent:id": ${INTENT_ID} , "intent:actions" : [ { "order" : 2, "allow" : {} } ], "intent:subjects" : [ { "order":1 , "end-point-group" : {name:"10.0.0.1"} }, { "order":2 , "end-point-group" : {name:"10.0.0.2"}} ] } } - -Verify Ping - [Documentation] Ping h1 to h2, to verify no packet loss - Mininet Ping Should Succeed h1 h2 - -Delete Intent - [Documentation] Delete the intent created. - Delete Intent Using RestConf ${INTENT_ID} - Wait Until Keyword Succeeds 10s 1s Mininet Ping Should Not Succeed h1 h2 diff --git a/csit/testplans/nic-vtnrenderer.txt b/csit/testplans/nic-vtnrenderer.txt deleted file mode 100644 index 70f6b7749d..0000000000 --- a/csit/testplans/nic-vtnrenderer.txt +++ /dev/null @@ -1,2 +0,0 @@ -# Place the suites in run order: -integration/test/csit/suites/nic/vtn_renderer -- 2.36.6