diff options
| author | Jenkins <jenkins@review.openstack.org> | 2014-07-11 01:03:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2014-07-11 01:03:53 +0000 |
| commit | 64a5e566cfe1067c59a747e8da692e59067ffd84 (patch) | |
| tree | ea7b531fb2d1c1bacc5891ff4404b162a7d62dfc /nova/api | |
| parent | 797175c48db542b158983876f91a77a6a3083251 (diff) | |
| parent | 1181d5e65f5488bdd147ef28ffe3e14c09862cec (diff) | |
| download | nova-64a5e566cfe1067c59a747e8da692e59067ffd84.tar.gz | |
Merge "Prevent max_count > 1 and specified ip address as input"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/plugins/v3/servers.py | 1 | ||||
| -rw-r--r-- | nova/api/openstack/compute/servers.py | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/plugins/v3/servers.py b/nova/api/openstack/compute/plugins/v3/servers.py index a2023fd42c..294de977bd 100644 --- a/nova/api/openstack/compute/plugins/v3/servers.py +++ b/nova/api/openstack/compute/plugins/v3/servers.py @@ -516,6 +516,7 @@ class ServersController(wsgi.Controller): exception.InvalidMetadata, exception.InvalidRequest, exception.MultiplePortsNotApplicable, + exception.InvalidFixedIpAndMaxCountRequest, exception.InstanceUserDataMalformed, exception.InstanceUserDataTooLarge, exception.PortNotFound, diff --git a/nova/api/openstack/compute/servers.py b/nova/api/openstack/compute/servers.py index 5be4da9cf8..12c1b907cd 100644 --- a/nova/api/openstack/compute/servers.py +++ b/nova/api/openstack/compute/servers.py @@ -986,6 +986,7 @@ class Controller(wsgi.Controller): exception.InvalidMetadata, exception.InvalidRequest, exception.MultiplePortsNotApplicable, + exception.InvalidFixedIpAndMaxCountRequest, exception.NetworkNotFound, exception.PortNotFound, exception.FixedIpAlreadyInUse, |