D52761.1775473977.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D52761.1775473977.diff
View Options

	diff --git a/tests/atf_python/sys/net/vnet.py b/tests/atf_python/sys/net/vnet.py
	--- a/tests/atf_python/sys/net/vnet.py
	+++ b/tests/atf_python/sys/net/vnet.py
	@@ -283,14 +283,15 @@
	time.sleep(0.1)
	return not_matched

	- def create_vnet(self, vnet_alias: str, ifaces: List[VnetInterface]):
	+ def create_vnet(self, vnet_alias: str, ifaces: List[VnetInterface], opts: List[str]):
	vnet_name = "pytest:{}".format(convert_test_name(self.topology_id))
	if self._vnets:
	# add number to distinguish jails
	vnet_name = "{}_{}".format(vnet_name, len(self._vnets) + 1)
	iface_cmds = " ".join(["vnet.interface={}".format(i.name) for i in ifaces])
	- cmd = "/usr/sbin/jail -i -c name={} persist vnet {}".format(
	- vnet_name, iface_cmds
	+ opt_cmds = " ".join(["{}".format(i) for i in opts])
	+ cmd = "/usr/sbin/jail -i -c name={} persist vnet {} {}".format(
	+ vnet_name, iface_cmds, opt_cmds
	)
	jid = 0
	try:
	@@ -421,7 +422,10 @@
	idx = len(iface_map[iface_alias].vnet_aliases)
	iface_map[iface_alias].vnet_aliases.append(obj_name)
	vnet_ifaces.append(iface_map[iface_alias].ifaces[idx])
	- vnet = vnet_factory.create_vnet(obj_name, vnet_ifaces)
	+ opts = []
	+ if "opts" in obj_data:
	+ opts = obj_data["opts"]
	+ vnet = vnet_factory.create_vnet(obj_name, vnet_ifaces, opts)
	vnet_map[obj_name] = vnet
	# Allow reference to VNETs as attributes
	setattr(self, obj_name, vnet)