Merge "Add QoS bandwidth limit for instance ingress traffic"
diff --git a/neutron/tests/tempest/api/test_extension_driver_port_security.py b/neutron/tests/tempest/api/test_extension_driver_port_security.py
index 8e3ec07..381252a 100644
--- a/neutron/tests/tempest/api/test_extension_driver_port_security.py
+++ b/neutron/tests/tempest/api/test_extension_driver_port_security.py
@@ -76,7 +76,7 @@
network = self.create_network()
self.create_subnet(network)
- sec_group_body, sec_group_name = self._create_security_group()
+ sec_group_body, _ = self._create_security_group()
port = self.create_port(network)
# Exception when set port-sec to False with sec-group defined
diff --git a/neutron/tests/tempest/scenario/test_trunk.py b/neutron/tests/tempest/scenario/test_trunk.py
index d5ffd45..112c17b 100644
--- a/neutron/tests/tempest/scenario/test_trunk.py
+++ b/neutron/tests/tempest/scenario/test_trunk.py
@@ -29,9 +29,10 @@
CONF = config.CONF
CONFIGURE_VLAN_INTERFACE_COMMANDS = (
- 'IFACE=$(ip l | grep "^[0-9]*: e" | cut -d \: -f 2) && '
+ 'IFACE=$(PATH=$PATH:/usr/sbin ip l | grep "^[0-9]*: e" |'
+ 'cut -d \: -f 2) && '
'sudo su -c '
- '"ip l a link $IFACE name $IFACE.%(tag)d type vlan id %(tag)d && '
+ '"ip l a link $IFACE name $IFACE.%(tag)d type vlan id %(tag)d &&'
'ip l s up dev $IFACE.%(tag)d && '
'dhclient $IFACE.%(tag)d"')
@@ -227,7 +228,7 @@
vlan_network = self.create_network()
new_subnet_cidr = get_next_subnet(
config.safe_get_config_value('network', 'project_network_cidr'))
- self.create_subnet(vlan_network, cidr=new_subnet_cidr)
+ self.create_subnet(vlan_network, gateway=None, cidr=new_subnet_cidr)
servers = [
self._create_server_with_port_and_subport(vlan_network, vlan_tag)