Change WANQOS to WANTC

This commit is contained in:
Ofer Ben-Yacov 2017-01-10 14:31:02 +02:00
parent a8b71e78ed
commit dbb8769b7f
3 changed files with 12 additions and 12 deletions

View File

@ -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(

View File

@ -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)

View File

@ -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()