← Back to branch summary

~niedbalski/ubuntu/vivid/neutron/fixes-1447803

« back to all changes in this revision

Viewing changes to neutron/tests/unit/services/vpn/test_vpn_agent.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-10-03 18:45:23 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20141003184523-4mt6dy1q3j8n30c9
Tags: 1:2014.2~rc1-0ubuntu1
https://launchpad.net/bugs/1323729
* New upstream release candidate:
  - d/p/*: Refreshed.
  - d/control: Add python-requests-mock to BD's.
  - d/control: Align versioned requirements with upstream.
* Transition linuxbridge and openvswitch plugin users to modular
  layer 2 plugin (LP: #1323729):
  - d/control: Mark removed plugin packages as transitional, depend
    on neutron-plugin-ml2, mark oldlibs/extra.
  - d/neutron-plugin-{linuxbridge,openvswitch}.install: Drop.
  - d/control: Depend on neutron-plugin-ml2 for linuxbridge
    agent package.
  - d/neutron-plugin-linuxbridge-agent.upstart: Use ml2 plugin
    configuration files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/tests/unit/services/vpn/test_vpn_agent.py
18
18
 
19
19
from neutron.agent.common import config as agent_config
20
20
from neutron.agent import l3_agent
 
21
from neutron.agent import l3_ha_agent
21
22
from neutron.agent.linux import interface
22
23
from neutron.common import config as base_config
23
24
from neutron.openstack.common import uuidutils
48
49
        self.conf = cfg.CONF
49
50
        self.conf.register_opts(base_config.core_opts)
50
51
        self.conf.register_opts(l3_agent.L3NATAgent.OPTS)
 
52
        self.conf.register_opts(l3_ha_agent.OPTS)
51
53
        self.conf.register_opts(interface.OPTS)
52
54
        agent_config.register_interface_driver_opts_helper(self.conf)
53
55
        agent_config.register_use_namespaces_opts_helper(self.conf)