1.1 rcn is legal in create
[Documentation] rcn=1, 2, 3, 0 is legal
- ${attr} = Set Variable "aei":"ODL","api":"jb","apn":"jb2","or":"http://hey/you"
+ ${attr} = Set Variable "api":"jb","apn":"jb2","or":"http://hey/you","rr":true
: FOR ${rcn} IN \ 1 2 3
... 0
\ ${r} = Create Resource With Command ${iserver} InCSE1 ${rt_ae} rcn=${rcn}
\ ... ${attr}
- #add check reponse here in the next step, seperate them
1.2 rcn is illegal in create
[Documentation] rcn=4, 5, 6, 7 is illegal
- ${attr} = Set Variable "aei":"ODL","api":"jb","apn":"jb2","or":"http://hey/you"
+ ${attr} = Set Variable "api":"jb","apn":"jb2","or":"http://hey/you","rr":true
: FOR ${rcn} IN 4 5 6 7
\ ${error} = Run Keyword And Expect Error * Create Resource With Command ${iserver} InCSE1
\ ... ${rt_ae} rcn=${rcn} ${attr}
\ Should Contain ${error} rcn
2.1 rcn is legal in update
- [Documentation] rcn=1, 4, 0/ null is legal
+ [Documentation] rcn=1, 0/ null is legal
${attr} = Set Variable "or":"http://hey/you"
- : FOR ${rcn} IN \ 0 1 4
+ : FOR ${rcn} IN \ 0 1 5
+ ... 6
\ ${r} = Update Resource With Command ${iserver} InCSE1/AE1 ${rt_ae} rcn=${rcn}
\ ... ${attr}
2.2 rcn is illegal in update
- [Documentation] rcn=2, 3, 5, 6, 7 is illegal
+ [Documentation] rcn=2, 3, 7 is illegal
${attr} = Set Variable "or":"http://hey/you"
: FOR ${rcn} IN 2 3 4 7
\ ${error} = Run Keyword And Expect Error * Update Resource With Command ${iserver} InCSE1/AE1
\ Should Contain ${error} rcn
4.2 rcn is illegal in delete
- [Documentation] rcn=4, 5, 6, 7 is illegal
+ [Documentation] rcn=2, 3, 4, 5, 6, 7 is illegal
${attr} = Set Variable "or":"http://hey/you"
- : FOR ${rcn} IN 2 3 4 5
- ... 6 7
+ : FOR ${rcn} IN 2 3 4 7
\ ${error} = Run Keyword And Expect Error * Delete Resource With Command ${iserver} InCSE1/AE1
\ ... rcn=${rcn}
\ Should Start with ${error} Cannot delete this resource [400]
1. createdBefore
${r} = Retrieve Resource With Command ${iserver} InCSE1/AE1 rcn=4&crb=20160612T033748Z
- ${count} = Get Length ${r.json()['ch']}
+ ${count} = Get Length ${r.json()['m2m:ae']['ch']}
Should Be Equal As Integers ${count} 2
2. createdAfter
${r} = Retrieve Resource With Command ${iserver} InCSE1/AE1 rcn=4&cra=20150612T033748Z
- ${count} = Get Length ${r.json()['ch']}
+ ${count} = Get Length ${r.json()['m2m:ae']['ch']}
Should Be Equal As Integers ${count} 2
3. modifiedSince
${r} = Retrieve Resource With Command ${iserver} InCSE1/AE1 rcn=4&ms=20150612T033748Z
- ${count} = Get Length ${r.json()['ch']}
+ ${count} = Get Length ${r.json()['m2m:ae']['ch']}
Should Be Equal As Integers ${count} 2
4. unmodifiedSince
${r} = Retrieve Resource With Command ${iserver} InCSE1/AE1 rcn=4&us=20160612T033748Z
- ${count} = Get Length ${r.json()['ch']}
+ ${count} = Get Length ${r.json()['m2m:ae']['ch']}
Should Be Equal As Integers ${count} 2
5. stateTagSmaller
${r} = Retrieve Resource With Command ${iserver} InCSE1/Container3 rcn=4&sts=3
${count} = Get Length ${r.json()['ch']}
- ${s} = Set Variable ${r.json()['ch']}
Should Be Equal As Integers ${count} 5
6. stateTagBigger
${r} = Retrieve Resource With Command ${iserver} InCSE1/Container3 rcn=4&stb=1
- ${count} = Get Length ${r.json()['ch']}
+
+ ${count} = Get Length ${r.json()['m2m:cnt']['ch']}
Should Be Equal As Integers ${count} 2
# 7. expireBefore
# 8. expireAfter
${r} = Retrieve Resource With Command ${iserver} InCSE1 rcn=4&rty=3&szb=5
${count} = Get Length ${r.json()['ch']}
Should Be Equal As Integers ${count} 1
- # 13. contentType
- # 14. limit
- # ${r} = Retrieve Resource With Command ${iserver} InCSE1 rcn=4&rty=3&lim=2
- # ${count} = Get Length ${r.json()['ch']}
- # Should Be Equal As Integers ${count} 2
- #15. attribute
- #16. filterUsage
- # different conditions shall use the "AND" logical operation;
- # same conditions shall use the "OR" logical operation.
+
+2.1 And Test - labels
+
+ ${r} = Retrieve Resource With Command ${iserver} InCSE1 fu=1&rcn=4&sts=4&lbl=contentInstanceUnderContainerContainer&lbl=underCSE
+ ${count} = Get Length ${r.json()}
+ Should Be Equal As Integers ${count} 6
*** Keywords ***
Connect And Create The Tree
[Documentation] Create a tree that contain AE/ container / contentInstance in different layers
${iserver} = Connect To Iotdm ${httphost} ${httpuser} ${httppass} http
- ${attr} = Set Variable "aei":"ODL","api":"jb","apn":"jb2","or":"http://hey/you"
- Create Resource ${iserver} InCSE1 ${rt_ae} ${attr} AE1
- Create Resource ${iserver} InCSE1 ${rt_ae} ${attr} AE2
- Create Resource ${iserver} InCSE1 ${rt_ae} ${attr} AE3
- ${attr} = Set Variable
- Create Resource ${iserver} InCSE1/AE1 ${rt_container} ${attr} Container1
- Create Resource ${iserver} InCSE1/AE1 ${rt_container} ${attr} Container2
+ ${attr} = Set Variable "api":"jb","apn":"jb2","or":"http://hey/you","rr":true
+ Create Resource ${iserver} InCSE1 ${rt_ae} ${attr},"rn":"AE1"
+ Create Resource ${iserver} InCSE1 ${rt_ae} ${attr},"rn":"AE2"
+ Create Resource ${iserver} InCSE1 ${rt_ae} ${attr},"rn":"AE3"
+ Create Resource ${iserver} InCSE1/AE1 ${rt_container} "rn":"Container1"
+ Create Resource ${iserver} InCSE1/AE1 ${rt_container} "rn":"Container2"
${attr} = Set Variable "cr":null,"mni":5,"mbs":150,"or":"http://hey/you","lbl":["underCSE"]
- Create Resource ${iserver} InCSE1 ${rt_container} ${attr} Container3
- Create Resource ${iserver} InCSE1 ${rt_container} ${attr} Container4
- Create Resource ${iserver} InCSE1 ${rt_container} ${attr} Container5
+ Create Resource ${iserver} InCSE1 ${rt_container} ${attr},"rn":"Container3"
+ Create Resource ${iserver} InCSE1 ${rt_container} ${attr},"rn":"Container4"
+ Create Resource ${iserver} InCSE1 ${rt_container} ${attr},"rn":"Container5"
${attr} = Set Variable "cr":null,"mni":5,"mbs":150,"or":"http://hey/you","lbl":["underAEContainer"]
- Create Resource ${iserver} InCSE1/AE1/Container1 ${rt_container} ${attr} Container6
+ Create Resource ${iserver} InCSE1/AE1/Container1 ${rt_container} ${attr},"rn":"Container6"
${attr} = Set Variable "cr":null,"mni":5,"mbs":150,"or":"http://hey/you","lbl":["underCSEContainer"]
- Create Resource ${iserver} InCSE1/Container3 ${rt_container} ${attr} Container7
- Create Resource ${iserver} InCSE1/Container3 ${rt_container} ${attr} Container8
- Create Resource ${iserver} InCSE1/Container3 ${rt_container} ${attr} Container9
+ 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"]
- Create Resource ${iserver} InCSE1/AE1/Container1 ${rt_contentInstance} ${attr} conIn1
- Create Resource ${iserver} InCSE1/AE1/Container1 ${rt_contentInstance} ${attr} conIn2
+ 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"]
- Create Resource ${iserver} InCSE1/Container3 ${rt_contentInstance} ${attr} conIn3
- Create Resource ${iserver} InCSE1/Container3 ${rt_contentInstance} ${attr} conIn4
- Create Resource ${iserver} InCSE1/Container3 ${rt_contentInstance} ${attr} conIn5
+ 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"
${attr} = Set Variable "cnf": "1","or": "http://hey/you","con":"102","lbl":["contentInstanceUnderContainer"]
- Create Resource ${iserver} InCSE1/Container4 ${rt_contentInstance} ${attr} conIn6
- Create Resource ${iserver} InCSE1/Container4 ${rt_contentInstance} ${attr} conIn7
- Create Resource ${iserver} InCSE1/Container4 ${rt_contentInstance} ${attr} conIn8
+ Create Resource ${iserver} InCSE1/Container4 ${rt_contentInstance} ${attr},"rn":"conIn6"
+ Create Resource ${iserver} InCSE1/Container4 ${rt_contentInstance} ${attr},"rn":"conIn7"
+ Create Resource ${iserver} InCSE1/Container4 ${rt_contentInstance} ${attr},"rn":"conIn8"