From b17c268cc5e04f4db73d69bd5243c61a03653dfc Mon Sep 17 00:00:00 2001 From: Tomas Cechvala Date: Thu, 14 Jan 2016 15:15:05 +0100 Subject: [PATCH] Specifying headers in GBP demo Content-Type changed to application/yang.data+json as a fix for not parsing already parsed body. Change-Id: I3d83c971d8afd30868a04c3d2596f1ba0469bf70 Signed-off-by: Tomas Cechvala --- .../groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot | 4 ++-- .../GBP/3-node/gbp2-multitenant/001_set_odl.robot | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot b/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot index 4375aef4d1..a629afbb87 100644 --- a/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot +++ b/csit/suites/groupbasedpolicy/GBP/3-node/gbp1/001_set_odl.robot @@ -18,7 +18,7 @@ Put Tunnels ${edited_json} Replace String ${json_to_edit} _CLASSIFIER1 ${GBP1} ${edited_json} Replace String ${edited_json} _CLASSIFIER2 ${GBP2} ${edited_json} Replace String ${edited_json} _CLASSIFIER3 ${GBP3} - ${resp} RequestsLibrary.Put Request session ${TUNNELS_PATH} ${edited_json} ${HEADERS} + ${resp} RequestsLibrary.Put Request session ${TUNNELS_PATH} ${edited_json} ${HEADERS_YANG_JSON} Should Be Equal As Strings ${resp.status_code} 200 Register Endpoints @@ -29,4 +29,4 @@ Register Endpoints Put Tenant [Documentation] Send GBP policy to ODL - Add Elements To URI From File ${TENANT1_PATH} ${TENANT1_FILE} + Add Elements To URI From File ${TENANT1_PATH} ${TENANT1_FILE} ${HEADERS_YANG_JSON} diff --git a/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot b/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot index 7ce20cee2b..009f61556d 100644 --- a/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot +++ b/csit/suites/groupbasedpolicy/GBP/3-node/gbp2-multitenant/001_set_odl.robot @@ -18,7 +18,7 @@ Put Tunnels ${edited_json} Replace String ${json_to_edit} _CLASSIFIER1 ${GBP1} ${edited_json} Replace String ${edited_json} _CLASSIFIER2 ${GBP2} ${edited_json} Replace String ${edited_json} _CLASSIFIER3 ${GBP3} - ${resp} RequestsLibrary.Put Request session ${TUNNELS_PATH} ${edited_json} ${HEADERS} + ${resp} RequestsLibrary.Put Request session ${TUNNELS_PATH} ${edited_json} ${HEADERS_YANG_JSON} Should Be Equal As Strings ${resp.status_code} 200 Register Endpoints @@ -29,5 +29,5 @@ Register Endpoints Put Tenants [Documentation] Send GBP policy to ODL - Add Elements To URI From File ${TENANT1_PATH} ${TENANT1_FILE} - Add Elements To URI From File ${TENANT2_PATH} ${TENANT2_FILE} + Add Elements To URI From File ${TENANT1_PATH} ${TENANT1_FILE} ${HEADERS_YANG_JSON} + Add Elements To URI From File ${TENANT2_PATH} ${TENANT2_FILE} ${HEADERS_YANG_JSON} -- 2.36.6