Merge "[cephfs] Fix access rule update"
This commit is contained in:
@@ -819,7 +819,7 @@ class CephFSDriver(driver.ExecuteMixin, driver.GaneshaMixin,
|
||||
sub_name = self._get_subvolume_name(share['id'])
|
||||
return self.protocol_helper.update_access(
|
||||
context, share, access_rules, add_rules, delete_rules,
|
||||
share_server=share_server, sub_name=sub_name)
|
||||
update_rules, share_server=share_server, sub_name=sub_name)
|
||||
|
||||
def get_backend_info(self, context):
|
||||
return self.protocol_helper.get_backend_info(context)
|
||||
|
||||
@@ -623,14 +623,15 @@ class CephFSDriverTestCase(test.TestCase):
|
||||
}
|
||||
add_rules = access_rules = [alice, ]
|
||||
delete_rules = []
|
||||
update_rules = []
|
||||
|
||||
self._driver.update_access(
|
||||
self._context, self._share, access_rules, add_rules, delete_rules,
|
||||
None)
|
||||
update_rules, None)
|
||||
|
||||
self._driver.protocol_helper.update_access.assert_called_once_with(
|
||||
self._context, self._share, access_rules, add_rules, delete_rules,
|
||||
share_server=None, sub_name=self._share['id'])
|
||||
update_rules, share_server=None, sub_name=self._share['id'])
|
||||
|
||||
def test_ensure_shares(self):
|
||||
self._driver.protocol_helper.reapply_rules_while_ensuring_shares = True
|
||||
|
||||
Reference in New Issue
Block a user