← Back to branch summary

~ubuntu-branches/ubuntu/vivid/neutron/vivid-proposed

« back to all changes in this revision

Viewing changes to neutron/agent/l3/legacy_router.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2015-03-30 11:17:19 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20150330111719-h0gx7233p4jkkgfh
Tags: 1:2015.1~b3-0ubuntu1
https://launchpad.net/bugs/1263539
* New upstream milestone release:
  - d/control: Align version requirements with upstream.
  - d/control: Add new dependency on oslo-log.
  - d/p/*: Rebase.
  - d/control,d/neutron-plugin-hyperv*: Dropped, decomposed into
    separate project upstream.
  - d/control,d/neutron-plugin-openflow*: Dropped, decomposed into
    separate project upstream.
  - d/neutron-common.install: Add neutron-rootwrap-daemon and 
    neutron-keepalived-state-change binaries.
  - d/rules: Ignore neutron-hyperv-agent when installing; only for Windows.
  - d/neutron-plugin-cisco.install: Drop neutron-cisco-cfg-agent as
    decomposed into separate project upstream.
  - d/neutron-plugin-vmware.install: Drop neutron-check-nsx-config and
    neutron-nsx-manage as decomposed into separate project upstream.
  - d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent.
* d/pydist-overrides: Add overrides for oslo packages.
* d/control: Fixup type in package description (LP: #1263539).
* d/p/fixup-driver-test-execution.patch: Cherry pick fix from upstream VCS
  to support unit test exection in out-of-tree vendor drivers.
* d/neutron-common.postinst: Allow general access to /etc/neutron but limit
  access to root/neutron to /etc/neutron/neutron.conf to support execution
  of unit tests in decomposed vendor drivers.
* d/control: Add dependency on python-neutron-fwaas to neutron-l3-agent
  package.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/agent/l3/legacy_router.py
13
13
#    under the License.
14
14
 
15
15
from neutron.agent.l3 import router_info as router
 
16
from neutron.agent.linux import ip_lib
 
17
from neutron.common import constants as l3_constants
16
18
 
17
19
 
18
20
class LegacyRouter(router.RouterInfo):
19
 
    pass
 
21
    def add_floating_ip(self, fip, interface_name, device):
 
22
        if not self._add_fip_addr_to_device(fip, device):
 
23
            return l3_constants.FLOATINGIP_STATUS_ERROR
 
24
 
 
25
        # As GARP is processed in a distinct thread the call below
 
26
        # won't raise an exception to be handled.
 
27
        ip_lib.send_gratuitous_arp(self.ns_name,
 
28
                                   interface_name,
 
29
                                   fip['floating_ip_address'],
 
30
                                   self.agent_conf.send_arp_for_ha)
 
31
        return l3_constants.FLOATINGIP_STATUS_ACTIVE