From 1e682e94801927ed05f3a8074a33b2c8a8c5cc1b Mon Sep 17 00:00:00 2001
From: Aurelien Lourot <aurelien.lourot@canonical.com>
Date: Wed, 1 Jul 2020 11:07:49 +0200
Subject: [PATCH] Fix application name in trace

---
 zaza/openstack/charm_tests/neutron_arista/setup.py | 9 +++++----
 zaza/openstack/charm_tests/neutron_arista/utils.py | 3 ++-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/zaza/openstack/charm_tests/neutron_arista/setup.py b/zaza/openstack/charm_tests/neutron_arista/setup.py
index 286a23e..4e35d33 100644
--- a/zaza/openstack/charm_tests/neutron_arista/setup.py
+++ b/zaza/openstack/charm_tests/neutron_arista/setup.py
@@ -61,13 +61,14 @@ 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(
diff --git a/zaza/openstack/charm_tests/neutron_arista/utils.py b/zaza/openstack/charm_tests/neutron_arista/utils.py
index bc86e4b..6fb77b3 100644
--- a/zaza/openstack/charm_tests/neutron_arista/utils.py
+++ b/zaza/openstack/charm_tests/neutron_arista/utils.py
@@ -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': {