openstack
/
nova
Code Issues Proposed changes

Merge "Merge baremetal_nodes func tests between V2 and V2.1"

This commit is contained in:
Jenkins 2015-04-06 23:39:15 +00:00 committed by Gerrit Code Review
parent 6c1b8e077c c6f1db668c
commit cd24e140c6
6 changed files with 26 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
doc/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json
View File

@ -1,12 +0,0 @@
{
"node": {
"cpus": "2",
"disk_gb": "10",
"host": "IRONIC MANAGED",
"id": "058d27fa-241b-445a-a386-08c04f96db43",
"instance_uuid": "1ea4e53e-149a-4f02-9515-590c9fb2315a",
"interfaces": [],
"memory_mb": "1024",
"task_state": "active"
}
}

22
doc/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json
View File

@ -1,22 +0,0 @@
{
"nodes": [
{
"cpus": "2",
"disk_gb": "10",
"host": "IRONIC MANAGED",
"id": "058d27fa-241b-445a-a386-08c04f96db43",
"interfaces": [],
"memory_mb": "1024",
"task_state": "active"
},
{
"cpus": "2",
"disk_gb": "10",
"host": "IRONIC MANAGED",
"id": "e2025409-f3ce-4d6a-9788-c565cf3b1b1c",
"interfaces": [],
"memory_mb": "1024",
"task_state": "active"
}
]
}

12
nova/tests/functional/api_samples/os-baremetal-nodes/baremetal-node-get-resp.json.tpl
View File

@ -1,12 +0,0 @@
{
"node": {
"cpus": "2",
"disk_gb": "10",
"host": "IRONIC MANAGED",
"id": "058d27fa-241b-445a-a386-08c04f96db43",
"instance_uuid": "1ea4e53e-149a-4f02-9515-590c9fb2315a",
"interfaces": [],
"memory_mb": "1024",
"task_state": "active"
}
}

22
nova/tests/functional/api_samples/os-baremetal-nodes/baremetal-node-list-resp.json.tpl
View File

@ -1,22 +0,0 @@
{
"nodes": [
{
"cpus": "2",
"disk_gb": "10",
"host": "IRONIC MANAGED",
"id": "058d27fa-241b-445a-a386-08c04f96db43",
"interfaces": [],
"memory_mb": "1024",
"task_state": "active"
},
{
"cpus": "2",
"disk_gb": "10",
"host": "IRONIC MANAGED",
"id": "e2025409-f3ce-4d6a-9788-c565cf3b1b1c",
"interfaces": [],
"memory_mb": "1024",
"task_state": "active"
}
]
}

49
nova/tests/functional/test_api_samples.py
View File

@ -2036,55 +2036,6 @@ class NetworksAssociateJsonTests(ApiSampleTestBaseV2):
self.assertEqual(response.content, "")
class FakeNode(object):
def __init__(self, uuid='058d27fa-241b-445a-a386-08c04f96db43'):
self.uuid = uuid
self.provision_state = 'active'
self.properties = {'cpus': '2',
'memory_mb': '1024',
'local_gb': '10'}
self.instance_uuid = '1ea4e53e-149a-4f02-9515-590c9fb2315a'
class NodeManager(object):
def list(self, detail=False):
return [FakeNode(), FakeNode('e2025409-f3ce-4d6a-9788-c565cf3b1b1c')]
def get(self, id):
return FakeNode(id)
def list_ports(self, id):
return []
class fake_client(object):
node = NodeManager()
class BaremetalNodesJsonTest(ApiSampleTestBaseV2):
extension_name = ("nova.api.openstack.compute.contrib"
".baremetal_nodes.Baremetal_nodes")
@mock.patch("nova.api.openstack.compute.contrib.baremetal_nodes"
"._get_ironic_client")
def test_baremetal_nodes_list(self, mock_get_irc):
mock_get_irc.return_value = fake_client()
response = self._do_get('os-baremetal-nodes')
subs = self._get_regexes()
self._verify_response('baremetal-node-list-resp', subs, response, 200)
@mock.patch("nova.api.openstack.compute.contrib.baremetal_nodes"
"._get_ironic_client")
def test_baremetal_nodes_get(self, mock_get_irc):
mock_get_irc.return_value = fake_client()
response = self._do_get('os-baremetal-nodes/'
'058d27fa-241b-445a-a386-08c04f96db43')
subs = self._get_regexes()
self._verify_response('baremetal-node-get-resp', subs, response, 200)
class BlockDeviceMappingV2BootJsonTest(ServersSampleBase):
extension_name = ('nova.api.openstack.compute.contrib.'
'block_device_mapping_v2_boot.'

28
nova/tests/functional/v3/test_baremetal_nodes.py
View File

@ -14,8 +14,14 @@
import mock
from oslo_config import cfg
from nova.tests.functional.v3 import api_sample_base
CONF = cfg.CONF
CONF.import_opt('osapi_compute_extension',
'nova.api.openstack.compute.extensions')
class FakeNode(object):
def __init__(self, uuid='058d27fa-241b-445a-a386-08c04f96db43'):
@ -43,12 +49,27 @@ class fake_client(object):
class BareMetalNodesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3):
ADMIN_API = True
extension_name = "os-baremetal-nodes"
# TODO(gmann): Overriding '_api_version' till all functional tests
# are merged between v2 and v2.1. After that base class variable
# itself can be changed to 'v2'
_api_version = 'v2'
def _get_flags(self):
f = super(BareMetalNodesSampleJsonTest, self)._get_flags()
f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
f['osapi_compute_extension'].append('nova.api.openstack.compute.'
'contrib.baremetal_nodes.Baremetal_nodes')
return f
@mock.patch("nova.api.openstack.compute.plugins.v3.baremetal_nodes"
"._get_ironic_client")
def test_baremetal_nodes_list(self, mock_get_irc):
@mock.patch("nova.api.openstack.compute.contrib.baremetal_nodes"
"._get_ironic_client")
def test_baremetal_nodes_list(self, mock_get_irc, v2_1_mock_get_irc):
mock_get_irc.return_value = fake_client()
v2_1_mock_get_irc.return_value = fake_client()
response = self._do_get('os-baremetal-nodes')
subs = self._get_regexes()
@ -56,8 +77,11 @@ class BareMetalNodesSampleJsonTest(api_sample_base.ApiSampleTestBaseV3):
@mock.patch("nova.api.openstack.compute.plugins.v3.baremetal_nodes"
"._get_ironic_client")
def test_baremetal_nodes_get(self, mock_get_irc):
@mock.patch("nova.api.openstack.compute.contrib.baremetal_nodes"
"._get_ironic_client")
def test_baremetal_nodes_get(self, mock_get_irc, v2_1_mock_get_irc):
mock_get_irc.return_value = fake_client()
v2_1_mock_get_irc.return_value = fake_client()
response = self._do_get('os-baremetal-nodes/'
'058d27fa-241b-445a-a386-08c04f96db43')