From dbb8769b7fc3dd525660d76fa6b3768c9d606313 Mon Sep 17 00:00:00 2001 From: Ofer Ben-Yacov Date: Tue, 10 Jan 2017 14:31:02 +0200 Subject: [PATCH] Change WANQOS to WANTC --- wan_qos/agent/tc_agent.py | 4 ++-- wan_qos/agent/tc_manager.py | 8 ++++---- wan_qos/tests/unit/test_tc_agent.py | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/wan_qos/agent/tc_agent.py b/wan_qos/agent/tc_agent.py index 7d59402..31dbfc0 100644 --- a/wan_qos/agent/tc_agent.py +++ b/wan_qos/agent/tc_agent.py @@ -24,7 +24,7 @@ from neutron import service as neutron_service from wan_qos.common import topics -WANQOS_OPTS = [ +WANTC_OPTS = [ cfg.StrOpt('lan_port_name', default='eth0', help="The name of the port facing the LAN"), @@ -41,7 +41,7 @@ WANQOS_OPTS = [ def main(): - cfg.CONF.register_opts(WANQOS_OPTS,'WANQOS') + cfg.CONF.register_opts(WANTC_OPTS, 'WANTC') common_config.init(sys.argv[1:]) config.setup_logging() server = neutron_service.Service.create( diff --git a/wan_qos/agent/tc_manager.py b/wan_qos/agent/tc_manager.py index c23b0aa..4e44015 100644 --- a/wan_qos/agent/tc_manager.py +++ b/wan_qos/agent/tc_manager.py @@ -37,8 +37,8 @@ class TcAgentManager: self.conf = conf if not host: self.host = self.conf.host - lan_port = self.conf.WANQOS.lan_port_name - wan_port = self.conf.WANQOS.wan_port_name + lan_port = self.conf.WANTC.lan_port_name + wan_port = self.conf.WANTC.wan_port_name self.agent.set_ports(lan_port, wan_port) self.plugin_rpc = api.TcPluginApi(host, topics.TC_PLUGIN) self.plugin_rpc.agent_up_notification(ctx.get_admin_context(), @@ -48,12 +48,12 @@ class TcAgentManager: self.agent.clear_all() tc_dict = { 'port_side': 'lan_port', - 'max_rate': self.conf.WANQOS.lan_max_rate + 'max_rate': self.conf.WANTC.lan_max_rate } self.agent.set_root_queue(tc_dict) tc_dict = { 'port_side': 'wan_port', - 'max_rate': self.conf.WANQOS.wan_max_rate + 'max_rate': self.conf.WANTC.wan_max_rate } self.agent.set_root_queue(tc_dict) diff --git a/wan_qos/tests/unit/test_tc_agent.py b/wan_qos/tests/unit/test_tc_agent.py index fbd21a1..44cb60a 100644 --- a/wan_qos/tests/unit/test_tc_agent.py +++ b/wan_qos/tests/unit/test_tc_agent.py @@ -22,7 +22,7 @@ from wan_qos.agent import tc_driver from wan_qos.agent import tc_manager from wan_qos.services import plugin -wanqos_group = cfg.OptGroup(name='WANQOS', +WANTC_group = cfg.OptGroup(name='WANTC', title='WAN QoS options') opts = [ @@ -44,8 +44,8 @@ opts = [ class TestTcDriver(base.BaseTestCase): def setUp(self): super(TestTcDriver, self).setUp() - cfg.CONF.register_group(wanqos_group) - cfg.CONF.register_opts(opts, group='WANQOS') + cfg.CONF.register_group(WANTC_group) + cfg.CONF.register_opts(opts, group='WANTC') self.tc_agent = tc_driver.TcDriver() self.tc_agent.set_ports('enp1s0f0', 'enp1s0f1') @@ -143,9 +143,9 @@ class TestTcDriver(base.BaseTestCase): class TestApiMessages(base.BaseTestCase): def setUp(self): super(TestApiMessages, self).setUp() - cfg.CONF.register_group(wanqos_group) - cfg.CONF.register_opts(opts, group='WANQOS') - self.plugin = plugin.WanQosPlugin() + cfg.CONF.register_group(WANTC_group) + cfg.CONF.register_opts(opts, group='WANTC') + self.plugin = plugin.WANTCPlugin()