4c0ee4dc06
Modify the persistence logic for VPNaaS to separate out the validation for the reference implmentation. This allows providers to override/extend the validation, as needed. Additional commits will address the separation for other providers and for other L3 services. In addition, the logic that sets default values for optional attributes is also moved into separate methods to allow providers to override the defaults used. Only attributes that have multiple validations are considered at this time, but this can be extended, as needed. Currently, one UT fails due to an oslo.messaging bug that has been fixed, but not yet released for Neutron use. As a workaround, the affected test case has been commented out. This test verifies that the right (only, in this case) device driver is used for validation. Once the issue with releasing oslo.messaging 1.4.0.0a2 or newer is resolved, this can be uncommented. In the future, TaskFlow may be used for the L3 services workflow, and these changes will provide validation modularization for that effort. Change-Id: Id420983ccbceece5f4a00546941618318b9562c7 Partially-implements: blueprint l3-svcs-vendor-validation
109 lines
4.5 KiB
Python
109 lines
4.5 KiB
Python
|
|
# (c) Copyright 2013 Hewlett-Packard Development Company, L.P.
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
# @author: Swaminathan Vasudevan, Hewlett-Packard
|
|
|
|
from neutron.db.vpn import vpn_db
|
|
from neutron.openstack.common import log as logging
|
|
from neutron.plugins.common import constants
|
|
from neutron.services import service_base
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
class VPNPlugin(vpn_db.VPNPluginDb):
|
|
|
|
"""Implementation of the VPN Service Plugin.
|
|
|
|
This class manages the workflow of VPNaaS request/response.
|
|
Most DB related works are implemented in class
|
|
vpn_db.VPNPluginDb.
|
|
"""
|
|
supported_extension_aliases = ["vpnaas", "service-type"]
|
|
|
|
|
|
class VPNDriverPlugin(VPNPlugin, vpn_db.VPNPluginRpcDbMixin):
|
|
"""VpnPlugin which supports VPN Service Drivers."""
|
|
#TODO(nati) handle ikepolicy and ipsecpolicy update usecase
|
|
def __init__(self):
|
|
super(VPNDriverPlugin, self).__init__()
|
|
# Load the service driver from neutron.conf.
|
|
drivers, default_provider = service_base.load_drivers(
|
|
constants.VPN, self)
|
|
LOG.info(_("VPN plugin using service driver: %s"), default_provider)
|
|
self.ipsec_driver = drivers[default_provider]
|
|
|
|
def _get_driver_for_vpnservice(self, vpnservice):
|
|
return self.ipsec_driver
|
|
|
|
def _get_driver_for_ipsec_site_connection(self, context,
|
|
ipsec_site_connection):
|
|
#TODO(nati) get vpnservice when we support service type framework
|
|
vpnservice = None
|
|
return self._get_driver_for_vpnservice(vpnservice)
|
|
|
|
def _get_validator(self):
|
|
return self.ipsec_driver.validator
|
|
|
|
def create_ipsec_site_connection(self, context, ipsec_site_connection):
|
|
ipsec_site_connection = super(
|
|
VPNDriverPlugin, self).create_ipsec_site_connection(
|
|
context, ipsec_site_connection)
|
|
driver = self._get_driver_for_ipsec_site_connection(
|
|
context, ipsec_site_connection)
|
|
driver.create_ipsec_site_connection(context, ipsec_site_connection)
|
|
return ipsec_site_connection
|
|
|
|
def delete_ipsec_site_connection(self, context, ipsec_conn_id):
|
|
ipsec_site_connection = self.get_ipsec_site_connection(
|
|
context, ipsec_conn_id)
|
|
super(VPNDriverPlugin, self).delete_ipsec_site_connection(
|
|
context, ipsec_conn_id)
|
|
driver = self._get_driver_for_ipsec_site_connection(
|
|
context, ipsec_site_connection)
|
|
driver.delete_ipsec_site_connection(context, ipsec_site_connection)
|
|
|
|
def update_ipsec_site_connection(
|
|
self, context,
|
|
ipsec_conn_id, ipsec_site_connection):
|
|
old_ipsec_site_connection = self.get_ipsec_site_connection(
|
|
context, ipsec_conn_id)
|
|
ipsec_site_connection = super(
|
|
VPNDriverPlugin, self).update_ipsec_site_connection(
|
|
context,
|
|
ipsec_conn_id,
|
|
ipsec_site_connection)
|
|
driver = self._get_driver_for_ipsec_site_connection(
|
|
context, ipsec_site_connection)
|
|
driver.update_ipsec_site_connection(
|
|
context, old_ipsec_site_connection, ipsec_site_connection)
|
|
return ipsec_site_connection
|
|
|
|
def update_vpnservice(self, context, vpnservice_id, vpnservice):
|
|
old_vpn_service = self.get_vpnservice(context, vpnservice_id)
|
|
new_vpn_service = super(
|
|
VPNDriverPlugin, self).update_vpnservice(context, vpnservice_id,
|
|
vpnservice)
|
|
driver = self._get_driver_for_vpnservice(old_vpn_service)
|
|
driver.update_vpnservice(context, old_vpn_service, new_vpn_service)
|
|
return new_vpn_service
|
|
|
|
def delete_vpnservice(self, context, vpnservice_id):
|
|
vpnservice = self._get_vpnservice(context, vpnservice_id)
|
|
super(VPNDriverPlugin, self).delete_vpnservice(context, vpnservice_id)
|
|
driver = self._get_driver_for_vpnservice(vpnservice)
|
|
driver.delete_vpnservice(context, vpnservice)
|