openstack
/
manila
Code Issues Proposed changes

Merge "HPE3PAR create share from snapshot fails"

This commit is contained in:
Jenkins 2015-11-26 12:34:37 +00:00 committed by Gerrit Code Review
parent eb87a3f1f3 9f98fe2a2c
commit f966df2c02
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manila/share/drivers/hpe/hpe_3par_driver.py
View File

@ -301,9 +301,8 @@ class HPE3ParShareDriver(driver.ShareDriver):
share['id'],
protocol,
extra_specs,
snapshot['share']['project_id'],
snapshot['share']['id'],
snapshot['share']['share_proto'],
share['project_id'],
snapshot['share_id'],
snapshot['id'],
self.fpg,
self.vfs,

4
manila/share/drivers/hpe/hpe_3par_mediator.py
View File

@ -488,7 +488,7 @@ class HPE3ParMediator(object):
return result['members'][0]['shareName']
def create_share_from_snapshot(self, share_id, share_proto, extra_specs,
orig_project_id, orig_share_id, orig_proto,
orig_project_id, orig_share_id,
snapshot_id, fpg, vfs,
comment=OPEN_STACK_MANILA):
@ -498,7 +498,7 @@ class HPE3ParMediator(object):
snapshot = self._find_fsnap(orig_project_id,
orig_share_name,
orig_proto,
protocol,
snapshot_tag,
fpg,
vfs)

7
manila/tests/share/drivers/hpe/test_hpe_3par_constants.py
View File

@ -92,6 +92,13 @@ SNAPSHOT_INFO = {
},
}
SNAPSHOT_INSTANCE = {
'name': EXPECTED_SNAP_NAME,
'id': EXPECTED_SNAP_ID,
'share_id': EXPECTED_SHARE_ID,
'share_proto': NFS,
}
class FakeException(Exception):
pass

14
manila/tests/share/drivers/hpe/test_hpe_3par_driver.py
View File

@ -185,7 +185,7 @@ class HPE3ParDriverTestCase(test.TestCase):
def do_create_share_from_snapshot(self,
protocol,
share_type_id,
snapshot_id,
snapshot_instance,
expected_share_id,
expected_size):
"""Re-usable code for create share from snapshot."""
@ -196,6 +196,7 @@ class HPE3ParDriverTestCase(test.TestCase):
},
}
share = {
'project_id': constants.EXPECTED_PROJECT_ID,
'display_name': constants.EXPECTED_SHARE_NAME,
'host': constants.EXPECTED_HOST,
'id': expected_share_id,
@ -205,7 +206,7 @@ class HPE3ParDriverTestCase(test.TestCase):
}
location = self.driver.create_share_from_snapshot(context,
share,
snapshot_id,
snapshot_instance,
share_server)
return location
@ -301,10 +302,13 @@ class HPE3ParDriverTestCase(test.TestCase):
self.mock_mediator.create_share_from_snapshot.return_value = (
constants.EXPECTED_SHARE_NAME)
snapshot_instance = constants.SNAPSHOT_INSTANCE.copy()
snapshot_instance['protocol'] = constants.CIFS
location = self.do_create_share_from_snapshot(
constants.CIFS,
constants.SHARE_TYPE_ID,
constants.SNAPSHOT_INFO,
snapshot_instance,
constants.EXPECTED_SHARE_ID,
constants.EXPECTED_SIZE_2)
@ -316,7 +320,6 @@ class HPE3ParDriverTestCase(test.TestCase):
constants.EXPECTED_EXTRA_SPECS,
constants.EXPECTED_FSTORE,
constants.EXPECTED_SHARE_ID,
constants.NFS,
constants.EXPECTED_SNAP_ID,
constants.EXPECTED_FPG,
constants.EXPECTED_VFS,
@ -336,7 +339,7 @@ class HPE3ParDriverTestCase(test.TestCase):
location = self.do_create_share_from_snapshot(
constants.NFS,
constants.SHARE_TYPE_ID,
constants.SNAPSHOT_INFO,
constants.SNAPSHOT_INSTANCE,
constants.EXPECTED_SHARE_ID,
constants.EXPECTED_SIZE_1)
@ -348,7 +351,6 @@ class HPE3ParDriverTestCase(test.TestCase):
constants.EXPECTED_EXTRA_SPECS,
constants.EXPECTED_PROJECT_ID,
constants.EXPECTED_SHARE_ID,
constants.NFS,
constants.EXPECTED_SNAP_ID,
constants.EXPECTED_FPG,
constants.EXPECTED_VFS,

3
manila/tests/share/drivers/hpe/test_hpe_3par_mediator.py
View File

@ -473,7 +473,6 @@ class HPE3ParMediatorTestCase(test.TestCase):
constants.EXPECTED_EXTRA_SPECS,
constants.EXPECTED_PROJECT_ID,
constants.EXPECTED_SHARE_ID,
constants.NFS,
constants.EXPECTED_SNAP_ID,
constants.EXPECTED_FPG,
constants.EXPECTED_VFS)
@ -520,7 +519,6 @@ class HPE3ParMediatorTestCase(test.TestCase):
constants.EXPECTED_EXTRA_SPECS,
constants.EXPECTED_PROJECT_ID,
constants.EXPECTED_SHARE_ID,
constants.NFS,
constants.EXPECTED_SNAP_ID,
constants.EXPECTED_FPG,
constants.EXPECTED_VFS)
@ -568,7 +566,6 @@ class HPE3ParMediatorTestCase(test.TestCase):
constants.EXPECTED_EXTRA_SPECS,
constants.EXPECTED_PROJECT_ID,
constants.EXPECTED_SHARE_ID,
constants.NFS,
constants.EXPECTED_SNAP_ID,
constants.EXPECTED_FPG,
constants.EXPECTED_VFS)