Merge "Add ndp proxy API tests"
diff --git a/neutron_tempest_plugin/common/ip.py b/neutron_tempest_plugin/common/ip.py
index 9fe49db..e2f6a4a 100644
--- a/neutron_tempest_plugin/common/ip.py
+++ b/neutron_tempest_plugin/common/ip.py
@@ -57,7 +57,7 @@
return shell.execute(command_line, ssh_client=self.ssh_client,
timeout=self.timeout).stdout
- def configure_vlan(self, addresses, port, vlan_tag, subport_ips):
+ def configure_vlan(self, addresses, port, vlan_tag, subport_ips, mac=None):
port_device = get_port_device_name(addresses=addresses, port=port)
subport_device = '{!s}.{!s}'.format(port_device, vlan_tag)
LOG.debug('Configuring VLAN subport interface %r on top of interface '
@@ -66,6 +66,8 @@
self.add_link(link=port_device, name=subport_device, link_type='vlan',
segmentation_id=vlan_tag)
+ if mac:
+ self.set_link_address(address=mac, device=subport_device)
self.set_link(device=subport_device, state='up')
for subport_ip in subport_ips:
self.add_address(address=subport_ip, device=subport_device)
@@ -91,7 +93,8 @@
"Unable to get IP address and subnet prefix lengths for "
"subport")
- return self.configure_vlan(addresses, port, vlan_tag, subport_ips)
+ return self.configure_vlan(addresses, port, vlan_tag, subport_ips,
+ subport['mac_address'])
def configure_vlan_transparent(self, port, vlan_tag, ip_addresses):
addresses = self.list_addresses()
@@ -133,6 +136,10 @@
command += ['id', segmentation_id]
return self.execute('link', *command)
+ def set_link_address(self, address, device):
+ command = ['set', 'address', address, 'dev', device]
+ return self.execute('link', *command)
+
def set_link(self, device, state=None):
command = ['set', 'dev', device]
if state:
diff --git a/zuul.d/master_jobs.yaml b/zuul.d/master_jobs.yaml
index 576969a..2d6787f 100644
--- a/zuul.d/master_jobs.yaml
+++ b/zuul.d/master_jobs.yaml
@@ -221,6 +221,7 @@
parent: neutron-tempest-plugin-base-nested-switch
timeout: 10000
vars:
+ configure_swap_size: 2048
devstack_services:
# Disable OVN services
br-ex-tcpdump: false
@@ -313,6 +314,7 @@
parent: neutron-tempest-plugin-base-nested-switch
timeout: 10000
vars:
+ configure_swap_size: 2048
devstack_services:
# Disable OVN services
br-ex-tcpdump: false
@@ -452,6 +454,7 @@
- zuul: openstack/neutron
pre-run: playbooks/linuxbridge-scenario-pre-run.yaml
vars:
+ configure_swap_size: 2048
devstack_services:
# Disable OVN services
br-ex-tcpdump: false