arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #338 from openstack-charmers/lourot/arista-setup-race-condition

Browse Source 
Wait for neutron to be connected to Arista before querying it
This commit is contained in:
Frode Nordahl
2020-07-02 11:29:25 +02:00
committed by GitHub
parent 73d729474e 1e682e9480
commit 5040bdf32d
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zaza/openstack/charm_tests/neutron_arista/setup.py
View File

@@ -61,13 +61,16 @@ def test_fixture():
"""Pass arista-virt-test-fixture's IP address to Neutron."""
fixture_ip_addr = arista_utils.fixture_ip_addr()
logging.info(
"{}'s IP address is '{}'. Passing it to neutron-api-plugin-arista..."
.format(arista_utils.FIXTURE_APP_NAME, fixture_ip_addr))
zaza.model.set_application_config('neutron-api-plugin-arista',
"{}'s IP address is '{}'. Passing it to {}..."
.format(arista_utils.FIXTURE_APP_NAME, fixture_ip_addr,
arista_utils.PLUGIN_APP_NAME))
zaza.model.set_application_config(arista_utils.PLUGIN_APP_NAME,
{'eapi-host': fixture_ip_addr})
logging.info('Waiting for {} to become ready...'.format(
arista_utils.FIXTURE_APP_NAME))
arista_utils.PLUGIN_APP_NAME))
zaza.model.wait_for_agent_status()
zaza.model.wait_for_application_states()
for attempt in tenacity.Retrying(
wait=tenacity.wait_fixed(10), # seconds
stop=tenacity.stop_after_attempt(30),

3
zaza/openstack/charm_tests/neutron_arista/utils.py
View File

@@ -20,6 +20,7 @@ import urllib3
import zaza
FIXTURE_APP_NAME = 'arista-virt-test-fixture'
PLUGIN_APP_NAME = 'neutron-api-plugin-arista'
def fixture_ip_addr():
@@ -42,7 +43,7 @@ def query_fixture_networks(ip_addr):
session.auth = (_FIXTURE_LOGIN, _FIXTURE_PASSWORD)
data = {
'id': 'Zaza neutron-api-plugin-arista tests',
'id': 'Zaza {} tests'.format(PLUGIN_APP_NAME),
'method': 'runCmds',
'jsonrpc': '2.0',
'params': {