vpp - Vector Packet Processing

diff options

author	Marco Varlese <marco.varlese@suse.com>	2017-10-06 15:07:08 +0200
committer	Dave Wallace <dwallacelf@gmail.com>	2017-10-09 02:41:01 +0000
commit	c2e63feb6209ef504753fe2c975cf61b1c31b5cf (patch)
tree	3e7d73fd78cd195c8e5d7c43d4c51a1d8707e83e /src
parent	e9aebf9db548b940c77f7c5826a1260d1931e75d (diff)

Allow use of /etc/os-release file

The top-level Makefile in VPP already uses the file /etc/os-release to recognize which OS the build is being performed on. The scripts for vagrant images instead were still using different files for different distros and adding a new distro to be supported causes issues with the extra-logic to deal with it. This patch aligns the vagrant scripts to use the same approach followed by the top-level Makefile and simplifies the steps to identify / update the OS and build / run VPP. Change-Id: I539f4a7c27b3fef70ed1c12b0276049bc47dc289 Signed-off-by: Marco Varlese <marco.varlese@suse.com>

Diffstat (limited to 'src')

-rw-r--r--

src/m4/ax_vpp_find_jdk8.m4

1 files changed, 1 insertions, 1 deletions

#!/usr/bin/env python3 import unittest from framework import VppTestCase, VppTestRunner from vpp_ip_route import VppIpTable from scapy.packet import Raw from scapy.layers.l2 import Ether from scapy.layers.inet import IP, UDP, ICMP from scapy.layers.inet6 import IPv6 from vpp_papi import VppEnum NUM_PKTS = 67 class TestSVS(VppTestCase): """SVS Test Case""" @classmethod def setUpClass(cls): super(TestSVS, cls).setUpClass() @classmethod def tearDownClass(cls): super(TestSVS, cls).tearDownClass() def setUp(self): super(TestSVS, self).setUp() # create 2 pg interfaces self.create_pg_interfaces(range(4)) table_id = 0 for i in self.pg_interfaces: i.admin_up() if table_id != 0: tbl = VppIpTable(self, table_id) tbl.add_vpp_config() tbl = VppIpTable(self, table_id, is_ip6=1) tbl.add_vpp_config() i.set_table_ip4(table_id) i.set_table_ip6(table_id) i.config_ip4() i.resolve_arp() i.config_ip6() i.resolve_ndp() table_id += 1 def tearDown(self): for i in self.pg_interfaces: i.unconfig_ip4() i.unconfig_ip6() i.set_table_ip4(0) i.set_table_ip6(0) i.admin_down() super(TestSVS, self).tearDown() def test_svs4(self): """Source VRF Select IP4""" # # packets destined out of the 3 non-default table interfaces # pkts_0 = [ ( Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IP(src="1.1.1.1", dst=self.pg1.remote_ip4) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ( Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IP(src="2.2.2.2", dst=self.pg2.remote_ip4) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ( Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IP(src="3.3.3.3", dst=self.pg3.remote_ip4) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ] pkts_1 = [ ( Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) / IP(src="1.1.1.1", dst=self.pg1.remote_ip4) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ( Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) / IP(src="2.2.2.2", dst=self.pg2.remote_ip4) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ( Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) / IP(src="3.3.3.3", dst=self.pg3.remote_ip4) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ] # # before adding the SVS config all these packets are dropped when # ingressing on pg0 since pg0 is in the default table # for p in pkts_0: self.send_and_assert_no_replies(self.pg0, p * 1) # # Add table 1001 & 1002 into which we'll add the routes # determining the source VRF selection # table_ids = [101, 102] for table_id in table_ids: self.vapi.svs_table_add_del( is_add=1, af=VppEnum.vl_api_address_family_t.ADDRESS_IP4, table_id=table_id, ) # # map X.0.0.0/8 to each SVS table for lookup in table X # for i in range(1, 4): self.vapi.svs_route_add_del( is_add=1, prefix="%d.0.0.0/8" % i, table_id=table_id, source_table_id=i, ) # # Enable SVS on pg0/pg1 using table 1001/1002 # self.vapi.svs_enable_disable( is_enable=1, af=VppEnum.vl_api_address_family_t.ADDRESS_IP4, table_id=table_ids[0], sw_if_index=self.pg0.sw_if_index, ) self.vapi.svs_enable_disable( is_enable=1, af=VppEnum.vl_api_address_family_t.ADDRESS_IP4, table_id=table_ids[1], sw_if_index=self.pg1.sw_if_index, ) # # now all the packets should be delivered out the respective interface # self.send_and_expect(self.pg0, pkts_0[0] * NUM_PKTS, self.pg1) self.send_and_expect(self.pg0, pkts_0[1] * NUM_PKTS, self.pg2) self.send_and_expect(self.pg0, pkts_0[2] * NUM_PKTS, self.pg3) self.send_and_expect(self.pg1, pkts_1[0] * NUM_PKTS, self.pg1) self.send_and_expect(self.pg1, pkts_1[1] * NUM_PKTS, self.pg2) self.send_and_expect(self.pg1, pkts_1[2] * NUM_PKTS, self.pg3) # # check that if the SVS lookup does not match a route the packet # is forwarded using the interface's routing table # p = ( Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IP(src=self.pg0.remote_ip4, dst=self.pg0.remote_ip4) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ) self.send_and_expect(self.pg0, p * NUM_PKTS, self.pg0) p = ( Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) / IP(src=self.pg1.remote_ip4, dst=self.pg1.remote_ip4) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ) self.send_and_expect(self.pg1, p * NUM_PKTS, self.pg1) # # dump the SVS configs # ss = self.vapi.svs_dump() self.assertEqual(ss[0].table_id, table_ids[0]) self.assertEqual(ss[0].sw_if_index, self.pg0.sw_if_index) self.assertEqual(ss[0].af, VppEnum.vl_api_address_family_t.ADDRESS_IP4) self.assertEqual(ss[1].table_id, table_ids[1]) self.assertEqual(ss[1].sw_if_index, self.pg1.sw_if_index) self.assertEqual(ss[1].af, VppEnum.vl_api_address_family_t.ADDRESS_IP4) # # cleanup # self.vapi.svs_enable_disable( is_enable=0, af=VppEnum.vl_api_address_family_t.ADDRESS_IP4, table_id=table_ids[0], sw_if_index=self.pg0.sw_if_index, ) self.vapi.svs_enable_disable( is_enable=0, af=VppEnum.vl_api_address_family_t.ADDRESS_IP4, table_id=table_ids[1], sw_if_index=self.pg1.sw_if_index, ) for table_id in table_ids: for i in range(1, 4): self.vapi.svs_route_add_del( is_add=0, prefix="%d.0.0.0/8" % i, table_id=table_id, source_table_id=0, ) self.vapi.svs_table_add_del( is_add=0, af=VppEnum.vl_api_address_family_t.ADDRESS_IP4, table_id=table_id, ) def test_svs6(self): """Source VRF Select IP6""" # # packets destined out of the 3 non-default table interfaces # pkts_0 = [ ( Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IPv6(src="2001:1::1", dst=self.pg1.remote_ip6) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ( Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IPv6(src="2001:2::1", dst=self.pg2.remote_ip6) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ( Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IPv6(src="2001:3::1", dst=self.pg3.remote_ip6) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ] pkts_1 = [ ( Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) / IPv6(src="2001:1::1", dst=self.pg1.remote_ip6) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ( Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) / IPv6(src="2001:2::1", dst=self.pg2.remote_ip6) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ( Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) / IPv6(src="2001:3::1", dst=self.pg3.remote_ip6) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ), ] # # before adding the SVS config all these packets are dropped when # ingressing on pg0 since pg0 is in the default table # for p in pkts_0: self.send_and_assert_no_replies(self.pg0, p * 1) # # Add table 1001 & 1002 into which we'll add the routes # determining the source VRF selection # table_ids = [101, 102] for table_id in table_ids: self.vapi.svs_table_add_del( is_add=1, af=VppEnum.vl_api_address_family_t.ADDRESS_IP6, table_id=table_id, ) # # map X.0.0.0/8 to each SVS table for lookup in table X # for i in range(1, 4): self.vapi.svs_route_add_del( is_add=1, prefix="2001:%d::/32" % i, table_id=table_id, source_table_id=i, ) # # Enable SVS on pg0/pg1 using table 1001/1002 # self.vapi.svs_enable_disable( is_enable=1, af=VppEnum.vl_api_address_family_t.ADDRESS_IP6, table_id=table_ids[0], sw_if_index=self.pg0.sw_if_index, ) self.vapi.svs_enable_disable( is_enable=1, af=VppEnum.vl_api_address_family_t.ADDRESS_IP6, table_id=table_ids[1], sw_if_index=self.pg1.sw_if_index, ) # # now all the packets should be delivered out the respective interface # self.send_and_expect(self.pg0, pkts_0[0] * NUM_PKTS, self.pg1) self.send_and_expect(self.pg0, pkts_0[1] * NUM_PKTS, self.pg2) self.send_and_expect(self.pg0, pkts_0[2] * NUM_PKTS, self.pg3) self.send_and_expect(self.pg1, pkts_1[0] * NUM_PKTS, self.pg1) self.send_and_expect(self.pg1, pkts_1[1] * NUM_PKTS, self.pg2) self.send_and_expect(self.pg1, pkts_1[2] * NUM_PKTS, self.pg3) # # check that if the SVS lookup does not match a route the packet # is forwarded using the interface's routing table # p = ( Ether(dst=self.pg0.local_mac, src=self.pg0.remote_mac) / IPv6(src=self.pg0.remote_ip6, dst=self.pg0.remote_ip6) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ) self.send_and_expect(self.pg0, p * NUM_PKTS, self.pg0) p = ( Ether(dst=self.pg1.local_mac, src=self.pg1.remote_mac) / IPv6(src=self.pg1.remote_ip6, dst=self.pg1.remote_ip6) / UDP(sport=1234, dport=1234) / Raw(b"\xa5" * 100) ) self.send_and_expect(self.pg1, p * NUM_PKTS, self.pg1) # # dump the SVS configs # ss = self.vapi.svs_dump() self.assertEqual(ss[0].table_id, table_ids[0]) self.assertEqual(ss[0].sw_if_index, self.pg0.sw_if_index) self.assertEqual(ss[0].af, VppEnum.vl_api_address_family_t.ADDRESS_IP6) self.assertEqual(ss[1].table_id, table_ids[1]) self.assertEqual(ss[1].sw_if_index, self.pg1.sw_if_index) self.assertEqual(ss[1].af, VppEnum.vl_api_address_family_t.ADDRESS_IP6) # # cleanup # self.vapi.svs_enable_disable( is_enable=0, af=VppEnum.vl_api_address_family_t.ADDRESS_IP6, table_id=table_ids[0], sw_if_index=self.pg0.sw_if_index, ) self.vapi.svs_enable_disable( is_enable=0, af=VppEnum.vl_api_address_family_t.ADDRESS_IP6, table_id=table_ids[1], sw_if_index=self.pg1.sw_if_index, ) for table_id in table_ids: for i in range(1, 4): self.vapi.svs_route_add_del( is_add=0, prefix="2001:%d::/32" % i, table_id=table_id, source_table_id=0, ) self.vapi.svs_table_add_del( is_add=0, af=VppEnum.vl_api_address_family_t.ADDRESS_IP6, table_id=table_id, ) if __name__ == "__main__": unittest.main(testRunner=VppTestRunner)


context:
space:
mode: