]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Cisco VPNaaS and L3 router plugin integration
authorPaul Michali <pcm@cisco.com>
Wed, 24 Sep 2014 22:22:04 +0000 (18:22 -0400)
committerPaul Michali <pcm@cisco.com>
Tue, 11 Nov 2014 16:21:08 +0000 (11:21 -0500)
commit5ef46174ed22f2855c9a4bc359b98815781eefe0
tree62ed2613a446e2efc7dd54f9c7de28d47b1edb0a
parentc9bea66dfea3549358d4fc0b40600f3f2a68f5b3
Cisco VPNaaS and L3 router plugin integration

This completes the blueprint effort to integrate the Cisco VPNaaS
drivers with the Cisco L3 router plugin for a VPN solution that
uses an in-band Cisco CSR (versus out-of-band, as is currently).

The VPNaaS service driver is modified to no longer read router
configuration from an INI file, but instead, will query the L3
router plugin for this information. The config loading logic is
removed. The router information is transformed and passed to the
device driver for use by the REST client.

The L3 router plugin now provides two methods to provide the needed
router and hosting device info. In addition, the template and
snippets used to provision the Cisco CSR are modified to have the
needed VPN settings and to change the VRF configuration to the new
style to support VPN REST API calls with VRF info.

The VPNaaS device driver was modified to provide the VRF name as
part of the URI for several VPN REST API calls, as needed for this
solution. The device driver uses the additional VRF and interface
information that is provided by the service driver.

The unit tests were updated to reflect the usage of VRF names, and
the new logic for checking router information.

Change-Id: I6ee17f91a25db7bff3ebbeb8d482de1c31a77035
Implements: blueprint cisco-vpnaas-and-router-integration
neutron/plugins/cisco/cfg_agent/device_drivers/csr1kv/cisco_csr1kv_snippets.py
neutron/plugins/cisco/db/l3/l3_router_appliance_db.py
neutron/plugins/cisco/l3/configdrive_templates/csr1kv_cfg_template
neutron/services/vpn/device_drivers/cisco_csr_rest_client.py
neutron/services/vpn/service_drivers/cisco_cfg_loader.py [deleted file]
neutron/services/vpn/service_drivers/cisco_ipsec.py
neutron/tests/unit/services/vpn/device_drivers/test_cisco_csr_rest.py
neutron/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py
neutron/tests/unit/services/vpn/service_drivers/test_cisco_config_loader.py [deleted file]
neutron/tests/unit/services/vpn/service_drivers/test_cisco_ipsec.py