Adding disktype while creating the CPG. The value of this parameter i…

…s ssd for C8K array.
hpe-storage · Feb 7, 2017 · f785fe2 · f785fe2
1 parent eddb1b7
commit f785fe2
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/config.ini b/config.ini
@@ -6,6 +6,7 @@ unit=true
 debug=false
 3par_url=http://10.10.##.##:8008/api/v1
 cpg_ldlayout_ha=3
+disk_type=3
 domain=UNIT_TEST_DOMAIN
 missing_key_policy=AutoAddPolicy
 # skip_file_persona: Set to true when using an array without File Persona

diff --git a/test/HPE3ParClient_base.py b/test/HPE3ParClient_base.py
@@ -71,7 +71,15 @@ class HPE3ParClientBaseTestCase(unittest.TestCase):
 
     if 'cpg_ldlayout_ha' in config['TEST']:
         CPG_LDLAYOUT_HA = int(config['TEST']['cpg_ldlayout_ha'])
-        CPG_OPTIONS = {'domain': DOMAIN, 'LDLayout': {'HA': CPG_LDLAYOUT_HA}}
+        if 'disk_type' in config['TEST']:
+            DISK_TYPE = int(config['TEST']['disk_type'])
+            CPG_OPTIONS = {'domain': DOMAIN,
+                           'LDLayout': {'HA': CPG_LDLAYOUT_HA,
+                                        'diskPatterns': [{'diskType':
+                                                         DISK_TYPE}]}}
+        else:
+            CPG_OPTIONS = {'domain': DOMAIN,
+                           'LDLayout': {'HA': CPG_LDLAYOUT_HA}}
     else:
         CPG_LDLAYOUT_HA = None
         CPG_OPTIONS = {'domain': DOMAIN}

diff --git a/test/test_HPE3ParClient_CPG.py b/test/test_HPE3ParClient_CPG.py
@@ -61,8 +61,14 @@ def test_1_create_CPG(self):
         if self.CPG_LDLAYOUT_HA is None:
             more_optional = {'LDLayout': {'RAIDType': 2}}
         else:
-            more_optional = {'LDLayout': {'RAIDType': 2,
-                                          'HA': self.CPG_LDLAYOUT_HA}}
+            if self.DISK_TYPE is None:
+                more_optional = {'LDLayout': {'RAIDType': 2,
+                                 'HA': self.CPG_LDLAYOUT_HA}}
+            else:
+                more_optional = {'LDLayout': {'RAIDType': 2,
+                                              'HA': self.CPG_LDLAYOUT_HA,
+                                              'diskPatterns':
+                                              [{'diskType': self.DISK_TYPE}]}}
         optional2.update(more_optional)
         self.cl.createCPG(name, optional2)
 
@@ -77,7 +83,11 @@ def test_1_create_CPG(self):
     def test_1_create_CPG_badDomain(self):
         self.printHeader('create_CPG_badDomain')
 
-        optional = {'domain': 'BAD_DOMAIN'}
+        if self.DISK_TYPE is None:
+            optional = {'domain': 'BAD_DOMAIN'}
+        else:
+            optional = {'LDLayout': {'diskPatterns': [{
+                        'diskType': self.DISK_TYPE}]}, 'domain': 'BAD_DOMAIN'}
         self.assertRaises(exceptions.HTTPNotFound, self.cl.createCPG,
                           CPG_NAME1, optional)