← Back to branch summary

~ubuntu-branches/ubuntu/vivid/neutron/vivid-updates

« back to all changes in this revision

Viewing changes to neutron/plugins/ml2/drivers/type_vxlan.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/plugins/ml2/drivers/type_vxlan.py
13
13
#    License for the specific language governing permissions and limitations
14
14
#    under the License.
15
15
 
16
 
from oslo.config import cfg
17
 
from oslo.db import exception as db_exc
 
16
from oslo_config import cfg
 
17
from oslo_db import exception as db_exc
 
18
from oslo_log import log
18
19
from six import moves
19
20
import sqlalchemy as sa
20
21
from sqlalchemy import sql
23
24
from neutron.db import api as db_api
24
25
from neutron.db import model_base
25
26
from neutron.i18n import _LE, _LW
26
 
from neutron.openstack.common import log
27
27
from neutron.plugins.common import constants as p_const
28
28
from neutron.plugins.ml2.drivers import type_tunnel
29
29
 
120
120
            chunked_vnis = (vnis_to_remove[i:i + bulk_size] for i in
121
121
                            range(0, len(vnis_to_remove), bulk_size))
122
122
            for vni_list in chunked_vnis:
123
 
                session.query(VxlanAllocation).filter(
124
 
                    VxlanAllocation.vxlan_vni.in_(vni_list)).delete(
125
 
                        synchronize_session=False)
 
123
                if vni_list:
 
124
                    session.query(VxlanAllocation).filter(
 
125
                        VxlanAllocation.vxlan_vni.in_(vni_list)).delete(
 
126
                            synchronize_session=False)
126
127
            # collect vnis that need to be added
127
128
            vnis = list(vxlan_vnis - existing_vnis)
128
129
            chunked_vnis = (vnis[i:i + bulk_size] for i in
176
177
 
177
178
        with session.begin(subtransactions=True):
178
179
            session.query(VxlanEndpoints).filter_by(ip_address=ip).delete()
 
180
 
 
181
    def get_mtu(self, physical_network=None):
 
182
        mtu = super(VxlanTypeDriver, self).get_mtu()
 
183
        return mtu - p_const.VXLAN_ENCAP_OVERHEAD if mtu else 0