openstack
/
cinder
Code Issues Proposed changes

Correct volume-transfers API endpoint 

Routing was set up to map to volume_transfers, but the cinder client and
other places expected it to be volume-transfer. The - is more correct
for API endpoints, and the client is currently in feature freeze, so
easiest way to correct this for this new feature is to update the
endpoint to the expected name.

Change-Id: Ib0002c441a2e860e8b74a4d9e6df890b398210f4
Closes-bug: #1785325
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
This commit is contained in:
Sean McGinnis 2018-08-03 16:16:10 -05:00
parent 4faa7d30f7
commit 5dd4a04f86
No known key found for this signature in database
GPG Key ID: CE7EE4BFAF8D70C8
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cinder/api/v3/router.py
View File

@ -196,7 +196,7 @@ class APIRouter(cinder.api.openstack.APIRouter):
self.resources['volume_transfers'] = (
volume_transfer.create_resource())
mapper.resource("volume_transfer", "volume_transfers",
mapper.resource("volume-transfer", "volume-transfers",
controller=self.resources['volume_transfers'],
collection={'detail': 'GET'},
member={'accept': 'POST'})

8
cinder/policies/volume_transfer.py
View File

@ -45,7 +45,7 @@ volume_transfer_policies = [
},
{
'method': 'GET',
'path': '/volume_transfers/detail'
'path': '/volume-transfers/detail'
}
]),
policy.DocumentedRuleDefault(
@ -73,7 +73,7 @@ volume_transfer_policies = [
},
{
'method': 'GET',
'path': '/volume_transfers/{transfer_id}'
'path': '/volume-transfers/{transfer_id}'
}
]),
policy.DocumentedRuleDefault(
@ -87,7 +87,7 @@ volume_transfer_policies = [
},
{
'method': 'POST',
'path': '/volume_transfers/{transfer_id}/accept'
'path': '/volume-transfers/{transfer_id}/accept'
}
]),
policy.DocumentedRuleDefault(
@ -101,7 +101,7 @@ volume_transfer_policies = [
},
{
'method': 'DELETE',
'path': '/volume_transfers/{transfer_id}'
'path': '/volume-transfers/{transfer_id}'
}
]),
]

28
cinder/tests/unit/api/v3/test_volume_transfer.py
View File

@ -76,7 +76,7 @@ class VolumeTransferAPITestCase(test.TestCase):
def test_show_transfer(self):
volume_id = self._create_volume(size=5)
transfer = self._create_transfer(volume_id)
req = webob.Request.blank('/v3/%s/volume_transfers/%s' % (
req = webob.Request.blank('/v3/%s/volume-transfers/%s' % (
fake.PROJECT_ID, transfer['id']))
req.method = 'GET'
req.headers = mv.get_mv_header(mv.TRANSFER_WITH_SNAPSHOTS)
@ -89,13 +89,13 @@ class VolumeTransferAPITestCase(test.TestCase):
self.assertEqual(transfer['id'], res_dict['transfer']['id'])
self.assertEqual(volume_id, res_dict['transfer']['volume_id'])
def test_list_transfers_json(self):
def test_list_transfers(self):
volume_id_1 = self._create_volume(size=5)
volume_id_2 = self._create_volume(size=5)
transfer1 = self._create_transfer(volume_id_1)
transfer2 = self._create_transfer(volume_id_2)
req = webob.Request.blank('/v3/%s/volume_transfers' %
req = webob.Request.blank('/v3/%s/volume-transfers' %
fake.PROJECT_ID)
req.method = 'GET'
req.headers = mv.get_mv_header(mv.TRANSFER_WITH_SNAPSHOTS)
@ -112,13 +112,13 @@ class VolumeTransferAPITestCase(test.TestCase):
self.assertEqual(transfer2['id'], res_dict['transfers'][1]['id'])
self.assertEqual('test_transfer', res_dict['transfers'][1]['name'])
def test_list_transfers_detail_json(self):
def test_list_transfers_detail(self):
volume_id_1 = self._create_volume(size=5)
volume_id_2 = self._create_volume(size=5)
transfer1 = self._create_transfer(volume_id_1)
transfer2 = self._create_transfer(volume_id_2)
req = webob.Request.blank('/v3/%s/volume_transfers/detail' %
req = webob.Request.blank('/v3/%s/volume-transfers/detail' %
fake.PROJECT_ID)
req.method = 'GET'
req.headers = mv.get_mv_header(mv.TRANSFER_WITH_SNAPSHOTS)
@ -141,13 +141,13 @@ class VolumeTransferAPITestCase(test.TestCase):
self.assertEqual(transfer2['id'], res_dict['transfers'][1]['id'])
self.assertEqual(volume_id_2, res_dict['transfers'][1]['volume_id'])
def test_list_transfers_detail_json_with_no_snapshots(self):
def test_list_transfers_detail_with_no_snapshots(self):
volume_id_1 = self._create_volume(size=5)
volume_id_2 = self._create_volume(size=5)
transfer1 = self._create_transfer(volume_id_1)
transfer2 = self._create_transfer(volume_id_2)
req = webob.Request.blank('/v3/%s/volume_transfers/detail' %
req = webob.Request.blank('/v3/%s/volume-transfers/detail' %
fake.PROJECT_ID)
req.method = 'GET'
req.headers = mv.get_mv_header(mv.TRANSFER_WITH_SNAPSHOTS)
@ -172,12 +172,12 @@ class VolumeTransferAPITestCase(test.TestCase):
self.assertEqual(volume_id_2, res_dict['transfers'][1]['volume_id'])
self.assertEqual(False, res_dict['transfers'][1]['no_snapshots'])
def test_create_transfer_json(self):
def test_create_transfer(self):
volume_id = self._create_volume(status='available', size=5)
body = {"transfer": {"name": "transfer1",
"volume_id": volume_id}}
req = webob.Request.blank('/v3/%s/volume_transfers' %
req = webob.Request.blank('/v3/%s/volume-transfers' %
fake.PROJECT_ID)
req.method = 'POST'
req.headers = mv.get_mv_header(mv.TRANSFER_WITH_SNAPSHOTS)
@ -201,7 +201,7 @@ class VolumeTransferAPITestCase(test.TestCase):
"volume_id": volume_id,
'no_snapshots': True}}
req = webob.Request.blank('/v3/%s/volume_transfers' %
req = webob.Request.blank('/v3/%s/volume-transfers' %
fake.PROJECT_ID)
req.method = 'POST'
req.headers = mv.get_mv_header(mv.TRANSFER_WITH_SNAPSHOTS)
@ -224,7 +224,7 @@ class VolumeTransferAPITestCase(test.TestCase):
volume_id = self._create_volume()
transfer = self.volume_transfer_api.create(context.get_admin_context(),
volume_id, 'test_transfer')
req = webob.Request.blank('/v3/%s/volume_transfers/%s' % (
req = webob.Request.blank('/v3/%s/volume-transfers/%s' % (
fake.PROJECT_ID, transfer['id']))
req.method = 'DELETE'
req.headers = mv.get_mv_header(mv.TRANSFER_WITH_SNAPSHOTS)
@ -235,7 +235,7 @@ class VolumeTransferAPITestCase(test.TestCase):
self.assertEqual(http_client.ACCEPTED, res.status_int)
# verify transfer has been deleted
req = webob.Request.blank('/v3/%s/volume_transfers/%s' % (
req = webob.Request.blank('/v3/%s/volume-transfers/%s' % (
fake.PROJECT_ID, transfer['id']))
req.method = 'GET'
req.headers['Content-Type'] = 'application/json'
@ -251,14 +251,14 @@ class VolumeTransferAPITestCase(test.TestCase):
self.assertEqual(db.volume_get(context.get_admin_context(),
volume_id)['status'], 'available')
def test_accept_transfer_volume_id_specified_json(self):
def test_accept_transfer_volume_id_specified(self):
volume_id = self._create_volume()
transfer = self.volume_transfer_api.create(context.get_admin_context(),
volume_id, 'test_transfer')
svc = self.start_service('volume', host='fake_host')
body = {"accept": {"auth_key": transfer['auth_key']}}
req = webob.Request.blank('/v3/%s/volume_transfers/%s/accept' % (
req = webob.Request.blank('/v3/%s/volume-transfers/%s/accept' % (
fake.PROJECT_ID, transfer['id']))
req.method = 'POST'
req.headers = mv.get_mv_header(mv.TRANSFER_WITH_SNAPSHOTS)