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

[ VRF ] Returned t0 configuration for run vrf cases #2580

Merged
merged 3 commits into from
Nov 30, 2020
Merged

[ VRF ] Returned t0 configuration for run vrf cases #2580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7008276
Returned t0 configuration for run vrf cases
Nov 24, 2020
511e16f
Removed all hardcoded values from fib plugin.
Nov 26, 2020
e239ac8
Updated generate_routes method, removed hardcoded values for decap case.
Nov 29, 2020
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
5 changes: 5 additions & 0 deletions ansible/vars/topo_t0-116.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,11 @@ configuration_properties:
dut_asn: 4200065100
dut_type: ToRRouter
swrole: leaf
podset_number: 200
tor_number: 16
tor_subnet_number: 2
max_tor_subnet_number: 16
tor_subnet_size: 128
spine_asn: 65534
leaf_asn_start: 4200064600
tor_asn_start: 4200065500
Expand Down
9 changes: 9 additions & 0 deletions ansible/vars/topo_t0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ configuration_properties:
swrole: leaf
nhipv4: 10.10.246.254
nhipv6: FC0A::FF
podset_number: 200
tor_number: 16
tor_subnet_number: 2
max_tor_subnet_number: 16
tor_subnet_size: 128
spine_asn: 65534
leaf_asn_start: 64600
tor_asn_start: 65500
failure_rate: 0

configuration:
ARISTA01T1:
Expand Down
5 changes: 5 additions & 0 deletions ansible/vars/topo_t1-64-lag-clet.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,11 @@ configuration_properties:
dut_type: LeafRouter
nhipv4: 10.10.246.100
nhipv6: FC0A::C9
podset_number: 200
tor_number: 16
tor_subnet_number: 2
max_tor_subnet_number: 16
tor_subnet_size: 128
spine:
swrole: spine
podset_number: 200
Expand Down
5 changes: 5 additions & 0 deletions ansible/vars/topo_t1-64-lag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,11 @@ configuration_properties:
dut_type: LeafRouter
nhipv4: 10.10.246.254
nhipv6: FC0A::FF
podset_number: 200
tor_number: 16
tor_subnet_number: 2
max_tor_subnet_number: 16
tor_subnet_size: 128
spine:
swrole: spine
tor:
Expand Down
5 changes: 5 additions & 0 deletions ansible/vars/topo_t1-64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,11 @@ configuration_properties:
dut_type: LeafRouter
nhipv4: 10.10.246.254
nhipv6: FC0A::FF
podset_number: 200
tor_number: 16
tor_subnet_number: 2
max_tor_subnet_number: 16
tor_subnet_size: 128
spine:
swrole: spine
tor:
Expand Down
5 changes: 5 additions & 0 deletions ansible/vars/topo_t1-lag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ configuration_properties:
dut_type: LeafRouter
nhipv4: 10.10.246.254
nhipv6: FC0A::FF
podset_number: 200
tor_number: 16
tor_subnet_number: 2
max_tor_subnet_number: 16
tor_subnet_size: 128
spine:
swrole: spine
tor:
Expand Down
5 changes: 5 additions & 0 deletions ansible/vars/topo_t1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,11 @@ configuration_properties:
dut_type: LeafRouter
nhipv4: 10.10.246.254
nhipv6: FC0A::FF
podset_number: 200
tor_number: 16
tor_subnet_number: 2
max_tor_subnet_number: 16
tor_subnet_size: 128
spine:
swrole: spine
tor:
Expand Down
47 changes: 28 additions & 19 deletions tests/common/plugins/fib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def announce_routes(ptfip, port, routes):
def generate_routes(family, podset_number, tor_number, tor_subnet_number,
spine_asn, leaf_asn_start, tor_asn_start,
nexthop, nexthop_v6,
tor_subnet_size = 128, max_tor_subnet_number = 16,
tor_subnet_size, max_tor_subnet_number,
router_type = "leaf", tor_index=None):
routes = []

Expand Down Expand Up @@ -99,20 +99,23 @@ def generate_routes(family, podset_number, tor_number, tor_subnet_number,
def fib_t0(ptfhost, tbinfo, localhost, topology=None):
logger.info("use fib_t0 to setup routes for topo {}".format(tbinfo['topo']['name']))

podset_number = 200
tor_number = 16
tor_subnet_number = 2

common_config_topo = tbinfo['topo']['properties']['configuration_properties']['common']
podset_number = common_config_topo.get("podset_number", 200)
tor_number = common_config_topo.get("tor_number", 16)
tor_subnet_number = common_config_topo.get("tor_subnet_number", 2)
max_tor_subnet_number = common_config_topo.get("max_tor_subnet_number", 16)
tor_subnet_size = common_config_topo.get("tor_subnet_size", 128)
nhipv4 = common_config_topo.get("nhipv4", "10.10.246.254")
nhipv6 = common_config_topo.get("nhipv6", "fc0a::ff")
spine_asn = common_config_topo.get("spine_asn", 65534)
leaf_asn_start = common_config_topo.get("leaf_asn_start", 64600)
tor_asn_start = common_config_topo.get("tor_asn_start", 65500)

ptf_hostname = tbinfo['ptf']
ptfip = ptfhost.host.options['inventory_manager'].get_host(ptf_hostname).vars['ansible_host']

local_ip = ipaddress.IPAddress("10.10.246.254")
local_ipv6 = ipaddress.IPAddress("fc0a::ff")
local_ip = ipaddress.IPAddress(nhipv4)
local_ipv6 = ipaddress.IPAddress(nhipv6)
for k, v in tbinfo['topo']['properties']['configuration'].items():
vm_offset = tbinfo['topo']['properties']['topology']['VMs'][k]['vm_offset']
peer_ip = ipaddress.IPNetwork(v['bp_interface']['ipv4'])
Expand Down Expand Up @@ -155,10 +158,10 @@ def fib_t0(ptfhost, tbinfo, localhost, topology=None):

routes_v4 = generate_routes("v4", podset_number, tor_number, tor_subnet_number,
spine_asn, leaf_asn_start, tor_asn_start,
local_ip, local_ipv6)
local_ip, local_ipv6, tor_subnet_size, max_tor_subnet_number)
routes_v6 = generate_routes("v6", podset_number, tor_number, tor_subnet_number,
spine_asn, leaf_asn_start, tor_asn_start,
local_ip, local_ipv6)
local_ip, local_ipv6, tor_subnet_size, max_tor_subnet_number)

announce_routes(ptfip, port, routes_v4)
announce_routes(ptfip, port6, routes_v6)
Expand All @@ -167,18 +170,22 @@ def fib_t0(ptfhost, tbinfo, localhost, topology=None):
def fib_t1_lag(ptfhost, tbinfo, localhost):
logger.info("use fib_t1_lag to setup routes for topo {}".format(tbinfo['topo']['name']))

podset_number = 200
tor_number = 16
tor_subnet_number = 2

leaf_asn_start = 64600
tor_asn_start = 65500
common_config_topo = tbinfo['topo']['properties']['configuration_properties']['common']
podset_number = common_config_topo.get("podset_number", 200)
tor_number = common_config_topo.get("tor_number", 16)
tor_subnet_number = common_config_topo.get("tor_subnet_number", 2)
max_tor_subnet_number = common_config_topo.get("max_tor_subnet_number", 16)
tor_subnet_size = common_config_topo.get("tor_subnet_size", 128)
nhipv4 = common_config_topo.get("nhipv4", "10.10.246.254")
nhipv6 = common_config_topo.get("nhipv6", "fc0a::ff")
leaf_asn_start = common_config_topo.get("leaf_asn_start", 64600)
tor_asn_start = common_config_topo.get("tor_asn_start", 65500)

ptf_hostname = tbinfo['ptf']
ptfip = ptfhost.host.options['inventory_manager'].get_host(ptf_hostname).vars['ansible_host']

local_ip = ipaddress.IPAddress("10.10.246.254")
local_ipv6 = ipaddress.IPAddress("fc0a::ff")
local_ip = ipaddress.IPAddress(nhipv4)
local_ipv6 = ipaddress.IPAddress(nhipv6)

for k, v in tbinfo['topo']['properties']['configuration'].items():
vm_offset = tbinfo['topo']['properties']['topology']['VMs'][k]['vm_offset']
Expand Down Expand Up @@ -231,10 +238,12 @@ def fib_t1_lag(ptfhost, tbinfo, localhost):
if router_type:
routes_v4 = generate_routes("v4", podset_number, tor_number, tor_subnet_number,
None, leaf_asn_start, tor_asn_start,
local_ip, local_ipv6, router_type=router_type, tor_index=tor_index)
local_ip, local_ipv6, tor_subnet_size, max_tor_subnet_number,
router_type=router_type, tor_index=tor_index)
routes_v6 = generate_routes("v6", podset_number, tor_number, tor_subnet_number,
None, leaf_asn_start, tor_asn_start,
local_ip, local_ipv6, router_type=router_type, tor_index=tor_index)
local_ip, local_ipv6, tor_subnet_size, max_tor_subnet_number,
router_type=router_type, tor_index=tor_index)
announce_routes(ptfip, port, routes_v4)
announce_routes(ptfip, port6, routes_v6)

Expand Down
30 changes: 15 additions & 15 deletions tests/decap/test_decap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,28 +64,28 @@ def gen_fib_info(ptfhost, tbinfo, cfg_facts):
downlink_ports_str = " ".join(get_downlink_ports(topology, topo_type))

fibs = []

common_config_topo = tbinfo['topo']['properties']['configuration_properties']['common']
podset_number = 5 # Limit the number of podsets to limit test execution time
tor_number = 16
tor_subnet_number = 2
tor_number = common_config_topo.get("tor_number", 16)
tor_subnet_number = common_config_topo.get("tor_subnet_number", 2)
max_tor_subnet_number = common_config_topo.get("max_tor_subnet_number", 16)
tor_subnet_size = common_config_topo.get("tor_subnet_size", 128)

# routes to uplink
routes_uplink_v4 = []
routes_uplink_v6 = []
if topo_type == "t0":
routes_uplink_v4 = generate_routes("v4", podset_number, tor_number, tor_subnet_number,
0, 0, 0,
"", "")
0, 0, 0, "", "", tor_subnet_size, max_tor_subnet_number)
routes_uplink_v6 = generate_routes("v6", podset_number, tor_number, tor_subnet_number,
0, 0, 0,
"", "")
0, 0, 0, "", "", tor_subnet_size, max_tor_subnet_number)
elif topo_type == "t1":
routes_uplink_v4 = generate_routes("v4", podset_number, tor_number, tor_subnet_number,
0, 0, 0,
"", "", router_type="spine")
0, 0, 0, "", "", tor_subnet_size, max_tor_subnet_number,
router_type="spine")
routes_uplink_v6 = generate_routes("v6", podset_number, tor_number, tor_subnet_number,
0, 0, 0,
"", "", router_type="spine")
0, 0, 0, "", "", tor_subnet_size, max_tor_subnet_number,
router_type="spine")

for prefix, _, _ in routes_uplink_v4:
fibs.append("{} {}".format(prefix, uplink_ports_str))
Expand All @@ -97,12 +97,12 @@ def gen_fib_info(ptfhost, tbinfo, cfg_facts):
if topo_type == "t1":
for tor_index in range(tor_number):
routes_downlink_v4.extend(generate_routes("v4", podset_number, tor_number, tor_subnet_number,
0, 0, 0,
"", "", router_type="tor", tor_index=tor_index))
0, 0, 0, "", "", tor_subnet_size, max_tor_subnet_number,
router_type="tor", tor_index=tor_index))

routes_downlink_v6.extend(generate_routes("v6", podset_number, tor_number, tor_subnet_number,
0, 0, 0,
"", "", router_type="tor", tor_index=tor_index))
0, 0, 0, "", "", tor_subnet_size, max_tor_subnet_number,
router_type="tor", tor_index=tor_index))

for prefix, _, _ in routes_downlink_v4:
fibs.append("{} {}".format(prefix, downlink_ports_str))
Expand Down