Merge "Retrieve fresh network DB data before getting it in ml2"
diff --git a/neutron/tests/tempest/scenario/test_dvr.py b/neutron/tests/tempest/scenario/test_dvr.py
index 727bb5c..3c62f3a 100644
--- a/neutron/tests/tempest/scenario/test_dvr.py
+++ b/neutron/tests/tempest/scenario/test_dvr.py
@@ -58,7 +58,8 @@
The test is done by putting the SNAT port down on controller node.
"""
router = self.create_router_by_client(
- distributed=True, tenant_id=self.client.tenant_id, is_admin=True)
+ distributed=True, tenant_id=self.client.tenant_id, is_admin=True,
+ ha=False)
self.setup_network_and_server(router=router)
self._check_snat_port_connectivity()
@@ -68,7 +69,8 @@
"""
# Created a centralized router on a DVR setup
router = self.create_router_by_client(
- distributed=False, tenant_id=self.client.tenant_id, is_admin=True)
+ distributed=False, tenant_id=self.client.tenant_id, is_admin=True,
+ ha=False)
self.setup_network_and_server(router=router)
self._check_connectivity()
diff --git a/neutron/tests/tempest/scenario/test_trunk.py b/neutron/tests/tempest/scenario/test_trunk.py
index 54399aa..d5ffd45 100644
--- a/neutron/tests/tempest/scenario/test_trunk.py
+++ b/neutron/tests/tempest/scenario/test_trunk.py
@@ -13,6 +13,7 @@
# under the License.
import netaddr
+from oslo_log import log as logging
from tempest.common import waiters
from tempest.lib.common import ssh
from tempest.lib.common.utils import data_utils
@@ -24,6 +25,7 @@
from neutron.tests.tempest.scenario import base
from neutron.tests.tempest.scenario import constants
+LOG = logging.getLogger(__name__)
CONF = config.CONF
CONFIGURE_VLAN_INTERFACE_COMMANDS = (
@@ -236,6 +238,8 @@
# Configure VLAN interfaces on server
command = CONFIGURE_VLAN_INTERFACE_COMMANDS % {'tag': vlan_tag}
server['ssh_client'].exec_command(command)
+ out = server['ssh_client'].exec_command('ip addr list')
+ LOG.debug("Interfaces on server %s: %s", server, out)
# Ping from server1 to server2 via VLAN interface should fail because
# we haven't allowed ICMP