From eb4de0c27ea93d6a1acd40c818adcb9487ed6d0a Mon Sep 17 00:00:00 2001 From: Lorand Jakab Date: Wed, 3 Jun 2015 13:13:01 +0300 Subject: [PATCH] LISP: Remove Northbound tests The old AD-SAL based Northbound interface was deprecated in Lithium and is currently broken, so remove it from the test suite. Change-Id: Ib5b88c8f3999b2c932a3cd2de92a5c2bdab79d2e Signed-off-by: Lorand Jakab --- .../basic/020_Northbound.robot | 35 ----- .../variables/lispflowmapping/Variables.py | 143 ------------------ 2 files changed, 178 deletions(-) delete mode 100644 test/csit/suites/lispflowmapping/basic/020_Northbound.robot delete mode 100644 test/csit/variables/lispflowmapping/Variables.py diff --git a/test/csit/suites/lispflowmapping/basic/020_Northbound.robot b/test/csit/suites/lispflowmapping/basic/020_Northbound.robot deleted file mode 100644 index 1612bf0483..0000000000 --- a/test/csit/suites/lispflowmapping/basic/020_Northbound.robot +++ /dev/null @@ -1,35 +0,0 @@ -*** Settings *** -Documentation Test suite to verify AD-SAL based Northbound is OK -Suite Setup Create Session session http://${CONTROLLER}:${RESTPORT} auth=${AUTH} headers=${HEADERS} -Suite Teardown Delete All Sessions -Library Collections -Library RequestsLibrary -Library ../../../libraries/Common.py -Variables ../../../variables/Variables.py -Variables ../../../variables/lispflowmapping/Variables.py -Resource ../../../libraries/Utils.txt - -*** Variables *** -${NB_KEY} /lispflowmapping/nb/v2/default/key -${NB_MAPPING} /lispflowmapping/nb/v2/default/mapping -${EID_V4} 192.0.2.1 - -*** Test Cases *** -Add Key - [Documentation] Add key for mapping registration - ${resp} RequestsLibrary.Put session ${NB_KEY} ${add_key} - Log ${resp.content} - Should Be Equal As Strings ${resp.status_code} 200 - -Add Mapping - [Documentation] Add mapping to database - ${resp} RequestsLibrary.Put session ${NB_MAPPING} ${add_mapping} - Log ${resp.content} - Should Be Equal As Strings ${resp.status_code} 200 - -Get Mapping - [Documentation] Get a mapping from the database - ${resp} RequestsLibrary.Get session ${NB_MAPPING}/0/1/${EID_V4}/32 - Log ${resp.content} - Should Be Equal As Strings ${resp.status_code} 200 - Dictionaries Should Be Equal ${resp.json()} ${get_mapping} diff --git a/test/csit/variables/lispflowmapping/Variables.py b/test/csit/variables/lispflowmapping/Variables.py deleted file mode 100644 index e3056abc4f..0000000000 --- a/test/csit/variables/lispflowmapping/Variables.py +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright (c) 2015 Cisco Systems, Inc. and others. 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 - -__author__ = "Lorand Jakab" -__copyright__ = "Copyright(c) 2015, Cisco Systems, Inc." -__license__ = "Eclipse Public License v1.0" -__email__ = "lojakab@cisco.com" - - -def get_variables(): - add_key = { - "key": "password", - "maskLength": 24, - "address": { - "ipAddress": "192.0.2.0", - "afi": 1 - } - } - add_mapping = { - "key": "password", - "mapregister": { - "proxyMapReply": True, - "eidToLocatorRecords": [{ - "authoritative": True, - "prefixGeneric": { - "ipAddress": "192.0.2.0", - "afi": 1 - }, - "mapVersion": 0, - "maskLength": 24, - "action": "NoAction", - "locators": [{ - "multicastPriority": 255, - "locatorGeneric": { - "ipAddress": "127.0.0.1", - "afi": 1 - }, - "routed": True, - "multicastWeight": 0, - "rlocProbed": False, - "localLocator": False, - "priority": 1, - "weight": 1 - }, { - "multicastPriority": 255, - "locatorGeneric": { - "ipAddress": "127.0.0.2", - "afi": 1 - }, - "routed": True, - "multicastWeight": 0, - "rlocProbed": False, - "localLocator": False, - "priority": 2, - "weight": 1 - }], - "recordTtl": 5 - }], - "keyId": 0 - } - } - get_mapping = { - "recordTtl": 5, - "maskLength": 24, - "action": "NoAction", - "authoritative": True, - "mapVersion": 0, - "prefixGeneric": { - "afi": 1, - "ipAddress": "192.0.2.0", - "instanceId": 0, - "asNum": 0, - "lcafType": 0, - "protocol": 0, - "ipTos": 0, - "localPort": 0, - "remotePort": 0, - "iidMaskLength": 0, - "srcMaskLength": 0, - "dstMaskLength": 0, - "lookup": False, - "RLOCProbe": False, - "strict": False - }, - "locators": [{ - "priority": 1, - "weight": 1, - "multicastPriority": 255, - "multicastWeight": 0, - "localLocator": False, - "rlocProbed": False, - "routed": True, - "locatorGeneric": { - "afi": 1, - "ipAddress": "127.0.0.1", - "instanceId": 0, - "asNum": 0, - "lcafType": 0, - "protocol": 0, - "ipTos": 0, - "localPort": 0, - "remotePort": 0, - "iidMaskLength": 0, - "srcMaskLength": 0, - "dstMaskLength": 0, - "lookup": False, - "RLOCProbe": False, - "strict": False - } - }, { - "priority": 2, - "weight": 1, - "multicastPriority": 255, - "multicastWeight": 0, - "localLocator": False, - "rlocProbed": False, - "routed": True, - "locatorGeneric": { - "afi": 1, - "ipAddress": "127.0.0.2", - "instanceId": 0, - "asNum": 0, - "lcafType": 0, - "protocol": 0, - "ipTos": 0, - "localPort": 0, - "remotePort": 0, - "iidMaskLength": 0, - "srcMaskLength": 0, - "dstMaskLength": 0, - "lookup": False, - "RLOCProbe": False, - "strict": False - } - }] - } - variables = {'add_key': add_key, - 'add_mapping': add_mapping, - 'get_mapping': get_mapping} - return variables -- 2.36.6