openstack
/
deb-networking-midonet
Code Issues Proposed changes

vpnaas: Update for vpn-flavors 

Closes-Bug: #1672920
Depends-On: I0095e160481f1d4572e38ad1d3bbc8e183039b84
Change-Id: Ibeec33e9186138b0271e2bbc009f3ca36296be0d
This commit is contained in:
YAMAMOTO Takashi 2017-04-25 18:06:41 +09:00
parent abd29ed72f
commit 57797cce80
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
midonet/neutron/services/vpn/service_drivers/midonet_ipsec.py
View File

@ -33,7 +33,7 @@ LOG = logging.getLogger(__name__)
class MidonetIPsecVPNDriver(base_ipsec.BaseIPsecVPNDriver):
def __init__(self, service_plugin):
super(MidonetIPsecVPNDriver, self).__init__(
service_plugin, ipsec_validator.IpsecVpnValidator(service_plugin))
service_plugin, ipsec_validator.IpsecVpnValidator(self))
self.plugin = plugin.VPNPlugin()
self.client = c_base.load_client(cfg.CONF.MIDONET)

4
midonet/neutron/tests/unit/test_extension_vpnaas.py
View File

@ -33,6 +33,7 @@ MN_DRIVER_KLASS = ('midonet.neutron.services.vpn.service_drivers.'
extensions_path = ':'.join(extensions.__path__ + nextensions.__path__)
DB_VPN_PLUGIN_KLASS = "neutron_vpnaas.services.vpn.plugin.VPNDriverPlugin"
FLAVOR_PLUGIN_KLASS = "neutron.services.flavors.flavors_plugin.FlavorsPlugin"
class VPNTestExtensionManager(test_l3_plugin.L3TestExtensionManager):
@ -53,7 +54,8 @@ class VPNTestCase(test_vpn_db.VPNTestMixin,
test_mn.MidonetPluginV2TestCase):
def setUp(self):
service_plugins = {
'vpn_plugin_name': DB_VPN_PLUGIN_KLASS}
'vpn_plugin_name': DB_VPN_PLUGIN_KLASS,
'flavors_plugin': FLAVOR_PLUGIN_KLASS}
vpnaas_provider = (plugin_const.VPN + ':vpnaas:' + MN_DRIVER_KLASS
+ ':default')
mock.patch.object(provconf.NeutronModule, 'service_providers',