resp.content breaks with "should contain" style KWs.
resp.text is the way forward with that.
Signed-off-by: Jamo Luhrsen <jluhrsen@gmail.com>
Change-Id: Ia0212b48b0c531e38c18dafcde8d7eeea7065049
Should Be Equal As Strings ${resp.status_code} 404
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} SFC1-100
+ Should Not Contain ${resp.text} SFC1-100
Delete A Non-existing Empty Service Function Path
[Documentation] Delete A Non existing Service Function Path
Add Elements To URI From File ${SERVICE_FUNCTION_PATH400_URI} ${SERVICE_FUNCTION_PATH400_FILE}
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATH400_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} SFC1-400
+ Should Contain ${resp.text} SFC1-400
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} SFC1-400
+ Should Contain ${resp.text} SFC1-400
*** Keywords ***
Init Suite
Remove All Elements At URI ${SERVICE_FUNCTION_URI}/dpi-1
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} dpi-1
+ Should Not Contain ${resp.text} dpi-1
Delete A Non-existing Empty Service Function
[Documentation] Delete A Non existing Service Function. Logical SFF
Remove All Elements At URI ${SERVICE_FUNCTION_URI}/dpi-102-1
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} dpi-102-1
+ Should Not Contain ${resp.text} dpi-102-1
Delete A Non-existing Empty Service Function
[Documentation] Delete A Non existing Service Function
Add Elements To URI From File ${SF_DPI102100_URI}/sf-data-plane-locator/dpl-101 ${SF_DPL101_FILE}
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTIONS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} dpi-102-100
+ Should Contain ${resp.text} dpi-102-100
${elements}= Create List dpl-101 10101
Check For Elements At URI ${SF_DPI102100_URI}/sf-data-plane-locator/dpl-101 ${elements}
Check For Elements At URI ${SF_DPI102100_URI} ${elements}
Remove All Elements At URI ${SF_DPI102100_URI}/sf-data-plane-locator/dpl-100
${resp} RequestsLibrary.Get Request session ${SF_DPI102100_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} dpl-100
+ Should Not Contain ${resp.text} dpl-100
*** Keywords ***
Init Suite
Should Be Equal As Strings ${resp.status_code} 404
${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}
Should Be Equal As Strings ${resp.status_code} 200
- Should Not Contain ${resp.content} SF1
+ Should Not Contain ${resp.text} SF1
Delete A Non-existing Service Function Forwarder
[Documentation] Delete A Non existing Service Function
Add Elements To URI From File ${SFF_OVS100_URI}/sff-data-plane-locator/dpl-101 ${SFF_DPL101_FILE}
${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDERS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} ovs-100
+ Should Contain ${resp.text} ovs-100
${elements}= Create List dpl-101 6101
Check For Elements At URI ${SFF_OVS100_URI}/sff-data-plane-locator/dpl-101 ${elements}
Check For Elements At URI ${SFF_OVS100_URI} ${elements}
Remove All Elements At URI ${SFF_OVS100_URI}/sff-data-plane-locator/eth0
${resp} RequestsLibrary.Get Request session ${SFF_OVS100_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} "name":"eth0"
+ Should Not Contain ${resp.text} "name":"eth0"
Get Service Function Forwarder DPL's Locator
[Documentation] Get Service Function Data Plane Locator
Remove All Elements At URI ${SFF_OVS100_URI}/sff-data-plane-locator/dpl-101/data-plane-locator
${resp} RequestsLibrary.Get Request session ${SFF_OVS100_URI}/sff-data-plane-locator/dpl-101
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} dpl-101
- Should Not Contain ${resp.content} 6101
- Should Not Contain ${resp.content} service-locator:vxlan-gpe
+ Should Contain ${resp.text} dpl-101
+ Should Not Contain ${resp.text} 6101
+ Should Not Contain ${resp.text} service-locator:vxlan-gpe
${resp} RequestsLibrary.Get Request session ${SFF_OVS100_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} dpl-101
- Should Not Contain ${resp.content} 6101
+ Should Contain ${resp.text} dpl-101
+ Should Not Contain ${resp.text} 6101
Get Service Function Dictionary From SFF
[Documentation] Get Service Function Dictionary From SFF
Should Be Equal As Strings ${resp.status_code} 404
${resp} RequestsLibrary.Get Request session ${SFF_BOOTSTRAP_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} service-function-dictionary
- Should Not Contain ${resp.content} SF1
+ Should Contain ${resp.text} service-function-dictionary
+ Should Not Contain ${resp.text} SF1
Put Service Function Dictionary to SFF
[Documentation] Put Service Function Dictionary to SFF
Check For Elements At URI ${SFF_BOOTSTRAP_URI}/connected-sff-dictionary/br-int-ovs-2 ${elements}
${resp} RequestsLibrary.Get Request session ${SERVICE_FORWARDER_URI}/br-int-ovs-2/connected-sff-dictionary/SFF-bootstrap
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} SFF-bootstrap
+ Should Contain ${resp.text} SFF-bootstrap
Delete Connected SFF Dictionary From SFF
[Documentation] Delete Connected SFF Dictionary From SFF
Should Be Equal As Strings ${resp.status_code} 404
${resp} RequestsLibrary.Get Request session ${SFF_BOOTSTRAP_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} br-int-ovs-2
+ Should Not Contain ${resp.text} br-int-ovs-2
Put Connected SFF Dictionary to SFF
[Documentation] Put Connected SFF Dictionary to SFF
Remove All Elements At URI ${SERVICE_NODE_URI}/node-101
${resp} RequestsLibrary.Get Request session ${SERVICE_NODES_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} node-101
+ Should Not Contain ${resp.text} node-101
Delete A Non-existing Service Node
[Documentation] Delete A Non existing Service Node
Remove All Elements At URI ${SERVICE_CHAIN_URI}/SFC1/sfc-service-function/dpi-abstract1
${resp} RequestsLibrary.Get Request session ${SERVICE_CHAINS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} SFC1
+ Should Contain ${resp.text} SFC1
${elements}= Create List dpi-abstract1 service-function-type:dpi
Check For Elements Not At URI ${SERVICE_CHAIN_URI}/SFC1 ${elements}
Should Be Equal As Strings ${resp.status_code} 404
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} SFC1-100
+ Should Not Contain ${resp.text} SFC1-100
Delete A Non-existing Empty Service Function Path
[Documentation] Delete A Non existing Service Function Path
Add Elements To URI From File ${SERVICE_FUNCTION_PATH400_URI} ${SERVICE_FUNCTION_PATH400_FILE}
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATH400_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} SFC1-400
+ Should Contain ${resp.text} SFC1-400
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_PATHS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Contain ${resp.content} SFC1-400
+ Should Contain ${resp.text} SFC1-400
*** Keywords ***
Init Suite
Remove All Elements At URI ${SERVICE_FUNCTION_ACLS_URI}/acl/ietf-access-control-list:ipv4-acl/ACL1
${resp} RequestsLibrary.Get Request session ${SERVICE_FUNCTION_ACLS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} ACL1
+ Should Not Contain ${resp.text} ACL1
Remove All Elements At URI ${SERVICE_CLASSIFIERS_URI}/service-function-classifier/Classifier1
${resp} RequestsLibrary.Get Request session ${SERVICE_CLASSIFIERS_URI}
Should Contain ${ALLOWED_STATUS_CODES} ${resp.status_code}
- Should Not Contain ${resp.content} Classifier1
+ Should Not Contain ${resp.text} Classifier1