Merge "Cisco VPNaaS and L3 router plugin integration"

diff --cc neutron/services/vpn/service_drivers/cisco_ipsec.py
index c61d4796ecf6d82cd8738d13fe8e73cb02b7762f,8e338f529e8594f1eeb6df53ccae1bfd05fcba58..2fafc21be83f70c0c3e3d77c50ef3b8f69870228
--- 1/neutron/services/vpn/service_drivers/cisco_ipsec.py
--- 2/neutron/services/vpn/service_drivers/cisco_ipsec.py
+++ b/neutron/services/vpn/service_drivers/cisco_ipsec.py
@@@ -93,14 -95,11 +95,11 @@@ class CiscoCsrIPsecVpnAgentApi(service_
          Find the host for the router being notified and then
          dispatches a notification for the VPN device driver.
          """
 -        admin_context = context.is_admin and context or context.elevated()
 +        admin_context = context if context.is_admin else context.elevated()
          if not version:
              version = self.RPC_API_VERSION
-         host = via_cfg_file.get_host_for_router(admin_context, router_id)
-         if not host:
-             # NOTE: This is a config error for workaround. At this point we
-             # can't set state of resource to error.
-             return
+         host = self.driver.l3_plugin.get_host_for_router(admin_context,
+                                                          router_id)
          LOG.debug('Notify agent at %(topic)s.%(host)s the message '
                    '%(method)s %(args)s for router %(router)s',
                    {'topic': self.topic,