openstack/cinder
Code Issues Proposed changes

Remove mirror policy parameter from Huawei driver

Browse Source 
Mirror policy parameter is not supposed to be exposed to users.
This patch removes it.

Change-Id: Ifaccbd8ba2939da446144d26299d62c71d2f0249
Closes-Bug: #1676796
This commit is contained in:
zengyingzhe 2017-03-28 17:23:31 +08:00 committed by Yingzhe Zeng
parent 5d10ed5367
commit 6e74dbd4c3
5 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/volume/drivers/huawei/huawei_conf.py
View File

@ -73,7 +73,6 @@ class HuaweiConf(object):
self._lun_copy_wait_interval, self._lun_copy_wait_interval,
self._lun_timeout, self._lun_timeout,
self._lun_write_type, self._lun_write_type,
self._lun_mirror_switch,
self._lun_prefetch, self._lun_prefetch,
self._lun_policy, self._lun_policy,
self._lun_read_cache_policy, self._lun_read_cache_policy,
@ -175,11 +174,6 @@ class HuaweiConf(object):
write_type = text.strip() if text else '1' write_type = text.strip() if text else '1'
setattr(self.conf, 'lun_write_type', write_type) setattr(self.conf, 'lun_write_type', write_type)
def _lun_mirror_switch(self, xml_root):
text = xml_root.findtext('LUN/MirrorSwitch')
mirror_switch = text.strip() if text else '1'
setattr(self.conf, 'lun_mirror_switch', mirror_switch)
def _lun_prefetch(self, xml_root): def _lun_prefetch(self, xml_root):
prefetch_type = '3' prefetch_type = '3'
prefetch_value = '0' prefetch_value = '0'

2
cinder/volume/drivers/huawei/huawei_driver.py
View File

@ -321,7 +321,6 @@ class HuaweiBaseDriver(driver.VolumeDriver):
'ALLOCTYPE': opts.get('LUNType', self.configuration.lun_type), 'ALLOCTYPE': opts.get('LUNType', self.configuration.lun_type),
'CAPACITY': huawei_utils.get_volume_size(volume), 'CAPACITY': huawei_utils.get_volume_size(volume),
'WRITEPOLICY': self.configuration.lun_write_type, 'WRITEPOLICY': self.configuration.lun_write_type,
'MIRRORPOLICY': self.configuration.lun_mirror_switch,
'PREFETCHPOLICY': self.configuration.lun_prefetch_type, 'PREFETCHPOLICY': self.configuration.lun_prefetch_type,
'PREFETCHVALUE': self.configuration.lun_prefetch_value, 'PREFETCHVALUE': self.configuration.lun_prefetch_value,
'DATATRANSFERPOLICY': 'DATATRANSFERPOLICY':
@ -677,7 +676,6 @@ class HuaweiBaseDriver(driver.VolumeDriver):
'ALLOCTYPE': opts.get('LUNType', lun_info['ALLOCTYPE']), 'ALLOCTYPE': opts.get('LUNType', lun_info['ALLOCTYPE']),
'CAPACITY': lun_info['CAPACITY'], 'CAPACITY': lun_info['CAPACITY'],
'WRITEPOLICY': lun_info['WRITEPOLICY'], 'WRITEPOLICY': lun_info['WRITEPOLICY'],
'MIRRORPOLICY': lun_info['MIRRORPOLICY'],
'PREFETCHPOLICY': lun_info['PREFETCHPOLICY'], 'PREFETCHPOLICY': lun_info['PREFETCHPOLICY'],
'PREFETCHVALUE': lun_info['PREFETCHVALUE'], 'PREFETCHVALUE': lun_info['PREFETCHVALUE'],
'DATATRANSFERPOLICY': policy, 'DATATRANSFERPOLICY': policy,

1
cinder/volume/drivers/huawei/replication.py
View File

@ -411,7 +411,6 @@ class ReplicaPairManager(object):
'ALLOCTYPE': local_lun_info['ALLOCTYPE'], 'ALLOCTYPE': local_lun_info['ALLOCTYPE'],
'CAPACITY': local_lun_info['CAPACITY'], 'CAPACITY': local_lun_info['CAPACITY'],
'WRITEPOLICY': self.conf.lun_write_type, 'WRITEPOLICY': self.conf.lun_write_type,
'MIRRORPOLICY': self.conf.lun_mirror_switch,
'PREFETCHPOLICY': self.conf.lun_prefetch_type, 'PREFETCHPOLICY': self.conf.lun_prefetch_type,
'PREFETCHVALUE': self.conf.lun_prefetch_value, 'PREFETCHVALUE': self.conf.lun_prefetch_value,
'DATATRANSFERPOLICY': self.conf.lun_policy, 'DATATRANSFERPOLICY': self.conf.lun_policy,

2
cinder/volume/drivers/huawei/rest_client.py
View File

@ -204,6 +204,8 @@ class RestClient(object):
raise exception.VolumeBackendAPIException(data=err_msg) raise exception.VolumeBackendAPIException(data=err_msg)
def create_lun(self, lun_params): def create_lun(self, lun_params):
# Set the mirror switch always on
lun_params['MIRRORPOLICY'] = '1'
url = "/lun" url = "/lun"
result = self.call(url, lun_params) result = self.call(url, lun_params)
if result['error']['code'] == constants.ERROR_VOLUME_ALREADY_EXIST: if result['error']['code'] == constants.ERROR_VOLUME_ALREADY_EXIST:

4
releasenotes/notes/remove-mirrorpolicy-parameter-from-huawei-driver-d32257a60d32fd90.yaml Normal file
View File

@ -0,0 +1,4 @@
---
deprecations:
- |
Remove mirror policy parameter from huawei driver.