← Back to branch summary

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

« back to all changes in this revision

Viewing changes to neutron/extensions/multiprovidernet.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Corey Bryant, James Page
  • Date: 2015-02-16 09:59:01 UTC
  • mfrom: (1.1.20)
  • Revision ID: package-import@ubuntu.com-20150216095901-irf6gdwh5tzmfi73
Tags: 1:2015.1~b2-0ubuntu1
[ Corey Bryant ]
* New upstream release.
  - d/control: Align with upstream dependencies.
  - d/p/disable-udev-tests.patch: Rebased.
  - d/p/pep-0476.patch: Dropped. Fixed upstream.

[ James Page ]
* d/neutron-common.install: Drop fwaas_driver.ini and vpnaas.filters, will
  provided by driver specific packages.

Show diffs side-by-side

added added

removed removed

Lines of Context:
neutron/extensions/multiprovidernet.py
17
17
 
18
18
from neutron.api import extensions
19
19
from neutron.api.v2 import attributes as attr
20
 
from neutron.common import exceptions as qexception
 
20
from neutron.common import exceptions as nexception
21
21
from neutron.extensions import providernet as pnet
22
22
 
23
23
SEGMENTS = 'segments'
24
24
 
25
25
 
26
 
class SegmentsSetInConjunctionWithProviders(qexception.InvalidInput):
 
26
class SegmentsSetInConjunctionWithProviders(nexception.InvalidInput):
27
27
    message = _("Segments and provider values cannot both be set.")
28
28
 
29
29
 
30
 
class SegmentsContainDuplicateEntry(qexception.InvalidInput):
 
30
class SegmentsContainDuplicateEntry(nexception.InvalidInput):
31
31
    message = _("Duplicate segment entry in request.")
32
32
 
33
33