From 9bd49ac057331e960542fdc38d3eedd7e282d046 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Mon, 11 Jan 2016 17:12:48 -0800 Subject: [PATCH] Change URI to specific ovsdb node Change-Id: Ifc934bdc7ee1972afddc546f6b8adb5bcd1ef8aa Signed-off-by: Jamo Luhrsen --- csit/libraries/ClusterKeywords.robot | 8 ++++++-- csit/libraries/ClusterOvsdb.robot | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/csit/libraries/ClusterKeywords.robot b/csit/libraries/ClusterKeywords.robot index 72862959e0..b85bed1f9b 100644 --- a/csit/libraries/ClusterKeywords.robot +++ b/csit/libraries/ClusterKeywords.robot @@ -91,11 +91,15 @@ Check Item Occurrence At URI In Cluster \ Check Item Occurrence ${data} ${dictionary_item_occurrence} Put And Check At URI In Cluster - [Arguments] ${controller_index_list} ${controller_index} ${uri} ${body} ${headers}=${HEADERS} + [Arguments] ${controller_index_list} ${controller_index} ${uri} ${body} ${headers}=${HEADERS_YANG_JSON} [Documentation] Send a PUT with the supplied ${uri} and ${body} to a ${controller_index} ... and check the data is replicated in all instances in ${controller_index_list}. ${expected_body}= Hsf Json ${body} - ${resp} RequestsLibrary.Put Request controller${controller_index} ${uri} ${body} ${headers} + Log ${body} + ${json_body}= To Json ${body} + ${resp} RequestsLibrary.Put Request controller${controller_index} ${uri} ${json_body} ${headers} + Log ${resp.content} + Log ${resp.status_code} ${status_code}= Convert To String ${resp.status_code} Should Match Regexp ${status_code} 20(0|1) : FOR ${i} IN @{controller_index_list} diff --git a/csit/libraries/ClusterOvsdb.robot b/csit/libraries/ClusterOvsdb.robot index 99b2675421..911ba9ae5f 100644 --- a/csit/libraries/ClusterOvsdb.robot +++ b/csit/libraries/ClusterOvsdb.robot @@ -76,4 +76,4 @@ Create Bridge And Verify Log ${body} ${dictionary}= Create Dictionary ${MININET}=1 ${OVSDBPORT}=4 ${BRIDGE}=1 Put And Check At URI In Cluster ${controller_index_list} ${controller_index} ${CONFIG_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2Fuuid%2F${ovsdb_uuid}%2Fbridge%2F${BRIDGE} ${body} ${HEADERS} - Wait Until Keyword Succeeds 5s 1s Check Item Occurrence At URI In Cluster ${controller_index_list} ${dictionary} ${OPERATIONAL_TOPO_API} + Wait Until Keyword Succeeds 5s 1s Check Item Occurrence At URI In Cluster ${controller_index_list} ${dictionary} ${OPERATIONAL_TOPO_API}/topology/ovsdb:1/node/ovsdb:%2F%2Fuuid%2F${ovsdb_uuid} -- 2.36.6