diff options
Diffstat (limited to 'designate/central/service.py')
| -rw-r--r-- | designate/central/service.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/designate/central/service.py b/designate/central/service.py index e65429e3..df6ec7ea 100644 --- a/designate/central/service.py +++ b/designate/central/service.py @@ -26,7 +26,6 @@ import random from random import SystemRandom import time -import six from dns import exception as dnsexception from dns import zone as dnszone from oslo_config import cfg @@ -3114,7 +3113,10 @@ class Service(service.RPCService): zone_import.message = 'Duplicate zone.' except exceptions.InvalidTTL as e: zone_import.status = 'ERROR' - zone_import.message = six.text_type(e) + zone_import.message = str(e) + except exceptions.OverQuota: + zone_import.status = 'ERROR' + zone_import.message = 'Quota exceeded during zone import.' except Exception as e: LOG.exception( 'An undefined error occurred during zone import creation' |