Added fixes and tests for issue Additional params in methods - create…

…_vd #2
Naudit · Mar 22, 2023 · 0cadbde · ulmitov · Mar 23, 2023 · 0cadbde
1 parent a742974
commit 0cadbde
Show file tree

Hide file tree

Showing 21 changed files with 1,263 additions and 12 deletions.
diff --git a/pystorcli2/controller.py b/pystorcli2/controller.py
@@ -13,7 +13,7 @@
 from . import virtualdrive
 from . import exc
 
-from typing import List
+from typing import List, Optional
 
 
 class ControllerMetrics(object):
@@ -274,7 +274,7 @@ def encls(self):
         """
         return enclosure.Enclosures(ctl_id=self._ctl_id, binary=self._binary)
 
-    def create_vd(self, name, raid, drives, strip='64'):
+    def create_vd(self, name: str, raid: str, drives: str, strip: str = '64', PDperArray: Optional[int] = None) -> Optional[virtualdrive.VirtualDrive]:
         """Create virtual drive (raid) managed by current controller
 
         Args:
@@ -290,12 +290,19 @@ def create_vd(self, name, raid, drives, strip='64'):
         args = [
             'add',
             'vd',
-            'type={0}'.format(raid),
+            'r{0}'.format(raid),
             'name={0}'.format(name),
             'drives={0}'.format(drives),
             'strip={0}'.format(strip)
         ]
 
+        if raid == '1' or raid == '10':
+            if PDperArray is None:
+                PDperArray = 2
+
+        if PDperArray is not None:
+            args.append('PDperArray={0}'.format(PDperArray))
+
         self._run(args)
         for vd in self.vds:
             if name == vd.name:
@@ -327,7 +334,7 @@ def __init__(self, binary='storcli64'):
         self._binary = binary
         self._storcli = StorCLI(binary)
 
-    @property
+    @ property
     def _ctl_ids(self) -> List[str]:
         out = self._storcli.run(['show'])
         response = common.response_data(out)
@@ -337,21 +344,21 @@ def _ctl_ids(self) -> List[str]:
         else:
             return [ctl['Ctl'] for ctl in common.response_data(out)['System Overview']]
 
-    @property
+    @ property
     def _ctls(self):
         for ctl_id in self._ctl_ids:
             yield Controller(ctl_id=ctl_id, binary=self._binary)
 
     def __iter__(self):
         return self._ctls
 
-    @property
+    @ property
     def ids(self):
         """(list of str): controllers id
         """
         return self._ctl_ids
 
-    def get_ctl(self, ctl_id):
+    def get_ctl(self, ctl_id: int) -> Optional[Controller]:
         """Get controller object by id
 
         Args:

diff --git a/pystorcli2/version.py b/pystorcli2/version.py
@@ -1 +1 @@
-__version__ = "0.5.0.6"
+__version__ = "0.5.0.8"
diff --git a/tests/baseTest.py b/tests/baseTest.py
@@ -25,13 +25,22 @@ def get_cmdRunner(self, folder: str, options: List[str] = []):
         return StorcliCMDFile(folder, options)
 
     def setupEnv(self, folder: str):
+        # Check if storcli exists in self
+        if hasattr(self, 'storcli'):
+            return
+
         # get cmdRunner
         cmdRunner = self.get_cmdRunner(folder)
 
         StorCLI.enable_singleton()
-        r = StorCLI(cmdrunner=cmdRunner)
-        r.clear_cache()
+        self.storcli = StorCLI(cmdrunner=cmdRunner)
+        self.storcli.clear_cache()
         # Conflirm cmdRunner is set properly
-        r.set_cmdrunner(cmdRunner)
+        self.storcli.set_cmdrunner(cmdRunner)
 
         return self.get_device_data(folder)
+
+    def get_storcli(self, folder: str):
+        self.setupEnv(folder)
+
+        return self.storcli
diff --git a/...t/create_vd_raid0_00/__c0_add_vd_r0_name=create_vd_raid0_drives=35_12-13_strip=512_J.json b/...t/create_vd_raid0_00/__c0_add_vd_r0_name=create_vd_raid0_drives=35_12-13_strip=512_J.json
@@ -0,0 +1,13 @@
+{
+    "Controllers": [
+        {
+            "Command Status": {
+                "CLI Version": "007.1704.0000.0000 Jan 16, 2021",
+                "Operating system": "Linux 5.15.0-58-generic",
+                "Controller": 0,
+                "Status": "Success",
+                "Description": "Add VD Succeeded."
+            }
+        }
+    ]
+}