"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "manila/share/driver.py" between
manila-8.1.3.tar.gz and manila-8.1.4.tar.gz

About: OpenStack Manila provides “Shared Filesystems as a service”.
The "Stein" series (maintained release).

driver.py  (manila-8.1.3)	:	driver.py  (manila-8.1.4)
skipping to change at line 1476		skipping to change at line 1476
'share_group_snapshot_members': [		'share_group_snapshot_members': [
{		{
'status': 'available',		'status': 'available',
'share_type_id': 'some_fake_uuid',		'share_type_id': 'some_fake_uuid',
'user_id': 'a0314a441ca842019b0952224aa39192',		'user_id': 'a0314a441ca842019b0952224aa39192',
'deleted': 'False',		'deleted': 'False',
'created_at': datetime.datetime(2015, 8, 10, 0, 5, 58),		'created_at': datetime.datetime(2015, 8, 10, 0, 5, 58),
'share': <models.Share>,		'share': <models.Share>,
'updated_at': datetime.datetime(2015, 8, 10, 0, 5, 58),		'updated_at': datetime.datetime(2015, 8, 10, 0, 5, 58),
'share_proto': 'NFS',		'share_proto': 'NFS',
		'share_name': 'share_some_fake_uuid',
		'name': 'share-snapshot-some_fake_uuid',
'project_id': '13c0be6290934bd98596cfa004650049',		'project_id': '13c0be6290934bd98596cfa004650049',
'share_group_snapshot_id': 'some_fake_uuid',		'share_group_snapshot_id': 'some_fake_uuid',
'deleted_at': None,		'deleted_at': None,
'share_id': 'some_fake_uuid',		'share_id': 'some_fake_uuid',
'id': 'some_fake_uuid',		'id': 'some_fake_uuid',
'size': 1,		'size': 1,
'provider_location': None,		'provider_location': None,
}		}
],		],
'deleted_at': None,		'deleted_at': None,
skipping to change at line 1518		skipping to change at line 1520
else:		else:
share_snapshots = []		share_snapshots = []
snapshot_members_updates = []		snapshot_members_updates = []
for member in snapshot_members:		for member in snapshot_members:
share_snapshot = {		share_snapshot = {
'snapshot_id': member['share_group_snapshot_id'],		'snapshot_id': member['share_group_snapshot_id'],
'share_id': member['share_id'],		'share_id': member['share_id'],
'share_instance_id': member['share']['id'],		'share_instance_id': member['share']['id'],
'id': member['id'],		'id': member['id'],
'share': member['share'],		'share': member['share'],
		'share_name': member['share_name'],
		'name': member['name'],
'size': member['share']['size'],		'size': member['share']['size'],
'share_size': member['share']['size'],		'share_size': member['share']['size'],
'share_proto': member['share']['share_proto'],		'share_proto': member['share']['share_proto'],
'provider_location': None,		'provider_location': None,
}		}
try:		try:
member_update = self.create_snapshot(		member_update = self.create_snapshot(
context, share_snapshot, share_server=share_server)		context, share_snapshot, share_server=share_server)
if member_update:		if member_update:
member_update['id'] = member['id']		member_update['id'] = member['id']
skipping to change at line 1580		skipping to change at line 1584
{		{
'status': 'available',		'status': 'available',
'share_type_id': 'some_fake_uuid',		'share_type_id': 'some_fake_uuid',
'share_id': 'some_fake_uuid',		'share_id': 'some_fake_uuid',
'user_id': 'a0314a441ca842019b0952224aa39192',		'user_id': 'a0314a441ca842019b0952224aa39192',
'deleted': 'False',		'deleted': 'False',
'created_at': datetime.datetime(2015, 8, 10, 0, 5, 58),		'created_at': datetime.datetime(2015, 8, 10, 0, 5, 58),
'share': <models.Share>,		'share': <models.Share>,
'updated_at': datetime.datetime(2015, 8, 10, 0, 5, 58),		'updated_at': datetime.datetime(2015, 8, 10, 0, 5, 58),
'share_proto': 'NFS',		'share_proto': 'NFS',
		'share_name':'share_some_fake_uuid',
		'name': 'share-snapshot-some_fake_uuid',
'project_id': '13c0be6290934bd98596cfa004650049',		'project_id': '13c0be6290934bd98596cfa004650049',
'share_group_snapshot_id': 'some_fake_uuid',		'share_group_snapshot_id': 'some_fake_uuid',
'deleted_at': None,		'deleted_at': None,
'id': 'some_fake_uuid',		'id': 'some_fake_uuid',
'size': 1,		'size': 1,
'provider_location': 'fake_provider_location_value',		'provider_location': 'fake_provider_location_value',
}		}
],		],
'deleted_at': None,		'deleted_at': None,
'id': 'f6aa3b59-57eb-421e-965c-4e182538e36a',		'id': 'f6aa3b59-57eb-421e-965c-4e182538e36a',
skipping to change at line 1607		skipping to change at line 1613
snapshot_members = snap_dict.get('share_group_snapshot_members', [])		snapshot_members = snap_dict.get('share_group_snapshot_members', [])
LOG.debug('Deleting share group snapshot %s.', snap_dict['id'])		LOG.debug('Deleting share group snapshot %s.', snap_dict['id'])
for member in snapshot_members:		for member in snapshot_members:
share_snapshot = {		share_snapshot = {
'snapshot_id': member['share_group_snapshot_id'],		'snapshot_id': member['share_group_snapshot_id'],
'share_id': member['share_id'],		'share_id': member['share_id'],
'share_instance_id': member['share']['id'],		'share_instance_id': member['share']['id'],
'id': member['id'],		'id': member['id'],
'share': member['share'],		'share': member['share'],
'size': member['share']['size'],		'size': member['share']['size'],
		'share_name': member['share_name'],
		'name': member['name'],
'share_size': member['share']['size'],		'share_size': member['share']['size'],
'share_proto': member['share']['share_proto'],		'share_proto': member['share']['share_proto'],
'provider_location': member['provider_location'],		'provider_location': member['provider_location'],
}		}
self.delete_snapshot(		self.delete_snapshot(
context, share_snapshot, share_server=share_server)		context, share_snapshot, share_server=share_server)
LOG.debug('Deleted share group snapshot %s.', snap_dict['id'])		LOG.debug('Deleted share group snapshot %s.', snap_dict['id'])
return None, None		return None, None
End of changes. 4 change blocks.
0 lines changed or deleted		8 lines changed or added

---