From 42d1c432b0d78a8a441dc64f0fdc4eda85700b28 Mon Sep 17 00:00:00 2001 From: Jozef Behran Date: Wed, 20 Jan 2016 14:07:26 +0100 Subject: [PATCH] Tidied new and updated test suites Change-Id: I9ba32a6262d3cab40c23bc5902bb34f02fb4aaf3 Signed-off-by: Jozef Behran --- csit/libraries/ClusterOvsdb.robot | 2 +- csit/libraries/NetconfKeywords.robot | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/csit/libraries/ClusterOvsdb.robot b/csit/libraries/ClusterOvsdb.robot index 945ac7f7ec..436fe82b61 100644 --- a/csit/libraries/ClusterOvsdb.robot +++ b/csit/libraries/ClusterOvsdb.robot @@ -67,7 +67,7 @@ Get Cluster Entity Owner For Ovsdb Create Bridge And Verify [Arguments] ${controller_index_list} ${controller_index} [Documentation] Create bridge in ${controller_index} and verify it gets applied in all instances in ${controller_index_list}. - # need to get UUID which should be the same on all controllers in cluster, so asking controller1 + # need to get UUID which should be the same on all controllers in cluster, so asking controller1 ${ovsdb_uuid}= Get OVSDB UUID controller_http_session=controller${controller_index} ${body}= OperatingSystem.Get File ${CURDIR}/../variables/ovsdb/create_bridge_3node.json ${body} Replace String ${body} ovsdb://127.0.0.1:61644 ovsdb://uuid/${ovsdb_uuid} diff --git a/csit/libraries/NetconfKeywords.robot b/csit/libraries/NetconfKeywords.robot index b89fdc0a48..3abcb002ef 100644 --- a/csit/libraries/NetconfKeywords.robot +++ b/csit/libraries/NetconfKeywords.robot @@ -42,23 +42,23 @@ Configure_Device_In_Netconf Collections.Set_To_Dictionary ${NetconfKeywords__mounted_device_types} ${device_name} ${device_type} Count_Netconf_Connectors_For_Device + [Arguments] ${device_name} + [Documentation] Count all instances of the specified device in the Netconf topology (usually 0 or 1). # FIXME: This no longer counts netconf connectors, it counts "device instances in Netconf topology". # This keyword should be renamed but without an automatic keyword naming standards checker this is # potentially destabilizing change so right now it is as FIXME. Proposed new name: # Count_Device_Instances_In_Netconf_Topology - [Arguments] ${device_name} - [Documentation] Count all instances of the specified device in the Netconf topology (usually 0 or 1). ${mounts}= NetconfViaRestconf.Get_Operational_Data_From_URI network-topology:network-topology/topology/topology-netconf Builtin.Log ${mounts} ${actual_count}= Builtin.Evaluate len('''${mounts}'''.split('"node-id":"${device_name}"'))-1 Builtin.Return_From_Keyword ${actual_count} Check_Device_Has_No_Netconf_Connector + [Arguments] ${device_name} + [Documentation] Check that there are no instances of the specified device in the Netconf topology. # FIXME: Similarlt to "Count_Netconf_Connectors_For_Device", this does not check whether the device has # no netconf connector but whether the device is present in the netconf topology or not. Rename, proposed # new name: Check_Device_Not_Present_In_Netconf_Topology - [Arguments] ${device_name} - [Documentation] Check that there are no instances of the specified device in the Netconf topology. ${count} Count_Netconf_Connectors_For_Device ${device_name} Builtin.Should_Be_Equal_As_Strings ${count} 0 @@ -73,7 +73,7 @@ Check_Device_Completely_Gone Check_Device_Connected [Arguments] ${device_name} [Documentation] Check that the specified device is accessible from Netconf. - ${device_status}= NetconfViaRestconf.Get_Operational_Data_From_URI network-topology:network-topology/topology/topology-netconf/node/${device_name} + ${device_status}= NetconfViaRestconf.Get_Operational_Data_From_URI network-topology:network-topology/topology/topology-netconf/node/${device_name} Builtin.Should_Contain ${device_status} "netconf-node-topology:connection-status":"connected" Wait_Device_Connected -- 2.36.6