diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-04-26 19:08:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-04-26 19:08:06 +0000 |
| commit | d42c424cb957de7a506bf9ae353dcf870bb9cbd1 (patch) | |
| tree | 36ddf9cbefcda587c7d12934ddb8e86b083b52bf | |
| parent | b75f5e7547a4bb4efdb409b4e6339e3b63973019 (diff) | |
| parent | 2cea9b04139a0b64f1bda5b777c062e207d739f9 (diff) | |
Merge "Disallow network creation when label > 255. Fixes bug 965008"
| -rw-r--r-- | Authors | 1 | ||||
| -rwxr-xr-x | bin/nova-manage | 4 |
2 files changed, 4 insertions, 1 deletions
@@ -126,7 +126,6 @@ Lorin Hochstein <lorin@nimbisservices.com> Lvov Maxim <usrleon@gmail.com> Mandar Vaze <mandar.vaze@vertex.co.in> Mandell Degerness <mdegerne@gmail.com> -Mandar Vaze <mandar.vaze@vertex.co.in> Mark McClain <mark.mcclain@dreamhost.com> Mark McLoughlin <markmc@redhat.com> Mark Washenberger <mark.washenberger@rackspace.com> diff --git a/bin/nova-manage b/bin/nova-manage index 53c4fd6f3..bd6857818 100755 --- a/bin/nova-manage +++ b/bin/nova-manage @@ -740,6 +740,10 @@ class NetworkCommands(object): # check for certain required inputs if not label: raise exception.NetworkNotCreated(req='--label') + # Size of "label" column in nova.networks is 255, hence the restriction + if len(label) > 255: + reason = _("Maximum allowed length for 'label' is 255.") + raise exception.InvalidInput(reason=reason) if not (fixed_range_v4 or fixed_range_v6): req = '--fixed_range_v4 or --fixed_range_v6' raise exception.NetworkNotCreated(req=req) |