Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove tapv1 test and fix tests #1339

Merged
merged 1 commit into from
May 10, 2019
Merged

remove tapv1 test and fix tests #1339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tests/robot/examples/example_crud_test.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ Show Something Before Setup

Add Something
vpp_term: Interface Not Exists node=agent_vpp_1 mac=${MAC_TAP1}
Put TAP Interface With IP node=agent_vpp_1 name=${NAME_TAP1} mac=${MAC_TAP1} ip=${IP_TAP1} prefix=${PREFIX} host_if_name=linux_${NAME_TAP1}
Put TAPv2 Interface With IP node=agent_vpp_1 name=${NAME_TAP1} mac=${MAC_TAP1} ip=${IP_TAP1} prefix=${PREFIX} host_if_name=linux_${NAME_TAP1}

Check Something Is Created
${interfaces}= vat_term: Interfaces Dump node=agent_vpp_1
Expand All @@ -58,7 +58,7 @@ Check Something Is Still Configured
${actual_state}= vpp_term: Check TAP interface State agent_vpp_1 ${NAME_TAP1} mac=${MAC_TAP1} ipv4=${IP_TAP1}/${PREFIX} state=${UP_STATE}

Update Something
Put TAP Interface With IP node=agent_vpp_1 name=${NAME_TAP1} mac=${MAC_TAP1_2} ip=${IP_TAP1_2} prefix=${PREFIX} host_if_name=linux_${NAME_TAP1}
Put TAPv2 Interface With IP node=agent_vpp_1 name=${NAME_TAP1} mac=${MAC_TAP1_2} ip=${IP_TAP1_2} prefix=${PREFIX} host_if_name=linux_${NAME_TAP1}

Check Something Is Created
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Interface Is Created node=agent_vpp_1 mac=${MAC_TAP1_2}
Expand Down
7 changes: 0 additions & 7 deletions tests/robot/libraries/etcdctl.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,13 +208,6 @@ Get Bridge Domain ID IPv6
\ ${index}= Run Keyword If "${data["name"]}" == "${bd_name}" Set Variable ${meta['bridge_domain_id']}
[Return] ${index}

Put TAP Interface With IP
[Arguments] ${node} ${name} ${mac} ${ip} ${host_if_name} ${prefix}=24 ${mtu}=1500 ${enabled}=true ${vrf}=0
${data}= OperatingSystem.Get File ${CURDIR}/../resources/tap_interface_with_ip.json
${uri}= Set Variable /vnf-agent/${node}/config/vpp/${AGENT_VER}/interfaces/${name}
${data}= Replace Variables ${data}
Put Json ${uri} ${data}

Put TAP Unnumbered Interface
[Arguments] ${node} ${name} ${mac} ${unnumbered} ${interface_with_ip_name} ${host_if_name} ${mtu}=1500 ${enabled}=true
${data}= OperatingSystem.Get File ${CURDIR}/../resources/tap_interface_unnumbered.json
Expand Down
3 changes: 0 additions & 3 deletions tests/robot/libraries/pretty_keywords.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@ Create ${type} ${name} On ${node} With Vrf ${vrf}, IP ${ip}, MAC ${mac}, Key ${k
${type}= Set Variable if "${type}"=="Master" true false
${out}= Put Memif Interface With IP ${node} ${name} ${mac} ${type} ${key} ${ip} socket=${socket} vrf=${vrf}

Create Tap Interface ${name} On ${node} With Vrf ${vrf}, IP ${ip}, MAC ${mac} And HostIfName ${host_if_name}
${out}= Put TAP Interface With IP ${node} ${name} ${mac} ${ip} ${host_if_name} vrf=${vrf}

Create Tapv2 Interface ${name} On ${node} With Vrf ${vrf}, IP ${ip}, MAC ${mac} And HostIfName ${host_if_name}
${out}= Put TAPv2 Interface With IP ${node} ${name} ${mac} ${ip} ${host_if_name} vrf=${vrf}

Expand Down
14 changes: 0 additions & 14 deletions tests/robot/resources/tap_interface_with_ip.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion tests/robot/suites/crud/bd_crud.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ Add Interfaces For BDs
Put Afpacket Interface node=agent_vpp_1 name=vpp1_afpacket1 mac=a2:a1:a1:a1:a1:a1 host_int=vpp1_veth2
Put VXLan Interface node=agent_vpp_1 name=vpp1_vxlan1 src=192.168.1.1 dst=192.168.1.2 vni=5
Put Loopback Interface With IP node=agent_vpp_1 name=vpp1_loop1 mac=12:21:21:11:11:11 ip=20.20.1.1
Put TAP Interface With IP node=agent_vpp_1 name=vpp1_tap1 mac=32:21:21:11:11:11 ip=30.30.1.1 host_if_name=linux_vpp1_tap1
Put TAPv2 Interface With IP node=agent_vpp_1 name=vpp1_tap1 mac=32:21:21:11:11:11 ip=30.30.1.1 host_if_name=linux_vpp1_tap1
Put Memif Interface With IP node=agent_vpp_1 name=vpp1_memif2 mac=62:61:61:61:61:62 master=true id=2 ip=192.168.20.2
Put VXLan Interface node=agent_vpp_1 name=vpp1_vxlan2 src=192.168.2.1 dst=192.168.2.2 vni=15
Put Loopback Interface With IP node=agent_vpp_1 name=bvi_vpp1_loop2 mac=12:21:21:11:11:12 ip=20.20.2.1
Expand Down
100 changes: 0 additions & 100 deletions tests/robot/suites/crud/tap_crud.robot
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions tests/robot/suites/crudIPv6/app_namespaces_crudIPv6.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ Check Default Namespace Was Added
Should Contain ${out} default

Put Interface TAP1 And Namespace NS1 Associated With TAP1 And Check The Namespace Is Present In Namespaces List
Put TAP Interface With IP node=agent_vpp_1 name=${TAP1_NAME} mac=${TAP1_MAC} ip=${TAP1_IP} prefix=${PREFIX} host_if_name=linux_${TAP1_NAME}
Put TAPv2 Interface With IP node=agent_vpp_1 name=${TAP1_NAME} mac=${TAP1_MAC} ip=${TAP1_IP} prefix=${PREFIX} host_if_name=linux_${TAP1_NAME}
Put Application Namespace node=agent_vpp_1 id=${NS1_ID} secret=${SECRET1} interface=${TAP1_NAME}
${out}= vpp_term: Show Application Namespaces node=agent_vpp_1
${out_lines1}= Get Line Count ${out}
Expand All @@ -97,7 +97,7 @@ Put New NS2 Namespace And Check The Namespace Is Present In Namespaces List And
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check Data In Show Application Namespaces Output agent_vpp_1 ${NS1_ID} 1 ${SECRET2} ${TAP1_SW_IF_INDEX}

Put Interface TAP2 And Namespace NS3 Associated With TAP2 And Check The Namespace Is Present In Namespaces List
Put TAP Interface With IP node=agent_vpp_1 name=${TAP2_NAME} mac=${TAP2_MAC} ip=${TAP2_IP} prefix=${PREFIX} host_if_name=linux_${TAP2_NAME}
Put TAPv2 Interface With IP node=agent_vpp_1 name=${TAP2_NAME} mac=${TAP2_MAC} ip=${TAP2_IP} prefix=${PREFIX} host_if_name=linux_${TAP2_NAME}
Put Application Namespace node=agent_vpp_1 id=${NS3_ID} secret=${SECRET4} interface=${TAP2_NAME}
${out}= vpp_term: Show Application Namespaces node=agent_vpp_1
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check Data In Show Application Namespaces Output agent_vpp_1 ${NS3_ID} 3 ${SECRET4} ${TAP2_SW_IF_INDEX}
Expand Down
21 changes: 10 additions & 11 deletions tests/robot/suites/crudIPv6/arp_crudIPv6.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,7 @@ Check That Veth1 And Veth2 Interfaces Are Created
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} linux: Interface Is Created node=agent_vpp_1 mac=${VETH2_MAC}
linux: Check Veth Interface State agent_vpp_1 vpp1_veth1 mac=${VETH1_MAC} ipv6=${VETH1_IP_PREFIX} mtu=1500 state=up
linux: Check Veth Interface State agent_vpp_1 vpp1_veth2 mac=${VETH2_MAC} state=up
vpp_term: Show Interface Mode agent_vpp_1 vpp1_veth1@vpp1_veth2
vpp_term: Show Interface Mode agent_vpp_1 vpp1_veth2@vpp1_veth1
vpp_term: Show Interface Mode agent_vpp_1


Add Memif Interface
Expand Down Expand Up @@ -87,7 +86,7 @@ Add Tap Interface

Check TAP Interface Created
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Interface Is Created node=agent_vpp_1 mac=32:21:21:11:11:11
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check TAP interface State agent_vpp_1 vpp1_tap1 mac=32:21:21:11:11:11 ipv6=${TAP_IP_PREFIX} state=up
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check TAP IP6 Interface State agent_vpp_1 vpp1_tap1 mac=32:21:21:11:11:11 ipv6=${TAP_IP_PREFIX} state=up

Check Stuff
Show Interfaces And Other Objects
Expand All @@ -96,15 +95,15 @@ Add ARPs
Put ARP agent_vpp_1 vpp1_memif1 155.155.155.155 32:51:51:51:51:51 false
Put ARP agent_vpp_1 vpp1_memif1 155.155.155.156 32:51:51:51:51:52 false
Put ARP agent_vpp_1 vpp1_veth1 155.155.155.155 32:51:51:51:51:51 false
Put ARP agent_vpp_1 vpp1_veth1 155.155.155.150 32:51:51:51:51:5 false
Put ARP agent_vpp_1 vpp1_veth1 155.155.155.150 32:51:51:51:51:50 false
Put ARP agent_vpp_1 vpp1_veth2 155.155.155.155 32:51:51:51:51:51 false
Put ARP agent_vpp_1 vpp1_veth2 155.155.155.150 32:51:51:51:51:5 false
Put ARP agent_vpp_1 vpp1_veth2 155.155.155.150 32:51:51:51:51:50 false
Put ARP agent_vpp_1 vpp1_vxlan1 155.155.155.155 32:51:51:51:51:51 false
Put ARP agent_vpp_1 vpp1_vxlan1 155.155.155.154 32:51:51:51:51:53 false
Put ARP agent_vpp_1 vpp1_loop1 155.155.155.155 32:51:51:51:51:51 false
Put ARP agent_vpp_1 vpp1_loop1 155.155.155.152 32:51:51:51:51:55 false
Put ARP agent_vpp_1 vpp1_tap1 155.155.155.155 32:51:51:51:51:51 false
Put ARP agent_vpp_1 vpp1_tap1 155.155.155.150 32:51:51:51:51:5 false
Put ARP agent_vpp_1 vpp1_tap1 155.155.155.150 32:51:51:51:51:50 false
Sleep ${SYNC_SLEEP}

Check Memif ARP
Expand All @@ -129,7 +128,7 @@ Check Loopback ARP

Check TAP ARP
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 vpp1_tap1 155.155.155.155 32:51:51:51:51:51 True
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 vpp1_tap1 155.155.155.150 32:51:51:51:51:5 True
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 vpp1_tap1 155.155.155.150 32:51:51:51:51:50 True

ADD Afpacket Interface
Put Afpacket Interface node=agent_vpp_1 name=vpp1_afpacket1 mac=a2:a1:a1:a1:a1:a1 host_int=vpp1_veth2
Expand All @@ -146,11 +145,11 @@ Check Veth1 Veth2 Are Created After Afpacket is created

Add ARP for Afpacket
Put ARP agent_vpp_1 host-vpp1_veth2 155.155.155.155 32:51:51:51:51:51 False
Put ARP agent_vpp_1 host-vpp1_veth2 155.155.155.150 32:51:51:51:51:5 False
Put ARP agent_vpp_1 host-vpp1_veth2 155.155.155.150 32:51:51:51:51:50 False

Check Afpacket ARP
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 host-vpp1_veth2 155.155.155.155 32:51:51:51:51:51 True
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 host-vpp1_veth2 155.155.155.150 32:51:51:51:51:5 True
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 host-vpp1_veth2 155.155.155.150 32:51:51:51:51:50 True

Delete ARPs
Delete ARP agent_vpp_1 vpp1_memif1 155.155.155.156
Expand Down Expand Up @@ -186,11 +185,11 @@ Check Loopback ARP After Delete

Check TAP ARP After Delete
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 vpp1_tap1 155.155.155.155 32:51:51:51:51:51 True
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 vpp1_tap1 155.155.155.150 32:51:51:51:51:5 False
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 vpp1_tap1 155.155.155.150 32:51:51:51:51:50 False

Check Afpacket ARP After Delete
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 host-vpp1_veth2 155.155.155.155 32:51:51:51:51:51 True
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 host-vpp1_veth2 155.155.155.150 32:51:51:51:51:5 False
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Check ARP agent_vpp_1 host-vpp1_veth2 155.155.155.150 32:51:51:51:51:50 False

Modify ARPs
Put ARP agent_vpp_1 vpp1_memif1 155.155.155.155 32:51:51:51:51:58 false
Expand Down
2 changes: 1 addition & 1 deletion tests/robot/suites/crudIPv6/bd_crudIPv6.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ Add Interfaces For BDs
Put Afpacket Interface node=agent_vpp_1 name=vpp1_afpacket1 mac=a2:a1:a1:a1:a1:a1 host_int=vpp1_veth2
Put VXLan Interface node=agent_vpp_1 name=vpp1_vxlan1 src=${MEMIF1_IP} dst=${VXLAN_IP} vni=5
Put Loopback Interface With IP node=agent_vpp_1 name=vpp1_loop1 mac=12:21:21:11:11:11 ip=${LOOPBACK_IP} prefix=${PREFIX}
Put TAP Interface With IP node=agent_vpp_1 name=vpp1_tap1 mac=32:21:21:11:11:11 ip=${TAP_IP} host_if_name=linux_vpp1_tap1 prefix=${PREFIX}
Put TAPv2 Interface With IP node=agent_vpp_1 name=vpp1_tap1 mac=32:21:21:11:11:11 ip=${TAP_IP} host_if_name=linux_vpp1_tap1 prefix=${PREFIX}
Put Memif Interface With IP node=agent_vpp_1 name=vpp1_memif2 mac=62:61:61:61:61:62 master=true id=2 ip=${VXLAN_IP} prefix=${PREFIX}
Put VXLan Interface node=agent_vpp_1 name=vpp1_vxlan2 src=192.168.2.1 dst=192.168.2.2 vni=15
Put Loopback Interface With IP node=agent_vpp_1 name=bvi_vpp1_loop2 mac=12:21:21:11:11:12 ip=20.20.2.1
Expand Down
4 changes: 2 additions & 2 deletions tests/robot/suites/crudIPv6/stn_rule_crudIPv6.robot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Show Interfaces Before Setup

Add TAP1 Interface
vpp_term: Interface Not Exists node=agent_vpp_1 mac=${MAC_TAP1}
Put TAP Interface With IP node=agent_vpp_1 name=${NAME_TAP1} mac=${MAC_TAP1} ip=${IP_TAP1} prefix=${PREFIX} host_if_name=linux_${NAME_TAP1}
Put TAPv2 Interface With IP node=agent_vpp_1 name=${NAME_TAP1} mac=${MAC_TAP1} ip=${IP_TAP1} prefix=${PREFIX} host_if_name=linux_${NAME_TAP1}

Check TAP1 Interface Is Created
${interfaces}= vat_term: Interfaces Dump node=agent_vpp_1
Expand All @@ -62,7 +62,7 @@ Check TAP1 Interface Is Still Configured

Add TAP2 Interface
vpp_term: Interface Not Exists node=agent_vpp_1 mac=${MAC_TAP2}
Put TAP Interface With IP node=agent_vpp_1 name=${NAME_TAP2} mac=${MAC_TAP2} ip=${IP_TAP2} prefix=${PREFIX} host_if_name=linux_${NAME_TAP2}
Put TAPv2 Interface With IP node=agent_vpp_1 name=${NAME_TAP2} mac=${MAC_TAP2} ip=${IP_TAP2} prefix=${PREFIX} host_if_name=linux_${NAME_TAP2}

Check TAP2 Interface Is Created
Wait Until Keyword Succeeds ${WAIT_TIMEOUT} ${SYNC_SLEEP} vpp_term: Interface Is Created node=agent_vpp_1 mac=${MAC_TAP2}
Expand Down
Loading