Change the quantum-ns-metadata-proxy log file name.

Add a '-' before the router_id/network_id for easier parsing
when starting the ns metadata proxy.

Fixes bug 1161124

Change-Id: I408111d1343ecac297f6277e8067d3fa34bb8cb7

diff --git a/quantum/agent/dhcp_agent.py b/quantum/agent/dhcp_agent.py
index 3ebcbcaf717d3b1256c3e1e1c0a2c9b70a3b0f15..3993b56ce6a54ddab71eba73dc21c3a224426573 100644 (file)
--- a/quantum/agent/dhcp_agent.py
+++ b/quantum/agent/dhcp_agent.py
@@ -318,7 +318,7 @@ class DhcpAgent(manager.Manager):
                          '--state_path=%s' % self.conf.state_path,
                          '--metadata_port=%d' % METADATA_PORT]
             proxy_cmd.extend(config.get_log_args(
-                cfg.CONF, 'quantum-ns-metadata-proxy%s.log' % network.id))
+                cfg.CONF, 'quantum-ns-metadata-proxy-%s.log' % network.id))
             return proxy_cmd
 
         pm = external_process.ProcessManager(

diff --git a/quantum/agent/l3_agent.py b/quantum/agent/l3_agent.py
index cda37203ababcd20c043e7e70d425df11248a16d..a7daa7232b75e67d0d117e25fa9dd74de99adacd 100644 (file)
--- a/quantum/agent/l3_agent.py
+++ b/quantum/agent/l3_agent.py
@@ -260,7 +260,7 @@ class L3NATAgent(manager.Manager):
                          '--router_id=%s' % router_info.router_id,
                          '--state_path=%s' % self.conf.state_path]
             proxy_cmd.extend(config.get_log_args(
-                cfg.CONF, 'quantum-ns-metadata-proxy%s.log' %
+                cfg.CONF, 'quantum-ns-metadata-proxy-%s.log' %
                 router_info.router_id))
             return proxy_cmd
 

diff --git a/quantum/tests/unit/test_dhcp_agent.py b/quantum/tests/unit/test_dhcp_agent.py
index d051dedc42c4493b22f991af937ad9eb3a73d39e..7dd2123af80473117ae9a2418fd65b5034e3633e 100644 (file)
--- a/quantum/tests/unit/test_dhcp_agent.py
+++ b/quantum/tests/unit/test_dhcp_agent.py
@@ -575,7 +575,7 @@ class TestDhcpAgentEventHandler(base.BaseTestCase):
                         mock.ANY,
                         mock.ANY,
                         '--debug',
-                        ('--log-file=quantum-ns-metadata-proxy%s.log' %
+                        ('--log-file=quantum-ns-metadata-proxy-%s.log' %
                          fake_meta_network.id)])
                 ])
         finally: