Merge "PowerMax Ussuri Driver - Setting the minimum version of U4P" into stable/ussuri
This commit is contained in:
commit
51bc4a903e
|
@ -1274,7 +1274,7 @@ class PowerMaxData(object):
|
||||||
|
|
||||||
data_dict = {volume_id: volume_info_dict}
|
data_dict = {volume_id: volume_info_dict}
|
||||||
platform = 'Linux-4.4.0-104-generic-x86_64-with-Ubuntu-16.04-xenial'
|
platform = 'Linux-4.4.0-104-generic-x86_64-with-Ubuntu-16.04-xenial'
|
||||||
unisphere_version = u'V9.1.0.14'
|
unisphere_version = u'V9.1.0.17'
|
||||||
unisphere_version_90 = "V9.0.0.1"
|
unisphere_version_90 = "V9.0.0.1"
|
||||||
openstack_release = '12.0.0.0b3.dev401'
|
openstack_release = '12.0.0.0b3.dev401'
|
||||||
openstack_version = '12.0.0'
|
openstack_version = '12.0.0'
|
||||||
|
|
|
@ -1785,7 +1785,7 @@ class PowerMaxRestTest(test.TestCase):
|
||||||
ucode = self.rest.get_array_ucode_version(array)
|
ucode = self.rest.get_array_ucode_version(array)
|
||||||
self.assertEqual(self.data.powermax_model_details['ucode'], ucode)
|
self.assertEqual(self.data.powermax_model_details['ucode'], ucode)
|
||||||
|
|
||||||
def test_validate_unisphere_version_suceess(self):
|
def test_validate_unisphere_version_success(self):
|
||||||
version = tpd.PowerMaxData.unisphere_version
|
version = tpd.PowerMaxData.unisphere_version
|
||||||
returned_version = {'version': version}
|
returned_version = {'version': version}
|
||||||
with mock.patch.object(self.rest, "request",
|
with mock.patch.object(self.rest, "request",
|
||||||
|
|
|
@ -36,7 +36,7 @@ SLOPROVISIONING = 'sloprovisioning'
|
||||||
REPLICATION = 'replication'
|
REPLICATION = 'replication'
|
||||||
SYSTEM = 'system'
|
SYSTEM = 'system'
|
||||||
U4V_VERSION = '91'
|
U4V_VERSION = '91'
|
||||||
MIN_U4P_VERSION = '9.1.0.14'
|
MIN_U4P_VERSION = '9.1.0.17'
|
||||||
UCODE_5978 = '5978'
|
UCODE_5978 = '5978'
|
||||||
retry_exc_tuple = (exception.VolumeBackendAPIException,)
|
retry_exc_tuple = (exception.VolumeBackendAPIException,)
|
||||||
u4p_failover_max_wait = 120
|
u4p_failover_max_wait = 120
|
||||||
|
|
Loading…
Reference in New Issue