From: Jenkins <jenkins@review.openstack.org>
Date: Thu, 13 Nov 2014 23:50:48 +0000 (+0000)
Subject: Merge "Cisco VPNaaS and L3 router plugin integration"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=958b154b31311f7f8d6ee108920bd12551b80cf0;p=openstack-build%2Fneutron-build.git

Merge "Cisco VPNaaS and L3 router plugin integration"
---

958b154b31311f7f8d6ee108920bd12551b80cf0
diff --cc neutron/services/vpn/service_drivers/cisco_ipsec.py
index c61d4796e,8e338f529..2fafc21be
--- a/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,