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

diff --git a/cinder/tests/test_hp3par.py b/cinder/tests/test_hp3par.py
index a5b17227967ad2b5a225a167a4dec05e72e5c889..9875a5678d079427e3fd94333e28df437994d380 100644 (file)
--- 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 0087c7ca5acd313e723bf4c4e02c06a3e07f0567..759c2173765073d4f1ab52620b666e3147d8fd5b 100644 (file)
--- 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',