diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-22 23:47:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-22 23:47:16 +0000 |
| commit | f32085653e0947f3371f3e95b8fb6438d360bce8 (patch) | |
| tree | 70476b98d87841f729e3a3d2994eaa100cb870c2 | |
| parent | 164fb0cd52f00dafb506952374168ce20309a5ea (diff) | |
| parent | b15bfc2edd5d3dd0dca805786bdcf22d3fb0339d (diff) | |
| download | nova-f32085653e0947f3371f3e95b8fb6438d360bce8.tar.gz nova-f32085653e0947f3371f3e95b8fb6438d360bce8.tar.xz nova-f32085653e0947f3371f3e95b8fb6438d360bce8.zip | |
Merge "Fixed status validation. Fixes bug 960884."
| -rw-r--r-- | nova/api/openstack/compute/contrib/hosts.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/compute/contrib/test_hosts.py | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/nova/api/openstack/compute/contrib/hosts.py b/nova/api/openstack/compute/contrib/hosts.py index 93e0dd983..a93da9e01 100644 --- a/nova/api/openstack/compute/contrib/hosts.py +++ b/nova/api/openstack/compute/contrib/hosts.py @@ -138,7 +138,7 @@ class HostController(object): key = raw_key.lower().strip() val = raw_val.lower().strip() if key == "status": - if val[:6] in ("enable", "disabl"): + if val in ("enable", "disable"): update_values['status'] = val.startswith("enable") else: explanation = _("Invalid status: '%s'") % raw_val diff --git a/nova/tests/api/openstack/compute/contrib/test_hosts.py b/nova/tests/api/openstack/compute/contrib/test_hosts.py index 76eb77e56..77beeae8c 100644 --- a/nova/tests/api/openstack/compute/contrib/test_hosts.py +++ b/nova/tests/api/openstack/compute/contrib/test_hosts.py @@ -159,6 +159,9 @@ class HostTestCase(test.TestCase): bad_body = {"status": "bad"} self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update, self.req, "host_c1", body=bad_body) + bad_body2 = {"status": "disablabc"} + self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update, + self.req, "host_c1", body=bad_body2) def test_bad_update_key(self): bad_body = {"crazy": "bad"} |