diff options
Diffstat (limited to 'designate/api/v2')
| -rw-r--r-- | designate/api/v2/controllers/floatingips.py | 6 | ||||
| -rw-r--r-- | designate/api/v2/controllers/zones/tasks/__init__.py | 20 | ||||
| -rw-r--r-- | designate/api/v2/controllers/zones/tasks/exports.py | 3 |
3 files changed, 14 insertions, 15 deletions
diff --git a/designate/api/v2/controllers/floatingips.py b/designate/api/v2/controllers/floatingips.py index 5c984e97..9b0455c7 100644 --- a/designate/api/v2/controllers/floatingips.py +++ b/designate/api/v2/controllers/floatingips.py @@ -25,9 +25,9 @@ from designate.objects.adapters import DesignateAdapter LOG = logging.getLogger(__name__) -FIP_REGEX = '^(?P<region>[A-Za-z0-9\\.\\-_]{1,100}):' \ - '(?P<id>[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' \ - '[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$' +FIP_REGEX = ('^(?P<region>[A-Za-z0-9\\.\\-_]{1,100}):' + '(?P<id>[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-' + '[0-9a-fA-F]{4}-[0-9a-fA-F]{12})$') def fip_key_to_data(key): diff --git a/designate/api/v2/controllers/zones/tasks/__init__.py b/designate/api/v2/controllers/zones/tasks/__init__.py index 28f1d207..ab49cd3e 100644 --- a/designate/api/v2/controllers/zones/tasks/__init__.py +++ b/designate/api/v2/controllers/zones/tasks/__init__.py @@ -16,16 +16,16 @@ from oslo_log import log as logging from designate.api.v2.controllers.zones.tasks import abandon -from designate.api.v2.controllers.zones.tasks.exports \ - import ZoneExportCreateController -from designate.api.v2.controllers.zones.tasks.exports \ - import ZoneExportsController -from designate.api.v2.controllers.zones.tasks.imports \ - import ZoneImportController -from designate.api.v2.controllers.zones.tasks.transfer_accepts \ - import TransferAcceptsController as TRA -from designate.api.v2.controllers.zones.tasks.transfer_requests \ - import TransferRequestsController as TRC +from designate.api.v2.controllers.zones.tasks.exports import ( + ZoneExportCreateController) +from designate.api.v2.controllers.zones.tasks.exports import ( + ZoneExportsController) +from designate.api.v2.controllers.zones.tasks.imports import ( + ZoneImportController) +from designate.api.v2.controllers.zones.tasks.transfer_accepts import ( + TransferAcceptsController as TRA) +from designate.api.v2.controllers.zones.tasks.transfer_requests import ( + TransferRequestsController as TRC) from designate.api.v2.controllers.zones.tasks.xfr import XfrController LOG = logging.getLogger(__name__) diff --git a/designate/api/v2/controllers/zones/tasks/exports.py b/designate/api/v2/controllers/zones/tasks/exports.py index 56119f31..1ec196f6 100644 --- a/designate/api/v2/controllers/zones/tasks/exports.py +++ b/designate/api/v2/controllers/zones/tasks/exports.py @@ -42,8 +42,7 @@ class ZoneExportController(rest.RestController): export = self.central_api.get_zone_export(context, export_id) if export.location and export.location.startswith('designate://'): - return self.central_api.\ - export_zone(context, export['zone_id']) + return self.central_api.export_zone(context, export['zone_id']) else: msg = 'Zone can not be exported synchronously' raise exceptions.BadRequest(msg) |