From 5e304afdb3f47430988419228f9b217ad339dd59 Mon Sep 17 00:00:00 2001 From: Sangwook Ha Date: Fri, 9 Sep 2022 19:20:43 -0700 Subject: [PATCH] Update Robot Framework format - step 8 Robotidy has stricter formatting rules for line width, alignment, section ordering & spacing, etc. Update the format of Robot Framework files in the following directory with Robotidy: - csit/suites/integration - csit/suites/iotdm - csit/suites/jsonrpc JIRA: INTTEST-132 Change-Id: Ic64caa05257df2e2fc603c63139f4c0eaa8ca173 Signed-off-by: Sangwook Ha --- .../suites/integration/Create_JVM_Plots.robot | 6 +- .../integration/basic/restconf_modules.robot | 13 +- .../iotdm/basic/001_SanityTestsHttp.robot | 21 ++-- .../iotdm/basic/010_PrimitveParameters.robot | 53 +++++--- .../basic/020_ResourceAttributesCseBase.robot | 28 +++-- .../021_ResourceAttributesContainer.robot | 114 +++++++++++------- ...22_ResourceAttributesContentInstance.robot | 77 ++++++++---- .../basic/023_ResourceAttributesAE.robot | 58 ++++++--- .../basic/024_ResourceAttributesACP.robot | 54 +++++---- .../basic/025_ResourceAttributesNode.robot | 33 ++--- .../basic/026_ResourceAttributesGroup.robot | 20 +-- .../090_ResourceHierarchyAddressing.robot | 20 +-- .../basic/091_ResourceHierarchyDelete.robot | 25 ++-- .../092_ResourceHierarchyAE_CNT_CIN.robot | 82 ++++++++++--- .../093_ResourceHierarchyChildResources.robot | 24 ++-- .../094_ResourceHierarchyPersistence.robot | 36 +++--- .../basic/101_ProceduresLatestOldest.robot | 24 ++-- .../iotdm/basic/102_ProceduresContent.robot | 24 ++-- .../iotdm/basic/103_ProceduresGroupMgmt.robot | 30 ++--- .../iotdm/basic/104_ProceduresACP.robot | 28 +++-- .../basic/105_ProceduresRegistration.robot | 20 +-- .../iotdm/basic/200_IoTDMInfraPlugins.robot | 56 +++++---- .../basic/201_IoTDMInfraPluginLoaders.robot | 14 ++- .../iotdm/basic/210_IoTDMSecurityNoAuth.robot | 26 ++-- .../jsonrpc/010-mdsal-jsonrpc-basic.robot | 19 +-- 25 files changed, 553 insertions(+), 352 deletions(-) diff --git a/csit/suites/integration/Create_JVM_Plots.robot b/csit/suites/integration/Create_JVM_Plots.robot index 8921066591..0724ae51a3 100644 --- a/csit/suites/integration/Create_JVM_Plots.robot +++ b/csit/suites/integration/Create_JVM_Plots.robot @@ -1,6 +1,8 @@ *** Settings *** -Documentation Test suite to Plot JVM Resources -Resource ${CURDIR}/../../libraries/CheckJVMResource.robot +Documentation Test suite to Plot JVM Resources + +Resource ${CURDIR}/../../libraries/CheckJVMResource.robot + *** Test Cases *** Create JVM Plots diff --git a/csit/suites/integration/basic/restconf_modules.robot b/csit/suites/integration/basic/restconf_modules.robot index b4811b1caf..2e8afe568c 100644 --- a/csit/suites/integration/basic/restconf_modules.robot +++ b/csit/suites/integration/basic/restconf_modules.robot @@ -1,9 +1,12 @@ *** Settings *** -Documentation Test suite to verify Restconf is OK. -Suite Setup RequestsLibrary.Create_Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown RequestsLibrary.Delete_All_Sessions -Library RequestsLibrary -Resource ${CURDIR}/../../../variables/Variables.robot +Documentation Test suite to verify Restconf is OK. + +Library RequestsLibrary +Resource ${CURDIR}/../../../variables/Variables.robot + +Suite Setup RequestsLibrary.Create_Session session http://${ODL_SYSTEM_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown RequestsLibrary.Delete_All_Sessions + *** Test Cases *** Get Controller Modules diff --git a/csit/suites/iotdm/basic/001_SanityTestsHttp.robot b/csit/suites/iotdm/basic/001_SanityTestsHttp.robot index 5ac6220bd9..4a1acaa285 100644 --- a/csit/suites/iotdm/basic/001_SanityTestsHttp.robot +++ b/csit/suites/iotdm/basic/001_SanityTestsHttp.robot @@ -1,14 +1,18 @@ *** Settings *** -Documentation Sanity test suite verifies basic functionality of IoTDM but also -... functionality of testing client libraries. -... CRUD + N operations are performed on minimal resource tree using HTTP protocol. -Suite Setup Setup Suite -Suite Teardown End Suite -Resource ../../../libraries/IoTDM/iotdm_sanity_tests.robot -Resource ../../../libraries/IoTDM/IoTDMResources.robot +Documentation Sanity test suite verifies basic functionality of IoTDM but also +... functionality of testing client libraries. +... CRUD + N operations are performed on minimal resource tree using HTTP protocol. + +Resource ../../../libraries/IoTDM/iotdm_sanity_tests.robot +Resource ../../../libraries/IoTDM/IoTDMResources.robot + +Suite Setup Setup Suite +Suite Teardown End Suite + *** Variables *** -${rx_port} ${5000} +${rx_port} ${5000} + *** Test Cases *** 1.01 HTTP Sanity test - Create AE @@ -53,6 +57,7 @@ ${rx_port} ${5000} ... automatically. Sanity Test Create Content Instance And Use Automatic Notification Response + *** Keywords *** Setup Suite [Documentation] Connect to IoTDM and prepare testing resource tree diff --git a/csit/suites/iotdm/basic/010_PrimitveParameters.robot b/csit/suites/iotdm/basic/010_PrimitveParameters.robot index e8ecd69a83..a1402436ca 100644 --- a/csit/suites/iotdm/basic/010_PrimitveParameters.robot +++ b/csit/suites/iotdm/basic/010_PrimitveParameters.robot @@ -1,22 +1,26 @@ *** Settings *** -Documentation Testing of request and response primitives parameters -... Check specifications for more details: -... Request primitive parameters: TS-0004: 7.2.1.1 Request primitive format -... Response primitive parameters: TS-0004: 7.2.1.2 Response primitive format -... This test suite should be executed for all supported protocols, communication methods and -... content types and so it should cover all scenarios resulting in protocol specific processing. -Suite Setup Setup Suite -Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin -Resource ../../../libraries/SubStrings.robot -Library ../../../libraries/IoTDM/criotdm.py -Library Collections -Resource ../../../variables/Variables.robot -Resource ../../../libraries/IoTDM/IoTDMKeywords.robot +Documentation Testing of request and response primitives parameters +... Check specifications for more details: +... Request primitive parameters: TS-0004: 7.2.1.1 Request primitive format +... Response primitive parameters: TS-0004: 7.2.1.2 Response primitive format +... This test suite should be executed for all supported protocols, communication methods and +... content types and so it should cover all scenarios resulting in protocol specific processing. + +Resource ../../../libraries/SubStrings.robot +Library ../../../libraries/IoTDM/criotdm.py +Library Collections +Resource ../../../variables/Variables.robot +Resource ../../../libraries/IoTDM/IoTDMKeywords.robot + +Suite Setup Setup Suite +Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin + *** Variables *** -${rt_ae} 2 -${rt_container} 3 -${rt_contentInstance} 4 +${rt_ae} 2 +${rt_container} 3 +${rt_contentInstance} 4 + *** Test Cases *** 1.00 REQ: Create: With mandatory parameters only @@ -308,7 +312,10 @@ ${rt_contentInstance} 4 2.18.09.01 REQ: Retrieve: With Filter Criteria parameter - element labels (one) [Documentation] Tests Retrieve REQ with Filter Criteria parameter with one labels element. - ${r} = Retrieve Resource With Command ${iserver} InCSE1/Container3 rcn=4&sts=3&lbl=contentInstanceUnderContainerContainer + ${r} = Retrieve Resource With Command + ... ${iserver} + ... InCSE1/Container3 + ... rcn=4&sts=3&lbl=contentInstanceUnderContainerContainer Log ${r.text} ${rs} = Child Resource First ${r} ${count} = Get Length ${rs} @@ -317,7 +324,10 @@ ${rt_contentInstance} 4 2.18.09.02 REQ: Retrieve: With Filter Criteria parameter - element labels (two) [Documentation] Tests Retrieve REQ with Filter Criteria parameter with two labels elements. - ${r} = Retrieve Resource With Command ${iserver} InCSE1 fu=1&rcn=4&sts=4&lbl=contentInstanceUnderContainerContainer&lbl=underCSE + ${r} = Retrieve Resource With Command + ... ${iserver} + ... InCSE1 + ... fu=1&rcn=4&sts=4&lbl=contentInstanceUnderContainerContainer&lbl=underCSE Log ${r.text} ${count} = Get Length ${r.json()} Should Be Equal As Integers ${count} 6 @@ -976,6 +986,7 @@ ${rt_contentInstance} 4 [Tags] not-implemented exclude TODO + *** Keywords *** Connect And Create The Tree [Documentation] Create a tree that contain AE/ container / contentInstance in different layers @@ -996,10 +1007,12 @@ Connect And Create The Tree Create Resource ${iserver} InCSE1/Container3 ${rt_container} ${attr},"rn":"Container7" Create Resource ${iserver} InCSE1/Container3 ${rt_container} ${attr},"rn":"Container8" Create Resource ${iserver} InCSE1/Container3 ${rt_container} ${attr},"rn":"Container9" - ${attr} = Set Variable "cnf": "1","or": "http://hey/you","con":"102","lbl":["contentInstanceUnderAEContainer"] + ${attr} = Set Variable + ... "cnf": "1","or": "http://hey/you","con":"102","lbl":["contentInstanceUnderAEContainer"] Create Resource ${iserver} InCSE1/AE1/Container1 ${rt_contentInstance} ${attr},"rn":"conIn1" Create Resource ${iserver} InCSE1/AE1/Container1 ${rt_contentInstance} ${attr},"rn":"conIn2" - ${attr} = Set Variable "cnf": "1","or": "http://hey/you","con":"102","lbl":["contentInstanceUnderContainerContainer"] + ${attr} = Set Variable + ... "cnf": "1","or": "http://hey/you","con":"102","lbl":["contentInstanceUnderContainerContainer"] Create Resource ${iserver} InCSE1/Container3 ${rt_contentInstance} ${attr},"rn":"conIn3" Create Resource ${iserver} InCSE1/Container3 ${rt_contentInstance} ${attr},"rn":"conIn4" Create Resource ${iserver} InCSE1/Container3 ${rt_contentInstance} ${attr},"rn":"conIn5" diff --git a/csit/suites/iotdm/basic/020_ResourceAttributesCseBase.robot b/csit/suites/iotdm/basic/020_ResourceAttributesCseBase.robot index c4bff52a91..6fbe4514d7 100644 --- a/csit/suites/iotdm/basic/020_ResourceAttributesCseBase.robot +++ b/csit/suites/iotdm/basic/020_ResourceAttributesCseBase.robot @@ -1,17 +1,18 @@ *** Settings *** -Documentation Test suite tests CRUD operations with cseBase resource attributes -... CseBase resource must not be CRUD-able through OneM2M API so this test suite -... implements also negative TCs which makes attemts to CRUD cseBase and its attributes -... through OneM2M API. -... TODO: implement TCs according to 000_ResourceAttributesNotes.txt -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot - -*** Variables *** +Documentation Test suite tests CRUD operations with cseBase resource attributes +... CseBase resource must not be CRUD-able through OneM2M API so this test suite +... implements also negative TCs which makes attemts to CRUD cseBase and its attributes +... through OneM2M API. +... TODO: implement TCs according to 000_ResourceAttributesNotes.txt + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions + *** Test Cases *** 1.00 Add Test Cases @@ -29,6 +30,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/021_ResourceAttributesContainer.robot b/csit/suites/iotdm/basic/021_ResourceAttributesContainer.robot index 30486b9ff5..4fdc8acd44 100644 --- a/csit/suites/iotdm/basic/021_ResourceAttributesContainer.robot +++ b/csit/suites/iotdm/basic/021_ResourceAttributesContainer.robot @@ -1,17 +1,21 @@ *** Settings *** -Documentation Tests for Container resource attributes -Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} -Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin -Resource ../../../libraries/SubStrings.robot -Library ../../../libraries/IoTDM/criotdm.py -Library Collections -Resource ../../../variables/Variables.robot -Resource ../../../libraries/IoTDM/IoTDMKeywords.robot +Documentation Tests for Container resource attributes + +Resource ../../../libraries/SubStrings.robot +Library ../../../libraries/IoTDM/criotdm.py +Library Collections +Resource ../../../variables/Variables.robot +Resource ../../../libraries/IoTDM/IoTDMKeywords.robot + +Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} +Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin + *** Variables *** -${rt_ae} 2 -${rt_container} 3 -${rt_contentInstance} 4 +${rt_ae} 2 +${rt_container} 3 +${rt_contentInstance} 4 + *** Test Cases *** TODO Refactor test suite and implement TCs @@ -27,7 +31,7 @@ TODO Refactor test suite and implement TCs #================================================== # For Creation, there are no mandatory input attribute ${attr} = Set Variable "rn":"Container1" - ${r}= Create Resource With Command ${iserver} InCSE1 ${rt_container} rcn=3 ${attr} + ${r} = Create Resource With Command ${iserver} InCSE1 ${rt_container} rcn=3 ${attr} ${container} = Location ${r} ${status_code} = Status Code ${r} Should Be Equal As Integers ${status_code} 201 @@ -44,7 +48,7 @@ TODO Refactor test suite and implement TCs # create--> delete # update(create)--> update(modified)-->update (delete) ${attr} = Set Variable "mni":3,"rn":"Container2" - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${text} = Check Response and Retrieve Resource ${r} Should Contain ${text} "mni" @@ -76,7 +80,7 @@ Delete the Container2-2.1 2.21 maxByteSize (mbs) can be added when create [Documentation] maxByteSize (mbs) can be added when create ${attr} = Set Variable "mbs":20,"rn":"Container2" - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${text} = Check Response and Retrieve Resource ${r} Should Contain ${text} "mbs" @@ -108,7 +112,7 @@ Delete the Container2-2.2 2.31 ontologyRef(or) can be added when create [Documentation] ontologyRef(or) can be added when create ${attr} = Set Variable "or":"http://cisco.com","rn":"Container2" - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${text} = Check Response and Retrieve Resource For Update ${r} InCSE1/Container2 Should Contain ${text} "or" @@ -244,7 +248,10 @@ Delete the Container2-2.3 [Documentation] update resourceName and expect error ${attr} = Set Variable "rn":"aaa" ${error} = Update Container Expect Cannot Update Error ${attr} - Should Contain ${error} "error":"Resource Name cannot be updated: InCSE1/Container1/aaa" Error response is not correct + Should Contain + ... ${error} + ... "error":"Resource Name cannot be updated: InCSE1/Container1/aaa" + ... Error response is not correct 3.34 parentID cannot be update. [Documentation] update parentID and expect error @@ -355,7 +362,7 @@ Delete the Container2-2.3 # |--Contianer1 # |--Container2 ${attr} = Set Variable "rn":"Container2" - ${r}= Create Resource ${iserver} InCSE1/Container1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1/Container1 ${rt_container} ${attr} ${status_code} = Status Code ${r} ${oldr} = Retrieve Resource ${iserver} InCSE1/Container1 ${CSEID} = Resid ${oldr} @@ -369,9 +376,9 @@ Delete the Container2-2.3 # |--AE1 # |--Container2 ${attr} = Set Variable "api":"ODL","apn":"ODL","rr":true,"rn":"AE1" - ${r}= Create Resource ${iserver} InCSE1 ${rt_ae} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_ae} ${attr} ${attr} = Set Variable "rn":"Container2" - ${r}= Create Resource ${iserver} InCSE1/AE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1/AE1 ${rt_container} ${attr} ${status_code} = Status Code ${r} ${oldr} = Retrieve Resource ${iserver} InCSE1/AE1 ${CSEID} = Resid ${oldr} @@ -386,7 +393,7 @@ Delete the Container2-2.3 # |--Container2 # |--- Container3 ${attr} = Set Variable "rn":"Container3" - ${r}= Create Resource ${iserver} InCSE1/AE1/Container2 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1/AE1/Container2 ${rt_container} ${attr} ${status_code} = Status Code ${r} ${oldr} = Retrieve Resource ${iserver} InCSE1/AE1/Container2 ${CSEID} = Resid ${oldr} @@ -403,7 +410,7 @@ Delete the test AE-4.2 # CSE # |--Container2 ${attr} = Set Variable "rn":"Container2" - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${container} = Location ${r} ${status_code} = Status Code ${r} ${oldr} = Retrieve Resource ${iserver} ${container} @@ -556,7 +563,7 @@ Delete the Container2-4.3 4.41 when container create, cni should be 0 [Documentation] when container create, cni should be 0 ${attr} = Set Variable "rn":"Container2", "mni": 5 - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${container} = Location ${r} ${status_code} = Status Code ${r} ${oldr} = Retrieve Resource ${iserver} ${container} @@ -598,7 +605,7 @@ Delete the Container2-4.4 4.51 when container create, cbs should be 0 [Documentation] when container create, cbs should be 0 ${attr} = Set Variable "rn":"Container2", "mni": 5 - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${container} = Location ${r} ${status_code} = Status Code ${r} ${oldr} = Retrieve Resource ${iserver} ${container} @@ -640,7 +647,7 @@ Delete the Container2-4.5 4.61 if maxNrOfInstance = 1 , can create 1 contentInstance [Documentation] if maxNrOfInstance = 1 , can create 1 contentInstance ${attr} = Set Variable "mni":1,"rn":"Container2" - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${container} = Location ${r} ${status_code} = Status Code ${r} ${oldr} = Retrieve Resource ${iserver} ${container} @@ -666,13 +673,13 @@ Delete the Container2-4.5 4.63 if update to 3 , when create 4 or more contentInstance, the current number instance should be 3 [Documentation] if update to 3 , cannot create 4 contentInstance ${attr} = Set Variable "mni":3 - ${r}= Update Resource ${iserver} InCSE1/Container2 ${rt_container} ${attr} + ${r} = Update Resource ${iserver} InCSE1/Container2 ${rt_container} ${attr} ${attr} = Set Variable "cnf": "1","or": "http://hey/you","con":"102CSS" # create 3 Create Resource ${iserver} InCSE1/Container2 ${rt_contentInstance} ${attr} Create Resource ${iserver} InCSE1/Container2 ${rt_contentInstance} ${attr} #Create Resource ${iserver} InCSE1/Container2 ${rt_contentInstance} ${attr} - ${rr}= Retrieve resource ${iserver} InCSE1/Container2 + ${rr} = Retrieve resource ${iserver} InCSE1/Container2 Create Resource ${iserver} InCSE1/Container2 ${rt_contentInstance} ${attr} ${mni} = Max Number Of Instances ${rr} ${chr} = Child Resource ${rr} @@ -681,8 +688,8 @@ Delete the Container2-4.5 4.64 what if alread have 4, then set mni to 1 [Documentation] if alread have 4, then set mni to 1, will delete 3 children ${attr} = Set Variable "mni":1 - ${r}= Update Resource ${iserver} InCSE1/Container2 ${rt_container} ${attr} - ${rr}= Retrieve resource ${iserver} InCSE1/Container2 + ${r} = Update Resource ${iserver} InCSE1/Container2 ${rt_container} ${attr} + ${rr} = Retrieve resource ${iserver} InCSE1/Container2 ${chr} = Child Resource ${rr} ${mni} = Max Number Of Instances ${rr} ${cni} = Current Number Of Instances ${rr} @@ -695,7 +702,7 @@ Delete the Container2-4.6 4.71 if maxByteSize = 5 , can create contentInstance with contentSize 5 [Documentation] if maxByteSize = 5 , can create contentInstance with contentSize 5 ${attr} = Set Variable "mbs":5,"rn":"Container2", "mni": 5 - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${container} = Location ${r} ${status_code} = Status Code ${r} ${oldr} = Retrieve Resource ${iserver} ${container} @@ -706,20 +713,25 @@ Delete the Container2-4.6 [Documentation] if maxByteSize = 5 , cannot create contentInstance with contenSize 8 ${attr} = Set Variable "cnf": "1","or": "http://hey/you","con":"102C120c" # cannot create 2 - ${error} = Run Keyword And Expect Error Cannot create this resource [400]* Create Resource ${iserver} InCSE1/Container2 ${rt_contentInstance} + ${error} = Run Keyword And Expect Error + ... Cannot create this resource [400]* + ... Create Resource + ... ${iserver} + ... InCSE1/Container2 + ... ${rt_contentInstance} ... ${attr} 4.73 if update to 20 , cannot create another contentInstance [Documentation] if update to 20 , cannot create another contentInstance ${attr} = Set Variable "mbs":20 - ${r}= Update Resource ${iserver} InCSE1/Container2 ${rt_container} ${attr} + ${r} = Update Resource ${iserver} InCSE1/Container2 ${rt_container} ${attr} ${attr} = Set Variable "cnf": "1","or": "http://hey/you","con":"102CS" # create 4 cin Create Resource ${iserver} InCSE1/Container2 ${rt_contentInstance} ${attr} Create Resource ${iserver} InCSE1/Container2 ${rt_contentInstance} ${attr} Create Resource ${iserver} InCSE1/Container2 ${rt_contentInstance} ${attr} Create Resource ${iserver} InCSE1/Container2 ${rt_contentInstance} ${attr} - ${rr}= Retrieve resource ${iserver} InCSE1/Container2 + ${rr} = Retrieve resource ${iserver} InCSE1/Container2 ${cbs} = Current Byte Size ${rr} ${chr} = Child Resource ${rr} ${cni} = Current Number Of Instances ${rr} @@ -730,8 +742,8 @@ Delete the Container2-4.6 4.74 if already have 20, then set mbs to 5，will delete contentInstance until mbs less than 5. [Documentation] what if already have 20, then set mbs to 5, will delete contentInstance until mbs less than 5. ${attr} = Set Variable "mbs":5 - ${r}= Update Resource ${iserver} InCSE1/Container2 ${rt_container} ${attr} - ${rr}= Retrieve resource ${iserver} InCSE1/Container2 + ${r} = Update Resource ${iserver} InCSE1/Container2 ${rt_container} ${attr} + ${rr} = Retrieve resource ${iserver} InCSE1/Container2 Log ${rr.text} ${chr} = Child Resource ${rr} ${cbs} = Current Byte Size ${rr} @@ -746,7 +758,12 @@ Delete the Container2-4.7 4.81 creator -- value must be null [Documentation] creator -- value must be null ${attr} = Set Variable "cr":"VALUE" - ${error} = Run Keyword And Expect Error Cannot create this resource [400]* Create Resource ${iserver} InCSE1/Container1 ${rt_container} + ${error} = Run Keyword And Expect Error + ... Cannot create this resource [400]* + ... Create Resource + ... ${iserver} + ... InCSE1/Container1 + ... ${rt_container} ... ${attr} Should Contain All Sub Strings ${error} error cr #================================================== @@ -757,6 +774,7 @@ Delete the test Container1 [Documentation] Delete the test Container1 ${deleteRes} = Delete Resource ${iserver} InCSE1/Container1 + *** Keywords *** Check Response and Retrieve Resource [Arguments] ${r} @@ -765,7 +783,7 @@ Check Response and Retrieve Resource Should Be True 199 < ${status_code} < 299 ${rr} = Retrieve Resource ${iserver} ${con} ${text} = Text ${rr} - [Return] ${text} + RETURN ${text} Check Response and Retrieve Resource For Update [Arguments] ${r} ${location} @@ -773,21 +791,31 @@ Check Response and Retrieve Resource For Update Should Be True 199 < ${status_code} < 299 ${rr} = Retrieve Resource ${iserver} ${location} ${text} = Text ${rr} - [Return] ${text} + RETURN ${text} Create Container Expect Cannot Create Error - [Arguments] ${attr} [Documentation] create Container Under InCSE1 and expect error - ${error} = Run Keyword And Expect Error Cannot create this resource [400]* Create Resource ${iserver} InCSE1 ${rt_container} + [Arguments] ${attr} + ${error} = Run Keyword And Expect Error + ... Cannot create this resource [400]* + ... Create Resource + ... ${iserver} + ... InCSE1 + ... ${rt_container} ... ${attr} - [Return] ${error} + RETURN ${error} Update Container Expect Cannot Update Error - [Arguments] ${attr} [Documentation] update Container Under InCSE1 and expect error - ${error} = Run Keyword And Expect Error Cannot update this resource [400]* Update Resource ${iserver} InCSE1/Container1 ${rt_container} + [Arguments] ${attr} + ${error} = Run Keyword And Expect Error + ... Cannot update this resource [400]* + ... Update Resource + ... ${iserver} + ... InCSE1/Container1 + ... ${rt_container} ... ${attr} - [Return] ${error} + RETURN ${error} TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/022_ResourceAttributesContentInstance.robot b/csit/suites/iotdm/basic/022_ResourceAttributesContentInstance.robot index 7493ec23d4..5108c6cc8c 100644 --- a/csit/suites/iotdm/basic/022_ResourceAttributesContentInstance.robot +++ b/csit/suites/iotdm/basic/022_ResourceAttributesContentInstance.robot @@ -1,17 +1,21 @@ *** Settings *** -Documentation Tests for Content Instance resource attributes -Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} -Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin -Resource ../../../libraries/SubStrings.robot -Library ../../../libraries/IoTDM/criotdm.py -Library Collections -Resource ../../../variables/Variables.robot -Resource ../../../libraries/IoTDM/IoTDMKeywords.robot +Documentation Tests for Content Instance resource attributes + +Resource ../../../libraries/SubStrings.robot +Library ../../../libraries/IoTDM/criotdm.py +Library Collections +Resource ../../../variables/Variables.robot +Resource ../../../libraries/IoTDM/IoTDMKeywords.robot + +Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} +Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin + *** Variables *** -${rt_ae} 2 -${rt_container} 3 -${rt_contentInstance} 4 +${rt_ae} 2 +${rt_container} 3 +${rt_contentInstance} 4 + *** Test Cases *** TODO Refactor test suite and implement TCs @@ -23,12 +27,17 @@ TODO Refactor test suite and implement TCs 1.1 After Created, test whether all the mandatory attribtues are exist. [Documentation] create 1 conIn test whether all the mandatory attribtues are exist ${attr} = Set Variable "rn":"Container1", "mni": 5 - ${r}= Create Resource With Command ${iserver} InCSE1 ${rt_container} rcn=3 ${attr} + ${r} = Create Resource With Command ${iserver} InCSE1 ${rt_container} rcn=3 ${attr} ${container} = Location ${r} ${status_code} = Status Code ${r} Should Be Equal As Integers ${status_code} 201 ${attr} = Set Variable "con":"102CSS","rn":"conIn1" - ${r} = Create Resource With Command ${iserver} InCSE1/Container1 ${rt_contentInstance} rcn=3 ${attr} + ${r} = Create Resource With Command + ... ${iserver} + ... InCSE1/Container1 + ... ${rt_contentInstance} + ... rcn=3 + ... ${attr} ${text} = Text ${r} Should Contain All Sub Strings ${text} "ri": "rn": "cs": "lt": "pi": ... "con": "ct": "ty":4 @@ -37,7 +46,12 @@ TODO Refactor test suite and implement TCs 1.21 Missing content should return error [Documentation] Missing content should return error ${attr} = Set Variable - ${error} = Run Keyword And Expect Error * Create Resource ${iserver} InCSE1/Container1 ${rt_contentInstance} + ${error} = Run Keyword And Expect Error + ... * + ... Create Resource + ... ${iserver} + ... InCSE1/Container1 + ... ${rt_contentInstance} ... ${attr} Should Start with ${error} Cannot create this resource [400] Should Contain ${error} CONTENT missing @@ -52,7 +66,7 @@ TODO Refactor test suite and implement TCs [Documentation] ContentInfo (cnf) can be added when create ${attr} = Set Variable "cnf": "1","con":"102CSS","rn":"conIn2" # create conIn under Container1 - ${r}= Create Resource ${iserver} InCSE1/Container1 ${rt_contentInstance} ${attr} + ${r} = Create Resource ${iserver} InCSE1/Container1 ${rt_contentInstance} ${attr} ${text} = Check Create and Retrieve ContentInstance ${r} Should Contain ${text} cnf @@ -69,7 +83,7 @@ Delete the ContenInstance 2.1 [Documentation] OntologyRef (or) can be added when create ${attr} = Set Variable "or": "http://cisco.com","con":"102CSS","rn":"conIn2" # create conIn under Container1 - ${r}= Create Resource ${iserver} InCSE1/Container1 ${rt_contentInstance} ${attr} + ${r} = Create Resource ${iserver} InCSE1/Container1 ${rt_contentInstance} ${attr} ${text} = Check Create and Retrieve ContentInstance ${r} Should Contain ${text} or @@ -85,7 +99,7 @@ Delete the ContenInstance 2.2 2.31 labels[single] can be added when create [Documentation] create conIn under Container1, labels[single] can be added when create ${attr} = Set Variable "lbl":["ds"],"con":"102CSS","rn":"conIn2" - ${r}= Create Resource ${iserver} InCSE1/Container1 ${rt_contentInstance} ${attr} + ${r} = Create Resource ${iserver} InCSE1/Container1 ${rt_contentInstance} ${attr} ${text} = Check Create and Retrieve ContentInstance ${r} Should Contain ${text} lbl @@ -102,7 +116,7 @@ Delete the ContenInstance 2.31 [Documentation] labels (multiple) can be added when create ${attr} = Set Variable "lbl":["http://cisco.com","dsds"],"con":"102CSS","rn":"conIn2" # create conIn under Container1 - ${r}= Create Resource ${iserver} InCSE1/Container1 ${rt_contentInstance} ${attr} + ${r} = Create Resource ${iserver} InCSE1/Container1 ${rt_contentInstance} ${attr} ${text} = Check Create and Retrieve ContentInstance ${r} Should Contain ${text} lbl @@ -201,7 +215,7 @@ Delete the ContenInstance 2.33 4.11 GetLatest Test [Documentation] Set mni to 1 when creating a container, then continue creating "get latest" should always return the last created 's "con" value. ${attr} = Set Variable "mni":1,"rn":"Container2" - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${container} = Location ${r} ${random} = Evaluate random.randint(0,50) modules=random ${attr} = Set Variable "cnf": "1","or": "http://hey/you","con":"${random}" @@ -212,7 +226,7 @@ Delete the ContenInstance 2.33 4.12 GetLatest Loop 50 times Test [Documentation] Just like 4.11, but do 50 times. ${attr} = Set Variable "mni":1,"rn":"Container3" - ${r}= Create Resource ${iserver} InCSE1 ${rt_container} ${attr} + ${r} = Create Resource ${iserver} InCSE1 ${rt_container} ${attr} ${container} = Location ${r} FOR ${INDEX} IN RANGE 1 100 Latest Con Test ${container} @@ -222,20 +236,31 @@ Delete the test Container1 [Documentation] Delete the test Container1 ${deleteRes} = Delete Resource ${iserver} InCSE1/Container1 + *** Keywords *** Cannot Update ContentInstance Error [Arguments] ${attr} - ${error} = Run Keyword And Expect Error * update Resource ${iserver} InCSE1/Container1/conIn1 ${rt_contentInstance} + ${error} = Run Keyword And Expect Error + ... * + ... update Resource + ... ${iserver} + ... InCSE1/Container1/conIn1 + ... ${rt_contentInstance} ... ${attr} Should Start with ${error} Cannot update this resource [405] - [Return] ${error} + RETURN ${error} Cannot Craete ContentInstance Error [Arguments] ${attr} - ${error} = Run Keyword And Expect Error * create Resource ${iserver} InCSE1/Container1/conIn1 ${rt_contentInstance} + ${error} = Run Keyword And Expect Error + ... * + ... create Resource + ... ${iserver} + ... InCSE1/Container1/conIn1 + ... ${rt_contentInstance} ... ${attr} Should Start with ${error} Cannot create this resource [400] - [Return] ${error} + RETURN ${error} Check Create and Retrieve ContentInstance [Arguments] ${r} @@ -244,13 +269,13 @@ Check Create and Retrieve ContentInstance Should Be Equal As Integers ${status_code} 201 ${rr} = Retrieve Resource ${iserver} ${con} ${text} = Text ${rr} - [Return] ${text} + RETURN ${text} Get Latest [Arguments] ${resourceURI} ${latest} = Retrieve Resource ${iserver} ${resourceURI}/latest ${con} = Content ${latest} - [Return] ${con} + RETURN ${con} Latest Con Test [Arguments] ${resourceURI} diff --git a/csit/suites/iotdm/basic/023_ResourceAttributesAE.robot b/csit/suites/iotdm/basic/023_ResourceAttributesAE.robot index 50cba79571..706b0e5a05 100644 --- a/csit/suites/iotdm/basic/023_ResourceAttributesAE.robot +++ b/csit/suites/iotdm/basic/023_ResourceAttributesAE.robot @@ -1,17 +1,21 @@ *** Settings *** -Documentation Tests for Application Entity (AE) resource attributes -Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} -Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin -Resource ../../../libraries/SubStrings.robot -Library ../../../libraries/IoTDM/criotdm.py -Library Collections -Resource ../../../variables/Variables.robot -Resource ../../../libraries/IoTDM/IoTDMKeywords.robot +Documentation Tests for Application Entity (AE) resource attributes + +Resource ../../../libraries/SubStrings.robot +Library ../../../libraries/IoTDM/criotdm.py +Library Collections +Resource ../../../variables/Variables.robot +Resource ../../../libraries/IoTDM/IoTDMKeywords.robot + +Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} +Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin + *** Variables *** -${rt_ae} 2 -${rt_container} 3 -${rt_contentInstance} 4 +${rt_ae} 2 +${rt_container} 3 +${rt_contentInstance} 4 + *** Test Cases *** TODO Refactor test suite and implement TCs @@ -23,21 +27,31 @@ TODO Refactor test suite and implement TCs 1.11 If include AE-ID should return error [Documentation] when create AE, AE-ID should not be included ${attr} = Set Variable "aei":"ODL" - ${error} = Run Keyword And Expect Error Cannot create this resource [400]* Create Resource ${iserver} InCSE1 ${rt_ae} + ${error} = Run Keyword And Expect Error + ... Cannot create this resource [400]* + ... Create Resource + ... ${iserver} + ... InCSE1 + ... ${rt_ae} ... ${attr} Should Contain ${error} AE_ID 1.21 Missing App-ID should return error [Documentation] when creete AE, Missing APP-ID should return error ${attr} = Set Variable "apn":"ODL" - ${error} = Run Keyword And Expect Error Cannot create this resource [400]* Create Resource ${iserver} InCSE1 ${rt_ae} + ${error} = Run Keyword And Expect Error + ... Cannot create this resource [400]* + ... Create Resource + ... ${iserver} + ... InCSE1 + ... ${rt_ae} ... ${attr} Should Contain ${error} APP_ID 1.3 After AE Created, test whether all the mandatory attribtues are exist. [Documentation] mandatory attributes should be there after created ${attr} = Set Variable "api":"ODL","rr":true,"rn":"AE1" - ${r}= Create Resource With Command ${iserver} InCSE1 ${rt_ae} rcn=3 ${attr} + ${r} = Create Resource With Command ${iserver} InCSE1 ${rt_ae} rcn=3 ${attr} ${status_code} = Status Code ${r} Should Be Equal As Integers ${status_code} 201 ${text} = Text ${r} @@ -226,7 +240,9 @@ TODO Refactor test suite and implement TCs [Documentation] when update ae-id epxect error ${attr} = Set Variable "aei":"aaa" ${error} = Update AE Expect Cannot Update Error ${attr} - Should Contain ${error} "error":"CONTENT(pc) AE_ID should be assigned by the system, please do not include aei" + Should Contain + ... ${error} + ... "error":"CONTENT(pc) AE_ID should be assigned by the system, please do not include aei" 3.38 LastMoifiedTime --- Special, cannot be modified by the user [Documentation] LastMoifiedTime --- Special, cannot be modified by the user @@ -263,6 +279,7 @@ TODO Refactor test suite and implement TCs # Finish #================================================== + *** Keywords *** Update And Retrieve AE [Arguments] ${attr} @@ -272,13 +289,18 @@ Update And Retrieve AE ${rr} = Retrieve Resource ${iserver} InCSE1/AE1 ${text} = Text ${rr} LOG ${text} - [Return] ${text} + RETURN ${text} Update AE Expect Cannot Update Error [Arguments] ${attr} - ${error} = Run Keyword And Expect Error Cannot update this resource [400]* Update Resource ${iserver} InCSE1/AE1 ${rt_ae} + ${error} = Run Keyword And Expect Error + ... Cannot update this resource [400]* + ... Update Resource + ... ${iserver} + ... InCSE1/AE1 + ... ${rt_ae} ... ${attr} - [Return] ${error} + RETURN ${error} TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/024_ResourceAttributesACP.robot b/csit/suites/iotdm/basic/024_ResourceAttributesACP.robot index b5511b3c79..41aae522dd 100644 --- a/csit/suites/iotdm/basic/024_ResourceAttributesACP.robot +++ b/csit/suites/iotdm/basic/024_ResourceAttributesACP.robot @@ -1,18 +1,22 @@ *** Settings *** -Documentation Tests for Access Control Policy (ACP) resource attributes -Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} -Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin -Resource ../../../libraries/SubStrings.robot -Library ../../../libraries/IoTDM/criotdm.py -Library Collections -Resource ../../../variables/Variables.robot -Resource ../../../libraries/IoTDM/IoTDMKeywords.robot +Documentation Tests for Access Control Policy (ACP) resource attributes + +Resource ../../../libraries/SubStrings.robot +Library ../../../libraries/IoTDM/criotdm.py +Library Collections +Resource ../../../variables/Variables.robot +Resource ../../../libraries/IoTDM/IoTDMKeywords.robot + +Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} +Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin + *** Variables *** -${rt_ae} 2 -${rt_container} 3 -${rt_contentInstance} 4 -${rt_acp} 1 +${rt_ae} 2 +${rt_container} 3 +${rt_contentInstance} 4 +${rt_acp} 1 + *** Test Cases *** 1.0.0 Test whether default ACP exist @@ -25,8 +29,9 @@ ${rt_acp} 1 1.0.1 ACP C/R resource with mandatory common and specific attributes only [Documentation] After Created, test whether all the mandatory attribtues exist. - ${attr} = Set Variable "pv":{"acr":[{"acor" : ["111","222"],"acop":35}, {"acor" : ["111","222"],"acop":35}]}, "pvs":{"acr":[{"acor" : ["111","222"],"acop":7}, {"acor" : ["111","222"],"acop":9}]}, "rn":"Acp1" - ${r}= Create Resource ${iserver} InCSE1 ${rt_acp} ${attr} + ${attr} = Set Variable + ... "pv":{"acr":[{"acor" : ["111","222"],"acop":35}, {"acor" : ["111","222"],"acop":35}]}, "pvs":{"acr":[{"acor" : ["111","222"],"acop":7}, {"acor" : ["111","222"],"acop":9}]}, "rn":"Acp1" + ${r} = Create Resource ${iserver} InCSE1 ${rt_acp} ${attr} ${status_code} = Status Code ${r} Should Be Equal As Integers ${status_code} 201 ${text} = Convert To String ${r.text} @@ -122,8 +127,9 @@ ${rt_acp} 1 3.02.01 ACP C/R: priviliges, selfPrivileges attributes: With valid IPv4 acip element [Documentation] After Created, test whether all the mandatory elements exist. - ${attr} = Set Variable "pv":{"acr":[{"acor" : ["111","222"],"acop":35,"acco":[{"acip":{"ipv4":["127.0.0.1"]}}]},{"acor" : ["111","222"],"acop":35}]},"pvs":{"acr":[{"acor" : ["111","222"],"acop":7},{"acor" : ["111","222"],"acop":9}]},"rn":"Acp2" - ${r}= Create Resource ${iserver} InCSE1 ${rt_acp} ${attr} + ${attr} = Set Variable + ... "pv":{"acr":[{"acor" : ["111","222"],"acop":35,"acco":[{"acip":{"ipv4":["127.0.0.1"]}}]},{"acor" : ["111","222"],"acop":35}]},"pvs":{"acr":[{"acor" : ["111","222"],"acop":7},{"acor" : ["111","222"],"acop":9}]},"rn":"Acp2" + ${r} = Create Resource ${iserver} InCSE1 ${rt_acp} ${attr} ${status_code} = Status Code ${r} Should Be Equal As Integers ${status_code} 201 ${text} = Convert To String ${r.text} @@ -142,8 +148,9 @@ ${rt_acp} 1 3.02.04 ACP C/R: priviliges, selfPrivileges attributes: With invalid IPv4 acip element [Documentation] NEGATIVE: Create with invalid ipv4 address, check error message and verify by Retrieve operation. - ${attr} = Set Variable "pv":{"acr":[{"acor" : ["111","222"],"acop":35,"acco":[{"acip":{"ipv4":["127.0.01"]}}]},{"acor" : ["111","222"],"acop":35}]},"pvs":{"acr":[{"acor" : ["111","222"],"acop":7},{"acor" : ["111","222"],"acop":9}]},"rn":"Acp3" - ${error}= Run Keyword And Expect Error * Create Resource ${iserver} InCSE1 ${rt_acp} + ${attr} = Set Variable + ... "pv":{"acr":[{"acor" : ["111","222"],"acop":35,"acco":[{"acip":{"ipv4":["127.0.01"]}}]},{"acor" : ["111","222"],"acop":35}]},"pvs":{"acr":[{"acor" : ["111","222"],"acop":7},{"acor" : ["111","222"],"acop":9}]},"rn":"Acp3" + ${error} = Run Keyword And Expect Error * Create Resource ${iserver} InCSE1 ${rt_acp} ... ${attr} Should Start with ${error} Cannot create this resource [400] Should Contain ${error} not a valid Ipv4 address @@ -157,8 +164,9 @@ ${rt_acp} 1 3.02.06 ACP C/R: priviliges, selfPrivileges attributes: With valid IPv6 acip element [Documentation] After Created, test whether all the mandatory elements exist. - ${attr} = Set Variable "pv":{"acr":[{"acor" : ["111","222"],"acop":35,"acco":[{"acip":{"ipv6":["2001:db8:0:0:0:ff00:42:8329"]}}]},{"acor" : ["111","222"],"acop":35}]},"pvs":{"acr":[{"acor" : ["111","222"],"acop":7},{"acor" : ["111","222"],"acop":9}]},"rn":"Acp4" - ${r}= Create Resource ${iserver} InCSE1 ${rt_acp} ${attr} + ${attr} = Set Variable + ... "pv":{"acr":[{"acor" : ["111","222"],"acop":35,"acco":[{"acip":{"ipv6":["2001:db8:0:0:0:ff00:42:8329"]}}]},{"acor" : ["111","222"],"acop":35}]},"pvs":{"acr":[{"acor" : ["111","222"],"acop":7},{"acor" : ["111","222"],"acop":9}]},"rn":"Acp4" + ${r} = Create Resource ${iserver} InCSE1 ${rt_acp} ${attr} ${status_code} = Status Code ${r} Should Be Equal As Integers ${status_code} 201 ${text} = Convert To String ${r.text} @@ -179,8 +187,9 @@ ${rt_acp} 1 3.02.09 ACP C/R: priviliges, selfPrivileges attributes: With invalid IPv6 acip element [Documentation] NEGATIVE: Create with invalid ipv6 address, check error message and verify by Retrieve operation. - ${attr} = Set Variable "pv":{"acr":[{"acor" : ["111","222"],"acop":35,"acco":[{"acip":{"ipv6":["2001:db8:0:0:0:ff00:42"]}}]},{"acor" : ["111","222"],"acop":35}]},"pvs":{"acr":[{"acor" : ["111","222"],"acop":7},{"acor" : ["111","222"],"acop":9}]},"rn":"Acp3" - ${error}= Run Keyword And Expect Error * Create Resource ${iserver} InCSE1 ${rt_acp} + ${attr} = Set Variable + ... "pv":{"acr":[{"acor" : ["111","222"],"acop":35,"acco":[{"acip":{"ipv6":["2001:db8:0:0:0:ff00:42"]}}]},{"acor" : ["111","222"],"acop":35}]},"pvs":{"acr":[{"acor" : ["111","222"],"acop":7},{"acor" : ["111","222"],"acop":9}]},"rn":"Acp3" + ${error} = Run Keyword And Expect Error * Create Resource ${iserver} InCSE1 ${rt_acp} ... ${attr} Should Start with ${error} Cannot create this resource [400] Should Contain ${error} not a valid Ipv6 address @@ -348,6 +357,7 @@ ${rt_acp} 1 [Tags] not-implemented exclude TODO + *** Keywords *** Connect And Create Resource [Arguments] ${targetURI} ${resoutceType} ${attr} ${resourceName}=${EMPTY} diff --git a/csit/suites/iotdm/basic/025_ResourceAttributesNode.robot b/csit/suites/iotdm/basic/025_ResourceAttributesNode.robot index 5073844530..2307ae8f76 100644 --- a/csit/suites/iotdm/basic/025_ResourceAttributesNode.robot +++ b/csit/suites/iotdm/basic/025_ResourceAttributesNode.robot @@ -1,19 +1,23 @@ *** Settings *** -Documentation Tests for Node resource attributes -Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} -Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin -Resource ../../../libraries/SubStrings.robot -Library ../../../libraries/IoTDM/criotdm.py -Library Collections -Resource ../../../variables/Variables.robot -Resource ../../../libraries/IoTDM/IoTDMKeywords.robot +Documentation Tests for Node resource attributes + +Resource ../../../libraries/SubStrings.robot +Library ../../../libraries/IoTDM/criotdm.py +Library Collections +Resource ../../../variables/Variables.robot +Resource ../../../libraries/IoTDM/IoTDMKeywords.robot + +Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} +Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin + *** Variables *** -${rt_ae} 2 -${rt_container} 3 -${rt_contentInstance} 4 -${rt_acp} 1 -${rt_node} 14 +${rt_ae} 2 +${rt_container} 3 +${rt_contentInstance} 4 +${rt_acp} 1 +${rt_node} 14 + *** Test Cases *** TODO Refactor test suite and implement TCs @@ -25,7 +29,7 @@ TODO Refactor test suite and implement TCs 1.1 After Created, test whether all the mandatory attribtues exist. [Documentation] After Created, test whether all the mandatory attribtues exist. ${attr} = Set Variable "rn":"Container1" - ${r}= Create Resource With Command ${iserver} InCSE1 ${rt_container} rcn=3 ${attr} + ${r} = Create Resource With Command ${iserver} InCSE1 ${rt_container} rcn=3 ${attr} ${container} = Location ${r} ${status_code} = Status Code ${r} Should Be Equal As Integers ${status_code} 201 @@ -34,6 +38,7 @@ TODO Refactor test suite and implement TCs ... "st": "ct": "ty":3 cbs" Should Not Contain Any Sub Strings ${text} "lbl" "creator" "or" + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/026_ResourceAttributesGroup.robot b/csit/suites/iotdm/basic/026_ResourceAttributesGroup.robot index e7ff8ed276..be177fb0a1 100644 --- a/csit/suites/iotdm/basic/026_ResourceAttributesGroup.robot +++ b/csit/suites/iotdm/basic/026_ResourceAttributesGroup.robot @@ -1,14 +1,15 @@ *** Settings *** -Documentation Test suite tests CRUD operations with Group resource and its attributes. -... TODO: implement TCs according to 000_ResourceAttributesNotes.txt -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot +Documentation Test suite tests CRUD operations with Group resource and its attributes. +... TODO: implement TCs according to 000_ResourceAttributesNotes.txt + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions -*** Variables *** *** Test Cases *** 1.00 Add Test Cases @@ -16,6 +17,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/090_ResourceHierarchyAddressing.robot b/csit/suites/iotdm/basic/090_ResourceHierarchyAddressing.robot index 93668d908a..436a215d9f 100644 --- a/csit/suites/iotdm/basic/090_ResourceHierarchyAddressing.robot +++ b/csit/suites/iotdm/basic/090_ResourceHierarchyAddressing.robot @@ -1,14 +1,15 @@ *** Settings *** -Documentation Test suite tests addresing of entities (CSE and AE) and addressing of resources according to: -... TS-0001: 7.2 M2M-SP-ID, CSE-ID, App-ID and AE-ID and resource Identifier formats -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot +Documentation Test suite tests addresing of entities (CSE and AE) and addressing of resources according to: +... TS-0001: 7.2 M2M-SP-ID, CSE-ID, App-ID and AE-ID and resource Identifier formats + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions -*** Variables *** *** Test Cases *** 1.01 CRUD cseBase: Target resource ID: Unstructured, CSE-relative @@ -305,6 +306,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/091_ResourceHierarchyDelete.robot b/csit/suites/iotdm/basic/091_ResourceHierarchyDelete.robot index e7c550c90f..8f2679124e 100644 --- a/csit/suites/iotdm/basic/091_ResourceHierarchyDelete.robot +++ b/csit/suites/iotdm/basic/091_ResourceHierarchyDelete.robot @@ -1,16 +1,20 @@ *** Settings *** -Documentation Tests deleting resources from multiple places in resource tree -Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} -Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin -Library ../../../libraries/IoTDM/criotdm.py -Library Collections -Resource ../../../variables/Variables.robot -Resource ../../../libraries/IoTDM/IoTDMKeywords.robot +Documentation Tests deleting resources from multiple places in resource tree + +Library ../../../libraries/IoTDM/criotdm.py +Library Collections +Resource ../../../variables/Variables.robot +Resource ../../../libraries/IoTDM/IoTDMKeywords.robot + +Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} +Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin + *** Variables *** -${rt_ae} 2 -${rt_container} 3 -${rt_contentInstance} 4 +${rt_ae} 2 +${rt_container} 3 +${rt_contentInstance} 4 + *** Test Cases *** 4.11 Delete AE without child resource @@ -398,6 +402,7 @@ ${rt_contentInstance} 4 Cannot Retrieve Error InCSE1/Con1/Con4/conIn2 Cannot Retrieve Error InCSE1/Con1/Con4/conIn3 + *** Keywords *** Response Is Correct [Arguments] ${r} diff --git a/csit/suites/iotdm/basic/092_ResourceHierarchyAE_CNT_CIN.robot b/csit/suites/iotdm/basic/092_ResourceHierarchyAE_CNT_CIN.robot index 5946206560..9411ff26c4 100644 --- a/csit/suites/iotdm/basic/092_ResourceHierarchyAE_CNT_CIN.robot +++ b/csit/suites/iotdm/basic/092_ResourceHierarchyAE_CNT_CIN.robot @@ -1,17 +1,21 @@ *** Settings *** -Documentation Test for hierarchy of resources: AE/CONTAINER/CONTENTINSTANCE -Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} -Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin -Resource ../../../libraries/SubStrings.robot -Library ../../../libraries/IoTDM/criotdm.py -Library Collections -Resource ../../../variables/Variables.robot -Resource ../../../libraries/IoTDM/IoTDMKeywords.robot +Documentation Test for hierarchy of resources: AE/CONTAINER/CONTENTINSTANCE + +Resource ../../../libraries/SubStrings.robot +Library ../../../libraries/IoTDM/criotdm.py +Library Collections +Resource ../../../variables/Variables.robot +Resource ../../../libraries/IoTDM/IoTDMKeywords.robot + +Suite Setup IOTDM Basic Suite Setup ${ODL_SYSTEM_1_IP} ${ODL_RESTCONF_USER} ${ODL_RESTCONF_PASSWORD} +Suite Teardown Kill The Tree ${ODL_SYSTEM_1_IP} InCSE1 admin admin + *** Variables *** -${rt_ae} 2 -${rt_container} 3 -${rt_contentInstance} 4 +${rt_ae} 2 +${rt_container} 3 +${rt_contentInstance} 4 + *** Test Cases *** 1.11 Valid Input for AE without name @@ -70,7 +74,12 @@ ${rt_contentInstance} 4 2.13 Invalid Input for Container Under AE with name (Already exist) [Documentation] Invalid Input for Container Under AE with name (Already exist) ${attr} = Set Variable "cr":null,"mni":1,"mbs":15,"or":"http://hey/you","rn":"containerUnderAE" - ${error} = Run Keyword And Expect Error * Connect And Create Resource InCSE1/ODL3 ${rt_container} ${attr} + ${error} = Run Keyword And Expect Error + ... * + ... Connect And Create Resource + ... InCSE1/ODL3 + ... ${rt_container} + ... ${attr} Should Start with ${error} Cannot create this resource [409] 2.14 Update Container Label @@ -134,14 +143,23 @@ ${rt_contentInstance} 4 2.33 Invalid Input for Container Under Container with name (Already exist) [Documentation] Invalid Input for Container Under Container with name (Already exist) ${attr} = Set Variable "cr":null,"mni":1,"mbs":15,"or":"http://hey/you","rn":"containerUnderContainer" - ${error} = Run Keyword And Expect Error * Create Resource ${iserver} InCSE1/containerUnderCSE ${rt_container} + ${error} = Run Keyword And Expect Error + ... * + ... Create Resource + ... ${iserver} + ... InCSE1/containerUnderCSE + ... ${rt_container} ... ${attr} Should Start with ${error} Cannot create this resource [409] 2.34 Update Container Label [Documentation] Update Container Label to ["aaa","bbb","ccc"] ${attr} = Set Variable "lbl":["aaa","bbb","ccc"] - ${r} = Update Resource ${iserver} InCSE1/containerUnderCSE/containerUnderContainer ${rt_container} ${attr} + ${r} = Update Resource + ... ${iserver} + ... InCSE1/containerUnderCSE/containerUnderContainer + ... ${rt_container} + ... ${attr} Response Is Correct ${r} # Retrieve and test the lbl ${r} = Retrieve Resource ${iserver} InCSE1/containerUnderCSE/containerUnderContainer @@ -150,7 +168,12 @@ ${rt_contentInstance} 4 2.41 Invalid Input for AE under container with name(mess up layer) [Documentation] Invalid Input for AE under container withoutname(mess up layer) ${attr} = Set Variable "api":"jb","apn":"jb2","or":"http://hey/you","rr":true,"rn":"ODL4" - ${error} = Run Keyword And Expect Error * Create Resource ${iserver} InCSE1/containerUnderCSE ${rt_ae} + ${error} = Run Keyword And Expect Error + ... * + ... Create Resource + ... ${iserver} + ... InCSE1/containerUnderCSE + ... ${rt_ae} ... ${attr} Should Start with ${error} Cannot create this resource [405] Should Contain ${error} Cannot create AE under this resource type: 3 @@ -181,7 +204,12 @@ ${rt_contentInstance} 4 3.14 Invalid contentInstance under AE [Documentation] Invalid contentInstance under AE ${attr} = Set Variable "cnf": "1","or": "http://hey/you","con":"101" - ${error} = Run Keyword And Expect Error * Create Resource ${iserver} InCSE1/ODL3 ${rt_contentInstance} + ${error} = Run Keyword And Expect Error + ... * + ... Create Resource + ... ${iserver} + ... InCSE1/ODL3 + ... ${rt_contentInstance} ... ${attr} Should Start with ${error} Cannot create this resource [405] Should Contain ${error} Cannot create ContentInstance under this resource type: 2 @@ -189,7 +217,12 @@ ${rt_contentInstance} 4 3.15 Invalid contentInstance under contentInstance [Documentation] Invalid contentInstance under contentInstance ${attr} = Set Variable "cnf": "1","or": "http://hey/you","con":"101" - ${error} = Run Keyword And Expect Error * Create Resource ${iserver} InCSE1/containerUnderCSE/conIn1 ${rt_contentInstance} + ${error} = Run Keyword And Expect Error + ... * + ... Create Resource + ... ${iserver} + ... InCSE1/containerUnderCSE/conIn1 + ... ${rt_contentInstance} ... ${attr} Should Start with ${error} Cannot create this resource [405] Should Contain ${error} Cannot create ContentInstance under this resource type: 4 @@ -197,7 +230,12 @@ ${rt_contentInstance} 4 3.16 Invalid AE under contentInstance [Documentation] Invalid AE under contentInstance ${attr} = Set Variable "api":"jb","apn":"jb2","or":"http://hey/you","rr":true - ${error} = Run Keyword And Expect Error * Create Resource ${iserver} InCSE1/containerUnderCSE/conIn1 ${rt_ae} + ${error} = Run Keyword And Expect Error + ... * + ... Create Resource + ... ${iserver} + ... InCSE1/containerUnderCSE/conIn1 + ... ${rt_ae} ... ${attr} Should Start with ${error} Cannot create this resource [405] Should Contain ${error} Cannot create AE under this resource type: 4 @@ -205,7 +243,12 @@ ${rt_contentInstance} 4 3.17 Invalid container under contentInstance [Documentation] Invalid container under contentInstance ${attr} = Set Variable "cr":null,"lbl":["aaa","bbb","ccc"] - ${error} = Run Keyword And Expect Error * Create Resource ${iserver} InCSE1/containerUnderCSE/conIn1 ${rt_container} + ${error} = Run Keyword And Expect Error + ... * + ... Create Resource + ... ${iserver} + ... InCSE1/containerUnderCSE/conIn1 + ... ${rt_container} ... ${attr} Should Start with ${error} Cannot create this resource [405] Should Contain ${error} Cannot create Container under this resource type: 4 @@ -248,6 +291,7 @@ Delete the Container Under CSEBase ${status_code} = Status Code ${deleteRes} Should Be Equal As Integers ${status_code} 200 + *** Keywords *** Connect And Create Resource [Arguments] ${targetURI} ${resoutceType} ${attr} diff --git a/csit/suites/iotdm/basic/093_ResourceHierarchyChildResources.robot b/csit/suites/iotdm/basic/093_ResourceHierarchyChildResources.robot index 3efaf67c43..227522d0d6 100644 --- a/csit/suites/iotdm/basic/093_ResourceHierarchyChildResources.robot +++ b/csit/suites/iotdm/basic/093_ResourceHierarchyChildResources.robot @@ -1,15 +1,16 @@ *** Settings *** -Documentation Every resource type has defined list of allowed child resources, this test suite tests Create -... operations of valid and invalid child resources according to TS-0001 and TS-0004 OneM2M specifications. -... TODO: add positive and negative TCs for all resource types -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot - -*** Variables *** +Documentation Every resource type has defined list of allowed child resources, this test suite tests Create +... operations of valid and invalid child resources according to TS-0001 and TS-0004 OneM2M specifications. +... TODO: add positive and negative TCs for all resource types + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions + *** Test Cases *** 1.00 C/R: Negative: All resources as root resource @@ -53,6 +54,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/094_ResourceHierarchyPersistence.robot b/csit/suites/iotdm/basic/094_ResourceHierarchyPersistence.robot index d93b8d35a7..543b0bb6fd 100644 --- a/csit/suites/iotdm/basic/094_ResourceHierarchyPersistence.robot +++ b/csit/suites/iotdm/basic/094_ResourceHierarchyPersistence.robot @@ -1,22 +1,23 @@ *** Settings *** -Documentation This test suite verifies resource tree after restart of IoTDM. -... Hierarchy of resources is created first, including: cseBase/AE/Container/ContentInstance -... IoTDM is restarted and the hierarchy is verified using Retrieve operation. -... New resources are created and verified. -... IoTDM is restarted again and resources are verified by Retrieve operation. -... Tests creation of new reqsources after the restart. -... Some resources are deleted and result is verified also by retrieve operation. -... IoTDM is restarted again and data tree is checked if all deleted resources are not present. -... Simulates also such state when DAO plugin is not installed and IoTDM is not able to write data -... into data store. Verifies error responses of CRUD operations. -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot +Documentation This test suite verifies resource tree after restart of IoTDM. +... Hierarchy of resources is created first, including: cseBase/AE/Container/ContentInstance +... IoTDM is restarted and the hierarchy is verified using Retrieve operation. +... New resources are created and verified. +... IoTDM is restarted again and resources are verified by Retrieve operation. +... Tests creation of new reqsources after the restart. +... Some resources are deleted and result is verified also by retrieve operation. +... IoTDM is restarted again and data tree is checked if all deleted resources are not present. +... Simulates also such state when DAO plugin is not installed and IoTDM is not able to write data +... into data store. Verifies error responses of CRUD operations. + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions -*** Variables *** *** Test Cases *** 1.00 Add Test Cases @@ -24,6 +25,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/101_ProceduresLatestOldest.robot b/csit/suites/iotdm/basic/101_ProceduresLatestOldest.robot index 4f90cdb2fe..b07577013b 100644 --- a/csit/suites/iotdm/basic/101_ProceduresLatestOldest.robot +++ b/csit/suites/iotdm/basic/101_ProceduresLatestOldest.robot @@ -1,16 +1,17 @@ *** Settings *** -Documentation Test suite tests resource specific operations of the oldest and latest resources according to -... OneM2M specifications: -... : (TS-0001: 10.2.23 Resource Procedure; TS-0004: 7.4.28.2 Resource Specific Procedure on CRUD Operations) -... : (TS-0001: 10.2.22 Resource Procedures; TS-0004: 7.4.27.2 Resource Specific Procedure on CRUD Operations) -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot +Documentation Test suite tests resource specific operations of the oldest and latest resources according to +... OneM2M specifications: +... : (TS-0001: 10.2.23 Resource Procedure; TS-0004: 7.4.28.2 Resource Specific Procedure on CRUD Operations) +... : (TS-0001: 10.2.22 Resource Procedures; TS-0004: 7.4.27.2 Resource Specific Procedure on CRUD Operations) + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions -*** Variables *** *** Test Cases *** 1.00 Retrieve Oldest and Latest resources @@ -62,6 +63,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/102_ProceduresContent.robot b/csit/suites/iotdm/basic/102_ProceduresContent.robot index 34c7be52d6..75bcac3593 100644 --- a/csit/suites/iotdm/basic/102_ProceduresContent.robot +++ b/csit/suites/iotdm/basic/102_ProceduresContent.robot @@ -1,15 +1,16 @@ *** Settings *** -Documentation Test suite tests Container and ContentInstance resources according to OneM2M specifications: -... : (TS-0001: 10.2.4 Resource Procedures; TS-0004 7.4.6 Resource Type ) -... : (TS-0001 10.2.19 Resource Procedures; TS-0004 7.4.7 Resource Type ) -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot - -*** Variables *** +Documentation Test suite tests Container and ContentInstance resources according to OneM2M specifications: +... : (TS-0001: 10.2.4 Resource Procedures; TS-0004 7.4.6 Resource Type ) +... : (TS-0001 10.2.19 Resource Procedures; TS-0004 7.4.7 Resource Type ) + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions + *** Test Cases *** 1.00 C/R Container, positive: With valid contentInstance resources @@ -254,6 +255,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/103_ProceduresGroupMgmt.robot b/csit/suites/iotdm/basic/103_ProceduresGroupMgmt.robot index b8276c386a..e4e42e66a2 100644 --- a/csit/suites/iotdm/basic/103_ProceduresGroupMgmt.robot +++ b/csit/suites/iotdm/basic/103_ProceduresGroupMgmt.robot @@ -1,18 +1,19 @@ *** Settings *** -Documentation Test suite tests procedures related to Group resource and its child resources according -... to OneM2M specifications: -... : (TS-0001: 10.2.7 Group Management Procedures; TS-0004: 7.4.13 Resource Type ) -... : (TS-0001: 10.2.7.6 Management Procedures; TS-0004: 7.4.14 Resource Type ) -... : (TS-0001: 10.2.7.14 Retrieve ; TS-0004: 7.4.35 Resource Type ) -... : (TS-0001: 10.2.32 Resource Procedures; TS-0004: 7.4.34 Resource Type ) -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot - -*** Variables *** +Documentation Test suite tests procedures related to Group resource and its child resources according +... to OneM2M specifications: +... : (TS-0001: 10.2.7 Group Management Procedures; TS-0004: 7.4.13 Resource Type ) +... : (TS-0001: 10.2.7.6 Management Procedures; TS-0004: 7.4.14 Resource Type ) +... : (TS-0001: 10.2.7.14 Retrieve ; TS-0004: 7.4.35 Resource Type ) +... : (TS-0001: 10.2.32 Resource Procedures; TS-0004: 7.4.34 Resource Type ) + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions + *** Test Cases *** 1.00 C/R valid Group resource without child resources @@ -140,6 +141,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/104_ProceduresACP.robot b/csit/suites/iotdm/basic/104_ProceduresACP.robot index 60ee4d9cff..ac754d1688 100644 --- a/csit/suites/iotdm/basic/104_ProceduresACP.robot +++ b/csit/suites/iotdm/basic/104_ProceduresACP.robot @@ -1,17 +1,18 @@ *** Settings *** -Documentation Test suite tests access controll procedures related to accessControlPolicy resource described -... in OneM2M specifications: -... TS-0001: 9.6.2 Resource Type accessControlPolicy -... TS-0004: 7.3.3.15 Check authorization of the originator -... TS-0003: 7.1 Access Control Mechanism -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot - -*** Variables *** +Documentation Test suite tests access controll procedures related to accessControlPolicy resource described +... in OneM2M specifications: +... TS-0001: 9.6.2 Resource Type accessControlPolicy +... TS-0004: 7.3.3.15 Check authorization of the originator +... TS-0003: 7.1 Access Control Mechanism + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions + *** Test Cases *** 1.01.01 ACP cseBase: Permit: privileges: AE, CRUD @@ -393,6 +394,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/105_ProceduresRegistration.robot b/csit/suites/iotdm/basic/105_ProceduresRegistration.robot index 6b77935476..29f43ead1b 100644 --- a/csit/suites/iotdm/basic/105_ProceduresRegistration.robot +++ b/csit/suites/iotdm/basic/105_ProceduresRegistration.robot @@ -1,14 +1,15 @@ *** Settings *** -Documentation Tests registration of AE and CSE entities resulting in creation of -... AE and remoteCSE resources. -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot +Documentation Tests registration of AE and CSE entities resulting in creation of +... AE and remoteCSE resources. + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions -*** Variables *** *** Test Cases *** 1.00 Add Test Cases @@ -88,6 +89,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/iotdm/basic/200_IoTDMInfraPlugins.robot b/csit/suites/iotdm/basic/200_IoTDMInfraPlugins.robot index 97e507d741..fe938ab743 100644 --- a/csit/suites/iotdm/basic/200_IoTDMInfraPlugins.robot +++ b/csit/suites/iotdm/basic/200_IoTDMInfraPlugins.robot @@ -1,16 +1,20 @@ *** Settings *** -Documentation Test suite testing IoTDM PluginManager RPC calls registrations of default plugins and -... communication channels and re-configuration of port of registered plugins -Suite Setup Setup Suite -Suite Teardown Teardown Suite -Resource ../../../variables/Variables.robot -Resource ../../../libraries/ClusterManagement.robot -Resource ../../../libraries/TemplatedRequests.robot +Documentation Test suite testing IoTDM PluginManager RPC calls registrations of default plugins and +... communication channels and re-configuration of port of registered plugins + +Resource ../../../variables/Variables.robot +Resource ../../../libraries/ClusterManagement.robot +Resource ../../../libraries/TemplatedRequests.robot + +Suite Setup Setup Suite +Suite Teardown Teardown Suite + *** Variables *** -${VAR_BASE} ${CURDIR}/../../../variables/IoTDM/ +${VAR_BASE} ${CURDIR}/../../../variables/IoTDM/ # TODO 500 seems to be a bug in ODL, remove when solved -@{NEGATIVE_RESULTS} ${500} ${400} +@{NEGATIVE_RESULTS} ${500} ${400} + *** Test Cases *** 1.00 Default result of onem2m-plugin-manager-plugin-data RPC @@ -383,8 +387,12 @@ ${VAR_BASE} ${CURDIR}/../../../variables/IoTDM/ 9.11 Test iplugin-cfg-get-startup-config and iplugin-cfg-get-running-config should equal [Documentation] Tests if StartupConfig and running config are the same in content - ${resp1} = TemplatedRequests.Post_As_Json_Templated folder=${VAR_BASE}/simple_config/get_startup/config verify=True - ${resp2} = TemplatedRequests.Post_As_Json_Templated folder=${VAR_BASE}/simple_config/get_running_config verify=True + ${resp1} = TemplatedRequests.Post_As_Json_Templated + ... folder=${VAR_BASE}/simple_config/get_startup/config + ... verify=True + ${resp2} = TemplatedRequests.Post_As_Json_Templated + ... folder=${VAR_BASE}/simple_config/get_running_config + ... verify=True Should Be Equal ${resp1} ${resp2} 9.12 Test onem2m-simple-config:iplugin-cfg-del to delete all the values @@ -438,6 +446,7 @@ ${VAR_BASE} ${CURDIR}/../../../variables/IoTDM/ [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" @@ -497,51 +506,54 @@ Verify PluginData After Reconfiguration of All Modules Verify PluginData After Reconfiguration of Onem2mExample Verify RPC Positive - [Arguments] ${variables_folder} [Documentation] Verifies positive RPC scenario + [Arguments] ${variables_folder} TemplatedRequests.Post_As_Json_Templated folder=${VAR_BASE}/${variables_folder} verify=True Verify RPC Negative - [Arguments] ${variables_folder} ${verify}=${false} [Documentation] Verifies negative RPC scenario - TemplatedRequests.Post_As_Json_Templated folder=${VAR_BASE}/${variables_folder} verify=${verify} explicit_status_codes=${NEGATIVE_RESULTS} + [Arguments] ${variables_folder} ${verify}=${false} + TemplatedRequests.Post_As_Json_Templated + ... folder=${VAR_BASE}/${variables_folder} + ... verify=${verify} + ... explicit_status_codes=${NEGATIVE_RESULTS} Verify RPC Plugin Data - [Arguments] ${plugin_data_folder} [Documentation] Verifies positive PluginData RPC scenarios described in plugin_data variables directory + [Arguments] ${plugin_data_folder} Verify RPC Positive plugin_data/${plugin_data_folder} Verify RPC Plugin Registrations - [Arguments] ${plugin_reg_folder} [Documentation] Verifies positive IoTDMPluginRegistrations RPC scenarios described in iotdm_plugin_registrations variables directory + [Arguments] ${plugin_reg_folder} Verify RPC Positive iotdm_plugin_registrations/${plugin_reg_folder} Verify RPC Db Registrations - [Arguments] ${db_reg_folder} [Documentation] Verifies positive DbRegistrations RPC scenarios described in db_registrations variables directory + [Arguments] ${db_reg_folder} Verify RPC Positive db_registrations/${db_reg_folder} Verify RPC Comm Channels - [Arguments] ${comm_channel_folder} [Documentation] Verifies positive CommunicationChannels RPC scenarios described in communication_channels variables directory + [Arguments] ${comm_channel_folder} Verify RPC Positive communication_channels/${comm_channel_folder} Verify RPC Negative TC - [Arguments] ${negative_tc_folder} ${verify}=${false} [Documentation] Verifies negative re-configuration TCs described in negative_tcs variables directory + [Arguments] ${negative_tc_folder} ${verify}=${false} Verify RPC Negative negative_tcs/${negative_tc_folder} verify=${verify} Verify RPC Simple Config - [Arguments] ${simple_config_folder} [Documentation] Verifies positive SimpleConfig RPC scenarios described in simple_config variables directory + [Arguments] ${simple_config_folder} Verify RPC Positive simple_config/${simple_config_folder} Verify RPC Negative Simple Config - [Arguments] ${negative_tc_folder} ${verify}=${false} [Documentation] Verifies negative SimpleConfig RPC scenarios described in simple_config variables directory + [Arguments] ${negative_tc_folder} ${verify}=${false} Verify RPC Negative simple_config/${negative_tc_folder} verify=${verify} Verify RPC Simple Config Key - [Arguments] ${simple_config_key_folder} [Documentation] Verifies positive SimpleConfig Key RPC scenarios described in simple_config_key variables directory + [Arguments] ${simple_config_key_folder} Verify RPC Positive simple_config_key/${simple_config_key_folder} diff --git a/csit/suites/iotdm/basic/201_IoTDMInfraPluginLoaders.robot b/csit/suites/iotdm/basic/201_IoTDMInfraPluginLoaders.robot index ba7d923f27..3976554295 100644 --- a/csit/suites/iotdm/basic/201_IoTDMInfraPluginLoaders.robot +++ b/csit/suites/iotdm/basic/201_IoTDMInfraPluginLoaders.robot @@ -1,10 +1,11 @@ *** Settings *** -Documentation Test suite testing plugin loaders implemented in IoTDM. -... Test cases are testing the BundleLoader and KarafFeatureLoader RPCs. -... Suite uses valid and invalid testing plugins from IoTDM repository from iotdm/itcsitdist/iotdmitresources -... Invalid plugin means that there is some intentional issue in the implementation of the plugin which -... causes failure during plugin loading process and it should be catched by BundleLoader or KarafFeatureLoader -... and such plugin must not be loaded to system as well as nothing from its dependencies. +Documentation Test suite testing plugin loaders implemented in IoTDM. +... Test cases are testing the BundleLoader and KarafFeatureLoader RPCs. +... Suite uses valid and invalid testing plugins from IoTDM repository from iotdm/itcsitdist/iotdmitresources +... Invalid plugin means that there is some intentional issue in the implementation of the plugin which +... causes failure during plugin loading process and it should be catched by BundleLoader or KarafFeatureLoader +... and such plugin must not be loaded to system as well as nothing from its dependencies. + *** Test Cases *** 1.00 Bundle loader instance has no features loaded @@ -202,6 +203,7 @@ Documentation Test suite testing plugin loaders implemented in IoTDM. [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail Not implemented diff --git a/csit/suites/iotdm/basic/210_IoTDMSecurityNoAuth.robot b/csit/suites/iotdm/basic/210_IoTDMSecurityNoAuth.robot index 72dbcad1b1..6ba88bcff2 100644 --- a/csit/suites/iotdm/basic/210_IoTDMSecurityNoAuth.robot +++ b/csit/suites/iotdm/basic/210_IoTDMSecurityNoAuth.robot @@ -1,16 +1,17 @@ *** Settings *** -Documentation Test suite testing IoTDM security methods without authentication of the request sender entity. -... Test cases are implemented according to tables in 000_IoTDMSecurityNoAuthTable.txt -... TODO: It seems that data driven approach is much more appropriate for implementation -... of TCs described below which can be merged as needed. -Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} -Suite Teardown Delete All Sessions -Library RequestsLibrary -Library ../../../libraries/Common.py -Resource ../../../libraries/Utils.robot -Resource ../../../variables/Variables.robot - -*** Variables *** +Documentation Test suite testing IoTDM security methods without authentication of the request sender entity. +... Test cases are implemented according to tables in 000_IoTDMSecurityNoAuthTable.txt +... TODO: It seems that data driven approach is much more appropriate for implementation +... of TCs described below which can be merged as needed. + +Library RequestsLibrary +Library ../../../libraries/Common.py +Resource ../../../libraries/Utils.robot +Resource ../../../variables/Variables.robot + +Suite Setup Create Session session http://${ODL_SYSTEM_1_IP}:${RESTCONFPORT} auth=${AUTH} headers=${HEADERS_XML} +Suite Teardown Delete All Sessions + *** Test Cases *** 1.00 L0: Verify configured security level @@ -192,6 +193,7 @@ Resource ../../../variables/Variables.robot [Tags] not-implemented exclude TODO + *** Keywords *** TODO Fail "Not implemented" diff --git a/csit/suites/jsonrpc/010-mdsal-jsonrpc-basic.robot b/csit/suites/jsonrpc/010-mdsal-jsonrpc-basic.robot index d0410a1f4d..98450d4654 100644 --- a/csit/suites/jsonrpc/010-mdsal-jsonrpc-basic.robot +++ b/csit/suites/jsonrpc/010-mdsal-jsonrpc-basic.robot @@ -1,16 +1,19 @@ *** Settings *** -Documentation Test suite for verifying basic variations of export API including checking statuses -Suite Setup ClusterManagement Setup -Suite Teardown Delete All Sessions -Library OperatingSystem -Library DateTime -Resource ../../libraries/JsonrpcKeywords.robot -Resource ../../libraries/KarafKeywords.robot +Documentation Test suite for verifying basic variations of export API including checking statuses + +Library OperatingSystem +Library DateTime +Resource ../../libraries/JsonrpcKeywords.robot +Resource ../../libraries/KarafKeywords.robot + +Suite Setup ClusterManagement Setup +Suite Teardown Delete All Sessions + *** Test Cases *** Push MDSAL data and Verify Through Restconf [Documentation] Push data using python utility and verify using restconf - [Tags] Basic data + [Tags] basic data KarafKeywords.Setup_Karaf_Keywords KarafKeywords.Execute_Controller_Karaf_Command_On_Background log:set DEBUG org.opendaylight.jsonrpc JsonrpcKeywords.Mount Read Service Endpoint -- 2.36.6