openstack
/
cinder
Code Issues Proposed changes

Merge "Unity: temp snapshot for backup deleted twice" into stable/ocata

This commit is contained in:
Jenkins 2017-08-01 20:22:48 +00:00 committed by Gerrit Code Review
parent 16852f9048 e4b41eb21e
commit dd0e46963c
2 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cinder/tests/unit/volume/drivers/dell_emc/unity/test_driver.py
View File

@ -245,17 +245,6 @@ class UnityDriverTest(unittest.TestCase):
def test_backup_use_temp_snapshot(self):
self.assertTrue(self.driver.backup_use_temp_snapshot())
def test_create_export_snapshot(self):
snapshot = self.driver.create_export_snapshot(self.get_context(),
self.get_snapshot(),
self.get_connector())
self.assertTrue(snapshot.exists)
def test_remove_export_snapshot(self):
snapshot = self.get_snapshot()
self.driver.remove_export_snapshot(self.get_context(), snapshot)
self.assertFalse(snapshot.exists)
def test_initialize_connection_snapshot(self):
snapshot = self.get_snapshot()
conn_info = self.driver.initialize_connection_snapshot(

19
cinder/volume/drivers/dell_emc/unity/driver.py
View File

@ -48,10 +48,11 @@ class UnityDriver(driver.ManageableVD,
"""Unity Driver.
Version history:
1.0.0 - Initial version
1.0.0 - Initial version (Ocata)
1.0.1 - Fixed bug 170311: temp snapshot for backup was deleted twice
"""
VERSION = '01.00.00'
VERSION = '01.00.01'
VENDOR = 'Dell EMC'
# ThirdPartySystems wiki page
CI_WIKI_NAME = "EMC_UNITY_CI"
@ -205,12 +206,18 @@ class UnityDriver(driver.ManageableVD,
return True
def create_export_snapshot(self, context, snapshot, connector):
"""Creates the snapshot for backup."""
return self.adapter.create_snapshot(snapshot)
"""Creates the mount point of the snapshot for backup.
Not necessary to create on Unity.
"""
pass
def remove_export_snapshot(self, context, snapshot):
"""Deletes the snapshot for backup."""
self.adapter.delete_snapshot(snapshot)
"""Deletes the mount point the snapshot for backup.
Not necessary to create on Unity.
"""
pass
def initialize_connection_snapshot(self, snapshot, connector, **kwargs):
return self.adapter.initialize_connection_snapshot(snapshot, connector)