From: Jozef Behran Date: Tue, 12 Apr 2016 08:40:39 +0000 (+0200) Subject: Tidied updated test suites X-Git-Tag: release/lithium-sr4~45 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=integration%2Ftest.git;a=commitdiff_plain;h=88ced13d6ff5f2b6eee75453717b05b2e213ba9b Tidied updated test suites Change-Id: I03ce220e896169f145674943e2e4f6fe430bf6da Signed-off-by: Jozef Behran --- diff --git a/csit/libraries/OpenStackOperations.robot b/csit/libraries/OpenStackOperations.robot index 9d29acfbad..d604015f95 100644 --- a/csit/libraries/OpenStackOperations.robot +++ b/csit/libraries/OpenStackOperations.robot @@ -34,21 +34,21 @@ Create SubNet Verify Gateway Ips [Documentation] Verifies the Gateway Ips with dump flow. - ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int + ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int Log ${output} : FOR ${GatewayIpElement} IN @{GATEWAY_IPS} \ Should Contain ${output} ${GatewayIpElement} Verify Dhcp Ips [Documentation] Verifies the Dhcp Ips with dump flow. - ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int + ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int Log ${output} : FOR ${DhcpIpElement} IN @{DHCP_IPS} \ Should Contain ${output} ${DhcpIpElement} Verify No Dhcp Ips [Documentation] Verifies the Dhcp Ips with dump flow. - ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int + ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int Log ${output} : FOR ${DhcpIpElement} IN @{DHCP_IPS} \ Should Not Contain ${output} ${DhcpIpElement} @@ -63,7 +63,7 @@ Delete SubNet Verify No Gateway Ips [Documentation] Verifies the Gateway Ips removed with dump flow. - ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int + ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int Log ${output} : FOR ${GatewayIpElement} IN @{GATEWAY_IPS} \ Should Not Contain ${output} ${GatewayIpElement} @@ -72,41 +72,40 @@ Create Vm Instance [Arguments] ${net_id} ${network_name} [Documentation] Create Vm Instance with the net id of the Netowrk. ${VmElement}= Set Variable If "${network_name}"=="net1_network" MyFirstInstance MySecondInstance - ${output}= Write Commands Until Prompt nova boot --image cirros-0.3.4-x86_64-uec --flavor m1.tiny --nic net-id=${net_id} ${VmElement} + ${output}= Write Commands Until Prompt nova boot --image cirros-0.3.4-x86_64-uec --flavor m1.tiny --nic net-id=${net_id} ${VmElement} Log ${output} Delete Vm Instance [Arguments] ${vm_name} [Documentation] Delete Vm instances using instance names. - ${output}= Write Commands Until Prompt nova delete ${vm_name} + ${output}= Write Commands Until Prompt nova delete ${vm_name} Log ${output} Get Net Id [Arguments] ${network_name} [Documentation] Retrieve the net id for the given network name to create specific vm instance - ${output}= Write Commands Until Prompt neutron net-list | grep "${network_name}" | get_field 1 + ${output}= Write Commands Until Prompt neutron net-list | grep "${network_name}" | get_field 1 Log ${output} - ${splitted_output}= Split String ${output} \ + ${splitted_output}= Split String ${output} ${EMPTY} ${net_id}= Get from List ${splitted_output} 0 Log ${net_id} [Return] ${net_id} Create Router [Documentation] Create Router and Add Interface to the subnets. - ${output}= Write Commands Until Prompt neutron -v router-create router_1 + ${output}= Write Commands Until Prompt neutron -v router-create router_1 Log ${output} : FOR ${SubnetElement} IN @{SUBNETS_NAME} - \ ${output}= Write Commands Until Prompt neutron -v router-interface-add router_1 ${SubnetElement} + \ ${output}= Write Commands Until Prompt neutron -v router-interface-add router_1 ${SubnetElement} Log ${output} Remove Interface [Documentation] Remove Interface to the subnets. : FOR ${SubnetElement} IN @{SUBNETS_NAME} - \ ${output}= Write Commands Until Prompt neutron -v router-interface-delete router_1 ${SubnetElement} + \ ${output}= Write Commands Until Prompt neutron -v router-interface-delete router_1 ${SubnetElement} \ Log ${output} Delete Router [Documentation] Delete Router and Interface to the subnets. - ${output}= Write Commands Until Prompt neutron -v router-delete router_1 + ${output}= Write Commands Until Prompt neutron -v router-delete router_1 Log ${output} - diff --git a/csit/libraries/RestPerfClient.robot b/csit/libraries/RestPerfClient.robot index 56d0bd7279..ca1d892d63 100644 --- a/csit/libraries/RestPerfClient.robot +++ b/csit/libraries/RestPerfClient.robot @@ -64,7 +64,6 @@ Invoke_Restperfclient ... Assemble the RestPerfClient invocation commad, setup the specified ... timeout for the SSH connection, invoke the assembled command and ... then check that RestPerfClient finished its run correctly. - [Teardown] BuiltIn.Run_Keyword_If ${restperfclient_running} BuiltIn.Run_Keyword_And_Ignore_Error RestPerfClient__Kill ${restperfclient_running}= Set_Variable False ${logname}= Utils.Get_Log_File_Name restperfclient ${testcase} BuiltIn.Set_Suite_Variable ${RestPerfClient__restperfclientlog} ${logname} @@ -85,6 +84,7 @@ Invoke_Restperfclient SetupUtils.Set_Unknown_Bug_Id ${result}= Grep_Restperfclient_Log FINISHED. Execution time: BuiltIn.Should_Not_Be_Equal '${result}' '' + [Teardown] BuiltIn.Run_Keyword_If ${restperfclient_running} BuiltIn.Run_Keyword_And_Ignore_Error RestPerfClient__Kill Grep_Restperfclient_Log [Arguments] ${pattern} diff --git a/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot index 78a1a6d46a..f1a5f8d90b 100644 --- a/csit/libraries/VtnMaKeywords.robot +++ b/csit/libraries/VtnMaKeywords.robot @@ -16,10 +16,10 @@ ${VERSION_VTN} controller/nb/v2/vtn/version ${VTN_INVENTORY} restconf/operational/vtn-inventory:vtn-nodes ${DUMPFLOWS_OF10} dpctl dump-flows -OOpenFlow10 ${DUMPFLOWS_OF13} dpctl dump-flows -OOpenFlow13 -${FF_DUMPFLOWS_OF10} sh ovs-ofctl dump-flows -OOpenFlow10 s3 -${FF_DUMPFLOWS_OF13} sh ovs-ofctl dump-flows -OOpenFlow13 s3 -${DROP_DUMPFLOWS_OF10} sh ovs-ofctl dump-flows -OOpenFlow10 s2 -${DROP_DUMPFLOWS_OF13} sh ovs-ofctl dump-flows -OOpenFlow13 s2 +${FF_DUMPFLOWS_OF10} sh ovs-ofctl dump-flows -OOpenFlow10 s3 +${FF_DUMPFLOWS_OF13} sh ovs-ofctl dump-flows -OOpenFlow13 s3 +${DROP_DUMPFLOWS_OF10} sh ovs-ofctl dump-flows -OOpenFlow10 s2 +${DROP_DUMPFLOWS_OF13} sh ovs-ofctl dump-flows -OOpenFlow13 s2 ${index} 7 @{inet_actions} mod_nw_src:192.0.0.1 mod_nw_dst:192.0.0.2 @{BRIDGE1_DATAFLOW} "reason":"PORTMAPPED" "tenant-name":"Tenant1" "bridge-name":"vBridge1" "interface-name":"if2" diff --git a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot index 785ad1c110..f45246d1ec 100644 --- a/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot +++ b/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot @@ -42,7 +42,7 @@ ${DEFAULT_RIB_CHECK_TIMEOUT} 10s ${BGP_PEER_LOG_LEVEL} debug ${CONTROLLER_LOG_LEVEL} INFO ${CONTROLLER_BGP_LOG_LEVEL} DEFAULT -${JSONKEYSTR} "linkstate-route" +${JSONKEYSTR} "linkstate-route" *** Test Cases *** TC1_Configure_iBGP_Peer diff --git a/csit/suites/ovsdb/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot b/csit/suites/ovsdb/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot index 980fed3f64..4cc9dd23fb 100644 --- a/csit/suites/ovsdb/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot +++ b/csit/suites/ovsdb/Devstack_Tempest_Tests/01__single_node_devstack_tempest_tests.robot @@ -12,9 +12,9 @@ Resource ../../../libraries/DevstackUtils.robot @{NETWORKS_NAME} net1_network net2_network @{SUBNETS_NAME} subnet1 subnet2 @{VM_INSTANCES_NAME} MyFirstInstance MySecondInstance -@{VM_IPS} 10.0.0.3 20.0.0.3 +@{VM_IPS} 10.0.0.3 20.0.0.3 @{GATEWAY_IPS} 10.0.0.1 20.0.0.1 -@{DHCP_IPS} 10.0.0.2 20.0.0.2 +@{DHCP_IPS} 10.0.0.2 20.0.0.2 *** Test Cases *** Run Devstack Gate Wrapper @@ -48,27 +48,27 @@ Create Subnets \ Create SubNet ${NetworkElement} List Ports - ${output}= Write Commands Until Prompt neutron -v port-list + ${output}= Write Commands Until Prompt neutron -v port-list Log ${output} List Available Networks - ${output}= Write Commands Until Prompt neutron -v net-list + ${output}= Write Commands Until Prompt neutron -v net-list Log ${output} List Tenants - ${output}= Write Commands Until Prompt keystone tenant-list + ${output}= Write Commands Until Prompt keystone tenant-list Log ${output} List Nova - ${output}= Write Commands Until Prompt nova list + ${output}= Write Commands Until Prompt nova list Log ${output} List Nova Images - ${output}= Write Commands Until Prompt nova image-list + ${output}= Write Commands Until Prompt nova image-list Log ${output} List Nova Flavor - ${output}= Write Commands Until Prompt nova flavor-list + ${output}= Write Commands Until Prompt nova flavor-list Log ${output} Create Vm Instances @@ -80,12 +80,12 @@ Create Vm Instances Show Details of Created Vm Instance [Documentation] View Details of the created vm instances using nova show. : FOR ${VmElement} IN @{VM_INSTANCES_NAME} - \ ${output}= Write Commands Until Prompt nova show ${VmElement} + \ ${output}= Write Commands Until Prompt nova show ${VmElement} \ Log ${output} Verify Created Vm Instance In Dump Flow [Documentation] Verify the existence of the created vm instance ips in the dump flow. - ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int + ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int Log ${output} : FOR ${VmIpElement} IN @{VM_IPS} \ Should Contain ${output} ${VmIpElement} @@ -112,7 +112,7 @@ Delete Vm Instances Verify Deleted Vm Instance Removed In Dump Flow [Documentation] Verify the non-existence of the vm instance ips in the dump flow. : FOR ${VmIpElement} IN @{VM_IPS} - \ ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int + \ ${output}= Write Commands Until Prompt sudo ovs-ofctl -O OpenFlow13 dump-flows br-int \ Log ${output} \ Should Not Contain ${output} ${VmIpElement} diff --git a/csit/suites/ovsdb/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot b/csit/suites/ovsdb/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot index b17a02ae49..9651b52468 100644 --- a/csit/suites/ovsdb/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot +++ b/csit/suites/ovsdb/Netvirt_Cluster/010_Ovsdb_Netvirt_flow.robot @@ -38,7 +38,7 @@ Check Shards Status Before Fail Start Mininet Multiple Connections [Documentation] Start mininet with connection to all cluster instances. - ${mininet_conn_id} Add Multiple Managers to OVS ${TOOLS_SYSTEM_IP} ${original_cluster_list} + ${mininet_conn_id} Add Multiple Managers to OVS ${TOOLS_SYSTEM_IP} ${original_cluster_list} Set Suite Variable ${mininet_conn_id} Log ${mininet_conn_id} diff --git a/csit/suites/ovsdb/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot b/csit/suites/ovsdb/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot index 489baf96d8..df24790fbd 100644 --- a/csit/suites/ovsdb/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot +++ b/csit/suites/ovsdb/Netvirt_Cluster/030_Ovsdb_Southbound_NetVirt.robot @@ -13,7 +13,8 @@ Resource ../../../libraries/OVSDB.robot Resource ../../../libraries/KarafKeywords.robot *** Variables *** -@{FLOW_TABLE_LIST} actions=goto_table:20 actions=CONTROLLER:65535 actions=goto_table:30 actions=goto_table:40 actions=goto_table:50 actions=goto_table:60 actions=goto_table:70 actions=goto_table:80 actions=goto_table:90 actions=goto_table:100 actions=goto_table:110 actions=drop +@{FLOW_TABLE_LIST} actions=goto_table:20 actions=CONTROLLER:65535 actions=goto_table:30 actions=goto_table:40 actions=goto_table:50 actions=goto_table:60 actions=goto_table:70 +... actions=goto_table:80 actions=goto_table:90 actions=goto_table:100 actions=goto_table:110 actions=drop *** Test Cases *** Create Original Cluster List @@ -34,7 +35,7 @@ Check Shards Status Before Fail Start Mininet Multiple Connections [Documentation] Start mininet with connection to all cluster instances. - ${mininet_conn_id} Add Multiple Managers to OVS ${TOOLS_SYSTEM_IP} ${original_cluster_list} + ${mininet_conn_id} Add Multiple Managers to OVS ${TOOLS_SYSTEM_IP} ${original_cluster_list} Set Suite Variable ${mininet_conn_id} Log ${mininet_conn_id} @@ -69,11 +70,10 @@ Get interface setup Log ${output} Should Contain ${output} Interface br-int - Get the bridge flows [Documentation] This request fetch the OF13 flow tables to verify the flows are correctly added [Tags] OVSDB netvirt ${output} Run Command On Remote System ${TOOLS_SYSTEM_IP} sudo ovs-ofctl -O Openflow13 dump-flows br-int Log ${output} : FOR ${flows} IN @{FLOW_TABLE_LIST} - \ Should Contain ${output} ${flows} \ No newline at end of file + \ Should Contain ${output} ${flows}