openstack
/
nova
Code Issues Proposed changes

Merge "Make rebuild server schema 'additionalProperties' False"

This commit is contained in:
Jenkins 2015-01-05 17:19:44 +00:00 committed by Gerrit Code Review
parent 1550b8aff0 340ffeeff1
commit 5d3d96c4b0
5 changed files with 17 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/v3/api_samples/os-access-ips/server-action-rebuild.json
View File

@ -6,12 +6,6 @@
"name" : "new-server-test",
"metadata" : {
"meta_var" : "meta_val"
},
"personality" : [
{
"path" : "/etc/banner.txt",
"contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
}
]
}
}
}

4
nova/api/openstack/compute/schemas/v3/servers.py
View File

@ -84,9 +84,7 @@ base_rebuild = {
'preserve_ephemeral': parameter_types.boolean,
},
'required': ['imageRef'],
# TODO(oomichi): ditto, enable here after all extension schema
# patches are merged.
# 'additionalProperties': False,
'additionalProperties': False,
},
},
'required': ['rebuild'],

13
nova/tests/functional/test_servers.py
View File

@ -507,17 +507,4 @@ class ServersTest(integrated_helpers._IntegratedTestBase):
class ServersTestV3(client.TestOpenStackClientV3Mixin, ServersTest):
_force_delete_parameter = 'forceDelete'
_api_version = 'v3'
_image_ref_parameter = 'imageRef'
_flavor_ref_parameter = 'flavorRef'
_access_ipv4_parameter = None
_access_ipv6_parameter = None
def _get_access_ips_params(self):
return {}
def _verify_access_ips(self, server):
# NOTE(alexxu): access_ips was demoted as extensions in v3 api.
# So skips verifying access_ips
pass

8
nova/tests/functional/v3/api_samples/os-access-ips/server-action-rebuild.json.tpl
View File

@ -6,12 +6,6 @@
"name" : "new-server-test",
"metadata" : {
"meta_var" : "meta_val"
},
"personality" : [
{
"path" : "/etc/banner.txt",
"contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
}
]
}
}
}

15
nova/tests/unit/api/openstack/compute/plugins/v3/test_server_actions.py
View File

@ -449,7 +449,7 @@ class ServerActionsControllerTest(test.TestCase):
body = {
"rebuild": {
"imageRef": self._image_href,
"admin_password": "asdf",
"adminPass": "asdf",
},
}
@ -459,6 +459,19 @@ class ServerActionsControllerTest(test.TestCase):
self.assertEqual(body['server']['image']['id'], '2')
self.assertNotIn('adminPass', body['server'])
def test_rebuild_server_with_extra_arg(self):
body = {
"rebuild": {
"imageRef": self._image_href,
"extra_arg": "asdf",
},
}
req = fakes.HTTPRequestV3.blank('')
self.assertRaises(exception.ValidationError,
self.controller._action_rebuild,
req, FAKE_UUID, body=body)
def test_rebuild_server_not_found(self):
def server_not_found(self, instance_id,
columns_to_join=None, use_slave=False):