From 462ecbc79d0d6424132125afdf030fb8a5532db3 Mon Sep 17 00:00:00 2001 From: Kurt Martin Date: Tue, 2 Sep 2014 16:56:53 -0700 Subject: [PATCH] Update the HP 3PAR default persona The HP 3PAR drivers was setting the default persona to Generic. The default should actually be Generic-ALUA for Linux based host. DocImpact This will require an update in the OpenStack Configuration Reference Guide under the supported operations page for the HP 3PAR drivers. The new default for the hp3par:persona should be '2 - Generic-ALUA'. Change-Id: I65860a0b58f52ead0c86a0f0ab9a9ad755f76e72 --- cinder/tests/test_hp3par.py | 8 ++++---- cinder/volume/drivers/san/hp/hp_3par_common.py | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/cinder/tests/test_hp3par.py b/cinder/tests/test_hp3par.py index a5b172279..9875a5678 100644 --- a/cinder/tests/test_hp3par.py +++ b/cinder/tests/test_hp3par.py @@ -277,7 +277,7 @@ class HP3PARBaseDriver(object): 'extra_specs': { 'cpg': 'bogus', 'snap_cpg': 'bogus', - 'hp3par:persona': '1 - Generic' + 'hp3par:persona': '2 - Generic-ALUA' } } @@ -2264,7 +2264,7 @@ class TestHP3PARFCDriver(HP3PARBaseDriver, test.TestCase): mock.call.createHost( self.FAKE_HOST, FCWwns=['123456789012345', '123456789054321'], - optional={'domain': None, 'persona': 1}), + optional={'domain': None, 'persona': 2}), mock.call.getHost(self.FAKE_HOST)] mock_client.assert_has_calls(expected) @@ -2533,7 +2533,7 @@ class TestHP3PARISCSIDriver(HP3PARBaseDriver, test.TestCase): mock.call.findHost(iqn='iqn.1993-08.org.debian:01:222'), mock.call.createHost( self.FAKE_HOST, - optional={'domain': None, 'persona': 1}, + optional={'domain': None, 'persona': 2}, iscsiNames=['iqn.1993-08.org.debian:01:222']), mock.call.getHost(self.FAKE_HOST)] @@ -2588,7 +2588,7 @@ class TestHP3PARISCSIDriver(HP3PARBaseDriver, test.TestCase): mock.call.findHost(iqn='iqn.1993-08.org.debian:01:222'), mock.call.createHost( self.FAKE_HOST, - optional={'domain': None, 'persona': 1}, + optional={'domain': None, 'persona': 2}, iscsiNames=['iqn.1993-08.org.debian:01:222']), mock.call.modifyHost( 'fakehost', diff --git a/cinder/volume/drivers/san/hp/hp_3par_common.py b/cinder/volume/drivers/san/hp/hp_3par_common.py index 0087c7ca5..759c21737 100644 --- a/cinder/volume/drivers/san/hp/hp_3par_common.py +++ b/cinder/volume/drivers/san/hp/hp_3par_common.py @@ -145,10 +145,11 @@ class HP3PARCommon(object): This update now requires 3.1.3 MU1 firmware and hp3parclient 3.1.0 2.0.18 - HP 3PAR manage_existing with volume-type support + 2.0.19 - Update default persona from Generic to Generic-ALUA """ - VERSION = "2.0.18" + VERSION = "2.0.19" stats = {} @@ -166,8 +167,8 @@ class HP3PARCommon(object): # Valid values for volume type extra specs # The first value in the list is the default value valid_prov_values = ['thin', 'full'] - valid_persona_values = ['1 - Generic', - '2 - Generic-ALUA', + valid_persona_values = ['2 - Generic-ALUA', + '1 - Generic', '6 - Generic-legacy', '7 - HPUX-legacy', '8 - AIX-legacy', -- 2.45.2