From e0a00943a226144b726c55cfab6e9fdecd20d108 Mon Sep 17 00:00:00 2001 From: Ryan Vail Date: Fri, 13 Nov 2015 14:02:57 -0700 Subject: [PATCH] updated packetcable csit test for changed api -Added csit/libraries/PacketcableVersion.robot to handle variable setting based on a new ODL_VERSION option that can (optionally) be supplied to robot. Defaults to master if not set. -Resources split into two groups lithium and master. -Test cases updated to use new variables so both Li and Be can be tested Change-Id: Icd397f9122ddc9bc159ec6956a32496e349ae1d4 Signed-off-by: Ryan Vail --- csit/libraries/PacketcableVersion.robot | 23 +++++++++ .../PCMM/010__pcmm_rest_call.robot | 26 +++++----- .../packetcable/{ => lithium}/add_ccap.json | 2 +- .../{ => lithium}/add_multi_ccaps.json | 0 .../packetcable/master/add_ccap.json | 22 +++++++++ .../packetcable/master/add_multi_ccaps.json | 48 +++++++++++++++++++ 6 files changed, 108 insertions(+), 13 deletions(-) create mode 100644 csit/libraries/PacketcableVersion.robot rename csit/variables/packetcable/{ => lithium}/add_ccap.json (99%) rename csit/variables/packetcable/{ => lithium}/add_multi_ccaps.json (100%) create mode 100644 csit/variables/packetcable/master/add_ccap.json create mode 100644 csit/variables/packetcable/master/add_multi_ccaps.json diff --git a/csit/libraries/PacketcableVersion.robot b/csit/libraries/PacketcableVersion.robot new file mode 100644 index 0000000000..8460943420 --- /dev/null +++ b/csit/libraries/PacketcableVersion.robot @@ -0,0 +1,23 @@ +*** Settings *** +Documentation This setup variable for Packetcable based on ODL version + +*** Variables *** +${ODL_VERSION} master # defaults to latest version in the master branch +${ODLREST_CCAPS} /restconf/config/packetcable:ccaps +${CCAP_TOKEN} ccap +${PACKETCABLE_RESOURCE_DIR} ${CURDIR}/../variables/packetcable/${ODL_VERSION} + +*** Keywords *** +Init Variables + Run Keyword If "${ODL_VERSION}" == "lithium" Init Variables Lithium + log ${ODL_VERSION} + log ${ODLREST_CCAPS} + log ${CCAP_TOKEN} + +Init Variables Lithium + Set Suite Variable ${ODLREST_CCAPS} /restconf/config/packetcable:ccap + Set Suite Variable ${CCAP_TOKEN} ccaps + +Create Session And Init Variables + Init Variables + Create Session ODLSession http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} diff --git a/csit/suites/packetcable/PCMM/010__pcmm_rest_call.robot b/csit/suites/packetcable/PCMM/010__pcmm_rest_call.robot index 58b3eebeb6..daca115253 100644 --- a/csit/suites/packetcable/PCMM/010__pcmm_rest_call.robot +++ b/csit/suites/packetcable/PCMM/010__pcmm_rest_call.robot @@ -1,16 +1,15 @@ *** Settings *** -Documentation Checking Network created in OVSDB are pushed to OpenDaylight -Suite Setup Create Session ODLSession http://${CONTROLLER}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS} +Documentation Checking packetcable:ccap resconf is working +Suite Setup Create Session And Init Variables Suite Teardown Delete All Sessions Library OperatingSystem Library String Library RequestsLibrary Library ../../../libraries/Common.py Variables ../../../variables/Variables.py +Resource ../../../libraries/PacketcableVersion.robot *** Variables *** -${ODLREST_CAPP} /restconf/config/packetcable:ccap -${PACKETCABLE_CONFIG_DIR} ${CURDIR}/../../../variables/packetcable ${CCAP_ID1} 93b7d8de-15fb-11e5-b60b-1697f925ec7b ${CCAP_ID2} dc13b3fc-15fe-11e5-b60b-1697f925ec7b ${CCAP_IP1} 192.168.1.101 @@ -20,45 +19,48 @@ ${CCAP_IP2} 192.168.1.102 Add CCAP [Documentation] Add Single CCAP [Tags] PacketCable PCMM Reset Call - ${Data} OperatingSystem.Get File ${PACKETCABLE_CONFIG_DIR}/add_ccap.json + ${Data} OperatingSystem.Get File ${PACKETCABLE_RESOURCE_DIR}/add_ccap.json ${Data} Replace String ${Data} {ccapId-1} ${CCAP_ID1} ${Data} Replace String ${Data} {ccapIp-1} ${CCAP_IP1} log ${Data} - ${resp} RequestsLibrary.Put ODLSession ${ODLREST_CAPP}/ccaps/${CCAP_ID1} data=${Data} headers=${HEADERS} + log ${ODLREST_CCAPS}/${CCAP_TOKEN}/${CCAP_ID1} + ${resp} RequestsLibrary.Put Request ODLSession ${ODLREST_CCAPS}/${CCAP_TOKEN}/${CCAP_ID1} data=${Data} headers=${HEADERS} Should be Equal As Strings ${resp.status_code} 200 Get CCAP [Documentation] Get Single CCAP [Tags] PacketCable PCMM Reset Call - ${resp} RequestsLibrary.Get ODLSession ${ODLREST_CAPP}/ccaps/${CCAP_ID1} + log ${ODLREST_CCAPS}/${CCAP_TOKEN}/${CCAP_ID1} + ${resp} RequestsLibrary.Get Request ODLSession ${ODLREST_CCAPS}/${CCAP_TOKEN}/${CCAP_ID1} Should be Equal As Strings ${resp.status_code} 200 Delete CAPP [Documentation] Delete Single CCAP [Tags] PacketCable PCMM Reset Call - ${resp} RequestsLibrary.Delete ODLSession ${ODLREST_CAPP}/ccaps/${CCAP_ID1} + log ${ODLREST_CCAPS}/${CCAP_TOKEN}/${CCAP_ID1} + ${resp} RequestsLibrary.Delete Request ODLSession ${ODLREST_CCAPS}/${CCAP_TOKEN}/${CCAP_ID1} Should be Equal As Strings ${resp.status_code} 200 Add Multiple.CCAPs [Documentation] Add Multiple CCAPs [Tags] PacketCable PCMM Reset Call - ${Data} OperatingSystem.Get File ${PACKETCABLE_CONFIG_DIR}/add_multi_ccaps.json + ${Data} OperatingSystem.Get File ${PACKETCABLE_RESOURCE_DIR}/add_multi_ccaps.json ${Data} Replace String ${Data} {ccapId-1} ${CCAP_ID1} ${Data} Replace String ${Data} {ccapIp-1} ${CCAP_IP1} ${Data} Replace String ${Data} {ccapId-2} ${CCAP_ID2} ${Data} Replace String ${Data} {ccapIp-2} ${CCAP_IP2} log ${Data} - ${resp} RequestsLibrary.Put ODLSession ${ODLREST_CAPP} data=${Data} headers=${HEADERS} + ${resp} RequestsLibrary.Put Request ODLSession ${ODLREST_CCAPS} data=${Data} headers=${HEADERS} Should be Equal As Strings ${resp.status_code} 200 Get ALL.CCAPs [Documentation] Get ALL CCAPs [Tags] PacketCable PCMM Reset Call - ${resp} RequestsLibrary.Get ODLSession ${ODLREST_CAPP} + ${resp} RequestsLibrary.Get Request ODLSession ${ODLREST_CCAPS} Should be Equal As Strings ${resp.status_code} 200 Delete All.CCAPs [Documentation] Delete ALL CCAPs [Tags] PacketCable PCMM Reset Call - ${resp} RequestsLibrary.Delete ODLSession ${ODLREST_CAPP} + ${resp} RequestsLibrary.Delete Request ODLSession ${ODLREST_CCAPS} Should be Equal As Strings ${resp.status_code} 200 diff --git a/csit/variables/packetcable/add_ccap.json b/csit/variables/packetcable/lithium/add_ccap.json similarity index 99% rename from csit/variables/packetcable/add_ccap.json rename to csit/variables/packetcable/lithium/add_ccap.json index af72ddf38d..65c7298bf6 100644 --- a/csit/variables/packetcable/add_ccap.json +++ b/csit/variables/packetcable/lithium/add_ccap.json @@ -19,4 +19,4 @@ "extrm_up" ] }] -} \ No newline at end of file +} diff --git a/csit/variables/packetcable/add_multi_ccaps.json b/csit/variables/packetcable/lithium/add_multi_ccaps.json similarity index 100% rename from csit/variables/packetcable/add_multi_ccaps.json rename to csit/variables/packetcable/lithium/add_multi_ccaps.json diff --git a/csit/variables/packetcable/master/add_ccap.json b/csit/variables/packetcable/master/add_ccap.json new file mode 100644 index 0000000000..b5ba64ad70 --- /dev/null +++ b/csit/variables/packetcable/master/add_ccap.json @@ -0,0 +1,22 @@ +{ + "ccap": [{ + "ccapId": "{ccapId-1}", + "amId": { + "am-tag": "0xcada", + "am-type": "1" + }, + "connection": { + "ipAddress": "{ccapIp-1}", + "port": "6060" + }, + "subscriber-subnets": [ + "10.32.110.1/24" + ], + "downstream-scns": [ + "extrm_dn" + ], + "upstream-scns": [ + "extrm_up" + ] + }] +} diff --git a/csit/variables/packetcable/master/add_multi_ccaps.json b/csit/variables/packetcable/master/add_multi_ccaps.json new file mode 100644 index 0000000000..78c043885a --- /dev/null +++ b/csit/variables/packetcable/master/add_multi_ccaps.json @@ -0,0 +1,48 @@ +{ "ccaps": { + "ccap": [ + { "ccapId": "{ccapId-1}", + "amId": { + "am-tag": "0xcada", + "am-type": "1" + }, + "connection": { + "ipAddress": "{ccapIp-1}", + "port": "6060" + }, + "subscriber-subnets": [ + "44.137.0.0/16", + "2001:4978:030d:1000:0:0:0:0/52" + ], + "downstream-scns": [ + "ipvideo_dn", + "extrm_dn", + "SCNC" + ], + "upstream-scns": [ + "SCNA", + "extrm_up" + ] + }, + { "ccapId": "{ccapId-2}", + "amId": { + "am-tag": "0xcada", + "am-type": "1" + }, + "connection": { + "ipAddress": "{ccapIp-2}", + "port": "6060" + }, + "subscriber-subnets": [ + "44.133.0.0/19" + ], + "downstream-scns": [ + "ipvideo_dn", + "extrm_dn", + "SCNC" + ], + "upstream-scns": [ + "SCNA", + "extrm_up" + ] + }] +}} -- 2.36.6