Skip to content

Add VNET v6 PTF test case; Fix v4 PTF test case to address test hang issue #263

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

Merged
lguohan merged 7 commits into from
Oct 26, 2022
Merged

Add VNET v6 PTF test case; Fix v4 PTF test case to address test hang issue #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
353ab6b
Adding a new testcase to cover vnet-v6 use-case
mhanif Oct 4, 2022
baac47e
Fix PTF test hangup (https://github.com/Azure/DASH/issues/237). Added…
chrispsommers Oct 11, 2022
52fdd7e
Delete trailing ;
chrispsommers Oct 12, 2022
10216a1
Merge pull request #1 from chrispsommers/test-vnet-v6-chris-fix
mhanif Oct 14, 2022
fe356c2
Merge remote-tracking branch 'origin/main' into test-vnet-v6-merge
mhanif Oct 24, 2022
9acd9c0
removed import commands to match changes from PTF: add basic test inf…
mhanif Oct 24, 2022
7169a9e
Merge branch 'main' into test-vnet-v6-merge
mhanif Oct 26, 2022
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
47 changes: 24 additions & 23 deletions dash-pipeline/tests/saithrift/ptf/vnet/test_saithrift_vnet.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ def runTest(self):
send_packet(self, 0, vxlan_pkt)
print("\nVerifying packet...\n", self.pkt_exp.__repr__())
verify_packet(self, self.pkt_exp, 0)
print ("test_sai_thrift_outbound_udp_pkt_test OK")
print ("TestSaiThrift_outbound_udp_pkt OK")
except AssertionError as ae:
self.failure_teardown()
raise ae
Expand Down Expand Up @@ -248,34 +248,35 @@ def failure_teardown(self):
def tearDown(self):

# Delete in reverse order
if self.cleaned_up:
return
status = sai_thrift_remove_outbound_ca_to_pa_entry(self.client, self.ocpe)
assert(status == SAI_STATUS_SUCCESS)
if not self.cleaned_up:
status = sai_thrift_remove_outbound_ca_to_pa_entry(self.client, self.ocpe)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_outbound_routing_entry(self.client, self.ore)
assert(status == SAI_STATUS_SUCCESS)
status = sai_thrift_remove_outbound_routing_entry(self.client, self.ore)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_dash_acl_rule(self.client, self.out_acl_rule_id)
assert(status == SAI_STATUS_SUCCESS)
#status = sai_thrift_remove_dash_acl_rule(self.client, self.out_acl_rule_id)
#assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_eni_ether_address_map_entry(self.client, self.eam)
assert(status == SAI_STATUS_SUCCESS)
status = sai_thrift_remove_eni_ether_address_map_entry(self.client, self.eam)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_eni(self.client, self.eni)
assert(status == SAI_STATUS_SUCCESS)
status = sai_thrift_remove_eni(self.client, self.eni)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_vnet(self.client, self.vnet)
assert(status == SAI_STATUS_SUCCESS)
status = sai_thrift_remove_vnet(self.client, self.vnet)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_dash_acl_group(self.client, self.out_acl_group_id)
assert(status == SAI_STATUS_SUCCESS)
status = sai_thrift_remove_dash_acl_group(self.client, self.out_acl_group_id)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_dash_acl_group(self.client, self.in_acl_group_id)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_dash_acl_group(self.client, self.in_acl_group_id)
assert(status == SAI_STATUS_SUCCESS)
status = sai_thrift_remove_direction_lookup_entry(self.client, self.dle)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_direction_lookup_entry(self.client, self.dle)
assert(status == SAI_STATUS_SUCCESS)
sai_thrift_remove_vip_entry(self.client, self.vpe)
assert(status == SAI_STATUS_SUCCESS)

sai_thrift_remove_vip_entry(self.client, self.vpe)
assert(status == SAI_STATUS_SUCCESS)
super(self.__class__, self).tearDown()
285 changes: 285 additions & 0 deletions dash-pipeline/tests/saithrift/ptf/vnet/test_saithrift_vnet_v6.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,285 @@
from sai_thrift.sai_headers import *
from sai_base_test import *
# TODO - when switch APIs implemented:
# class TestSaiThrift_outbound_udp_pkt(SaiHelper):

class TestSaiThrift_outbound_udpv6_pkt(ThriftInterfaceDataPlane):
""" Test saithrift vnet outbound"""
def setUp(self):
super(TestSaiThrift_outbound_udpv6_pkt, self).setUp()
self.switch_id = 5
self.outbound_vni = 60
self.vnet_vni = 50
self.eni_mac = "00:aa:aa:aa:aa:aa"
self.our_mac = "00:00:06:07:08:09"
self.dst_ca_mac = "00:bb:bb:bb:bb:bb"
self.vip = "172.16.1.200"
self.outbound_vni = 50
self.dst_ca_ip = "2000:aaaa::232"
self.dst_pa_ip = "172.16.1.30"
self.src_vm_pa_ip = "172.16.1.2"
self.cleaned_up = False

try:
vip = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
addr=sai_thrift_ip_addr_t(ip4=self.vip))
self.vpe = sai_thrift_vip_entry_t(switch_id=self.switch_id, vip=vip)

status = sai_thrift_create_vip_entry(self.client, self.vpe,
action=SAI_VIP_ENTRY_ACTION_ACCEPT)
assert(status == SAI_STATUS_SUCCESS)


self.dle = sai_thrift_direction_lookup_entry_t(switch_id=self.switch_id, vni=self.outbound_vni)
status = sai_thrift_create_direction_lookup_entry(self.client, self.dle,
action=SAI_DIRECTION_LOOKUP_ENTRY_ACTION_SET_OUTBOUND_DIRECTION)
assert(status == SAI_STATUS_SUCCESS)

self.in_acl_group_id = sai_thrift_create_dash_acl_group(self.client,
ip_addr_family=SAI_IP_ADDR_FAMILY_IPV6)
assert (self.in_acl_group_id != SAI_NULL_OBJECT_ID)
self.out_acl_group_id = sai_thrift_create_dash_acl_group(self.client,
ip_addr_family=SAI_IP_ADDR_FAMILY_IPV6)
assert (self.out_acl_group_id != SAI_NULL_OBJECT_ID)

self.vnet = sai_thrift_create_vnet(self.client, vni=self.vnet_vni)
assert (self.vnet != SAI_NULL_OBJECT_ID)

vm_underlay_dip = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
addr=sai_thrift_ip_addr_t(ip4=self.src_vm_pa_ip))
self.eni = sai_thrift_create_eni(self.client, cps=10000,
pps=100000, flows=100000,
admin_state=True,
vm_underlay_dip=vm_underlay_dip,
vm_vni=9,
vnet_id=self.vnet,
# TODO: Enable ACL rule
#inbound_v4_stage1_dash_acl_group_id = self.in_acl_group_id,
#inbound_v4_stage2_dash_acl_group_id = self.in_acl_group_id,
#inbound_v4_stage3_dash_acl_group_id = self.in_acl_group_id,
#inbound_v4_stage4_dash_acl_group_id = self.in_acl_group_id,
#inbound_v4_stage5_dash_acl_group_id = self.in_acl_group_id,
#outbound_v4_stage1_dash_acl_group_id = self.out_acl_group_id,
#outbound_v4_stage2_dash_acl_group_id = self.out_acl_group_id,
#outbound_v4_stage3_dash_acl_group_id = self.out_acl_group_id,
#outbound_v4_stage4_dash_acl_group_id = self.out_acl_group_id,
#outbound_v4_stage5_dash_acl_group_id = self.out_acl_group_id,
inbound_v4_stage1_dash_acl_group_id = 0,
inbound_v4_stage2_dash_acl_group_id = 0,
inbound_v4_stage3_dash_acl_group_id = 0,
inbound_v4_stage4_dash_acl_group_id = 0,
inbound_v4_stage5_dash_acl_group_id = 0,
outbound_v4_stage1_dash_acl_group_id = 0,
outbound_v4_stage2_dash_acl_group_id = 0,
outbound_v4_stage3_dash_acl_group_id = 0,
outbound_v4_stage4_dash_acl_group_id = 0,
outbound_v4_stage5_dash_acl_group_id = 0,
inbound_v6_stage1_dash_acl_group_id = 0,
inbound_v6_stage2_dash_acl_group_id = 0,
inbound_v6_stage3_dash_acl_group_id = 0,
inbound_v6_stage4_dash_acl_group_id = 0,
inbound_v6_stage5_dash_acl_group_id = 0,
outbound_v6_stage1_dash_acl_group_id = 0,
outbound_v6_stage2_dash_acl_group_id = 0,
outbound_v6_stage3_dash_acl_group_id = 0,
outbound_v6_stage4_dash_acl_group_id = 0,
outbound_v6_stage5_dash_acl_group_id = 0)

self.eam = sai_thrift_eni_ether_address_map_entry_t(switch_id=self.switch_id, address = self.eni_mac)
status = sai_thrift_create_eni_ether_address_map_entry(self.client,
eni_ether_address_map_entry=self.eam,
eni_id=self.eni)
assert(status == SAI_STATUS_SUCCESS)

dip = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV6,
addr=sai_thrift_ip_addr_t(ip6=self.dst_ca_ip))
# TODO: Enable ACL rule
#self.out_acl_rule_id = sai_thrift_create_dash_acl_rule(self.client, dash_acl_group_id=self.out_acl_group_id,
# dip=dip, priority=10, action=SAI_DASH_ACL_RULE_ACTION_PERMIT)
#assert(status == SAI_STATUS_SUCCESS)

ca_prefix = sai_thrift_ip_prefix_t(addr_family=SAI_IP_ADDR_FAMILY_IPV6,
addr=sai_thrift_ip_addr_t(ip6="2000:aaaa::"),
mask=sai_thrift_ip_addr_t(ip6="ffff:ffff:ffff:ffff:ffff:ffff:ffff:0"))

self.ore = sai_thrift_outbound_routing_entry_t(switch_id=self.switch_id, eni_id=self.eni, destination=ca_prefix)
status = sai_thrift_create_outbound_routing_entry(self.client, self.ore, action=SAI_OUTBOUND_ROUTING_ENTRY_ACTION_ROUTE_VNET, dst_vnet_id = self.vnet)
print ("status returned is ", status)
assert(status == SAI_STATUS_SUCCESS)

underlay_dip = sai_thrift_ip_address_t(addr_family=SAI_IP_ADDR_FAMILY_IPV4,
addr=sai_thrift_ip_addr_t(ip4=self.dst_pa_ip))
self.ocpe = sai_thrift_outbound_ca_to_pa_entry_t(switch_id=self.switch_id, dst_vnet_id=self.vnet, dip=dip)
status = sai_thrift_create_outbound_ca_to_pa_entry(self.client, self.ocpe, underlay_dip = underlay_dip, overlay_dmac=self.dst_ca_mac, use_dst_vnet_vni = True)
assert(status == SAI_STATUS_SUCCESS)

except AssertionError as ae:
self.failure_teardown()
raise ae

def runTest(self):
try:
src_vm_ip = "2000:aaaa::10a"
outer_smac = "00:00:03:06:06:06"
inner_smac = "00:00:02:06:06:06"

# check VIP drop
wrong_vip = "172.16.100.100"
inner_pkt = simple_udpv6_packet(eth_dst="02:02:02:02:02:02",
eth_src=self.eni_mac,
ipv6_dst=self.dst_ca_ip,
ipv6_src=src_vm_ip)
vxlan_pkt = simple_vxlan_packet(eth_dst=self.our_mac,
eth_src=outer_smac,
ip_dst=wrong_vip,
ip_src=self.src_vm_pa_ip,
udp_sport=11638,
with_udp_chksum=False,
vxlan_vni=self.outbound_vni,
inner_frame=inner_pkt)
print("\n\nSending packet with wrong vip...\n\n", vxlan_pkt.__repr__())
send_packet(self, 0, vxlan_pkt)
print("\nVerifying drop...")
verify_no_other_packets(self)

# check routing drop
wrong_dst_ca = "2000:bbbb::232"
inner_pkt = simple_udpv6_packet(eth_dst="02:02:02:02:02:02",
eth_src=self.eni_mac,
ipv6_dst=wrong_dst_ca,
ipv6_src=src_vm_ip)
vxlan_pkt = simple_vxlan_packet(eth_dst=self.our_mac,
eth_src=outer_smac,
ip_dst=self.vip,
ip_src=self.src_vm_pa_ip,
udp_sport=11638,
with_udp_chksum=False,
vxlan_vni=self.outbound_vni,
inner_frame=inner_pkt)
print("\nSending packet with wrong dst CA IP to verify routing drop...\n\n", vxlan_pkt.__repr__())
send_packet(self, 0, vxlan_pkt)
print("\nVerifying drop...")
verify_no_other_packets(self)

# check mapping drop
wrong_dst_ca = "2000:aaaa::d3d3"
inner_pkt = simple_udpv6_packet(eth_dst="02:02:02:02:02:02",
eth_src=self.eni_mac,
ipv6_dst=wrong_dst_ca,
ipv6_src=src_vm_ip)
vxlan_pkt = simple_vxlan_packet(eth_dst=self.our_mac,
eth_src=outer_smac,
ip_dst=self.vip,
ip_src=self.src_vm_pa_ip,
udp_sport=11638,
with_udp_chksum=False,
vxlan_vni=self.outbound_vni,
inner_frame=inner_pkt)
print("\nSending packet with wrong dst CA IP to verify mapping drop...\n\n", vxlan_pkt.__repr__())
send_packet(self, 0, vxlan_pkt)
print("\nVerifying drop...")
verify_no_other_packets(self)

# check forwarding
inner_pkt = simple_udpv6_packet(eth_dst="02:02:02:02:02:02",
eth_src=self.eni_mac,
ipv6_dst=self.dst_ca_ip,
ipv6_src=src_vm_ip)
vxlan_pkt = simple_vxlan_packet(eth_dst=self.our_mac,
eth_src=outer_smac,
ip_dst=self.vip,
ip_src=self.src_vm_pa_ip,
udp_sport=11638,
with_udp_chksum=False,
vxlan_vni=self.outbound_vni,
inner_frame=inner_pkt)

inner_exp_pkt = simple_udpv6_packet(eth_dst=self.dst_ca_mac,
eth_src=self.eni_mac,
ipv6_dst=self.dst_ca_ip,
ipv6_src=src_vm_ip)
vxlan_exp_pkt = simple_vxlan_packet(eth_dst="00:00:00:00:00:00",
eth_src="00:00:00:00:00:00",
ip_dst=self.dst_pa_ip,
ip_src=self.vip,
udp_sport=0, # TODO: Fix sport in pipeline
with_udp_chksum=False,
vxlan_vni=self.vnet_vni,
inner_frame=inner_exp_pkt)
# TODO: Fix IP chksum
vxlan_exp_pkt[IP].chksum = 0
# TODO: Fix UDP length
vxlan_exp_pkt[IP][UDP][VXLAN].flags = 0

self.pkt_exp = vxlan_exp_pkt
print("\nSending outbound packet...\n\n", vxlan_pkt.__repr__())
send_packet(self, 0, vxlan_pkt)
print("\nVerifying packet...\n", self.pkt_exp.__repr__())
verify_packet(self, self.pkt_exp, 0)
print ("TestSaiThrift_outbound_udpv6_pkt OK")
except AssertionError as ae:
self.failure_teardown()
raise ae

def failure_teardown(self):
# Delete entries which might be lingering from previous failures etc.; ignore failures here
if hasattr(self, "ocpe"):
status = sai_thrift_remove_outbound_ca_to_pa_entry(self.client, self.ocpe)
if hasattr(self, "ore"):
status = sai_thrift_remove_outbound_routing_entry(self.client, self.ore)
#if hasattr(self, "out_acl_rule_id"):
# sai_thrift_remove_dash_acl_rule(self.client, self.out_acl_rule_id)
if hasattr(self, "e2v"):
sai_thrift_remove_outbound_eni_to_vni_entry(self.client, self.e2v)
if hasattr(self, "eam"):
sai_thrift_remove_eni_ether_address_map_entry(self.client, self.eam)
if hasattr(self, "eni"):
sai_thrift_remove_eni(self.client, self.eni)
if hasattr(self, "vnet"):
sai_thrift_remove_vnet(self.client, self.vnet)
assert(status == SAI_STATUS_SUCCESS)
if hasattr(self, "out_acl_group_id") and self.out_acl_group_id != SAI_NULL_OBJECT_ID:
sai_thrift_remove_dash_acl_group(self.client, self.out_acl_group_id)
if hasattr(self, "in_acl_group_id") and self.in_acl_group_id != SAI_NULL_OBJECT_ID:
sai_thrift_remove_dash_acl_group(self.client, self.in_acl_group_id)
if hasattr(self, "dle"):
sai_thrift_remove_direction_lookup_entry(self.client, self.dle)
if hasattr(self, "vpe"):
sai_thrift_remove_vip_entry(self.client, self.vpe)
self.cleaned_up = True

def tearDown(self):

# Delete in reverse order
if not self.cleaned_up:
status = sai_thrift_remove_outbound_ca_to_pa_entry(self.client, self.ocpe)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_outbound_routing_entry(self.client, self.ore)
assert(status == SAI_STATUS_SUCCESS)

#status = sai_thrift_remove_dash_acl_rule(self.client, self.out_acl_rule_id)
#assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_eni_ether_address_map_entry(self.client, self.eam)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_eni(self.client, self.eni)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_vnet(self.client, self.vnet)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_dash_acl_group(self.client, self.out_acl_group_id)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_dash_acl_group(self.client, self.in_acl_group_id)
assert(status == SAI_STATUS_SUCCESS)

status = sai_thrift_remove_direction_lookup_entry(self.client, self.dle)
assert(status == SAI_STATUS_SUCCESS)

sai_thrift_remove_vip_entry(self.client, self.vpe)
assert(status == SAI_STATUS_SUCCESS)

super(self.__class__, self).tearDown()