Fix vsp driver issue

sodafoundation · Nov 27, 2020 · deb23be · deb23be
1 parent ae88070
commit deb23be
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/delfin/drivers/ibm/storwize_svc/ssh_handler.py b/delfin/drivers/ibm/storwize_svc/ssh_handler.py
@@ -77,7 +77,7 @@ def parse_alert(alert):
             alert_model['alert_id'] = str(alert_id)
             alert_model['alert_name'] = alert_name
             alert_model['severity'] = severity
-            alert_model['category'] = 'Fault'
+            alert_model['category'] = constants.Category.FAULT
             alert_model['type'] = constants.EventType.EQUIPMENT_ALARM
             alert_model['sequence_number'] = SSHHandler. \
                 handle_split(alert.get(SSHHandler.OID_SEQ_NUMBER), '=', 1)
@@ -130,7 +130,7 @@ def do_exec(command_str, ssh):
                 raise exception.SSHConnectTimeout()
             elif 'No authentication methods available' in err \
                     or 'Authentication failed' in err:
-                raise exception.SSHInvalidUsernameOrPassword()
+                raise exception.InvalidUsernameOrPassword()
             elif 'not a valid RSA private key file' in err:
                 raise exception.InvalidPrivateKey()
             else:
@@ -192,7 +192,7 @@ def get_storage(self):
             raw_capacity = self.parse_string(storage_map.get(
                 'total_drive_raw_capacity'))
             subscribed_capacity = self.parse_string(storage_map.get(
-                'total_allocated_extent_capacity'))
+                'virtual_capacity'))
             s = {
                 'name': storage_map.get('name'),
                 'vendor': 'IBM',
@@ -248,8 +248,6 @@ def list_storage_pools(self, storage_id):
                 total_cap = self.parse_string(pool_map.get('capacity'))
                 free_cap = self.parse_string(pool_map.get('free_capacity'))
                 used_cap = self.parse_string(pool_map.get('used_capacity'))
-                subscribed_cap = self.parse_string(pool_map.
-                                                   get('real_capacity'))
                 p = {
                     'name': pool_map.get('name'),
                     'storage_id': storage_id,
@@ -258,7 +256,6 @@ def list_storage_pools(self, storage_id):
                     'status': status,
                     'storage_type': constants.StorageType.BLOCK,
                     'total_capacity': int(total_cap),
-                    'subscribed_capacity': int(subscribed_cap),
                     'used_capacity': int(used_cap),
                     'free_capacity': int(free_cap)
                 }
@@ -380,7 +377,7 @@ def list_alerts(self, query_para):
                     'alert_id': event_id,
                     'alert_name': alert_name,
                     'severity': severity,
-                    'category': 'Fault',
+                    'category': constants.Category.FAULT,
                     'type': 'EquipmentAlarm',
                     'sequence_number': alert_map.get('sequence_number'),
                     'occur_time': time_stamp,

diff --git a/delfin/drivers/ibm/storwize_svc/storwize_svc.py b/delfin/drivers/ibm/storwize_svc/storwize_svc.py
@@ -14,6 +14,7 @@
 
 from delfin.drivers import driver
 from delfin.drivers.ibm.storwize_svc import ssh_handler
+from delfin.drivers.ibm.storwize_svc.ssh_handler import SSHHandler
 
 
 class StorwizeSVCDriver(driver.StorageDriver):
@@ -46,7 +47,7 @@ def remove_trap_config(self, context, trap_config):
 
     @staticmethod
     def parse_alert(context, alert):
-        return ssh_handler.SSHHandler().parse_alert(alert)
+        return SSHHandler.parse_alert(alert)
 
     def clear_alert(self, context, alert):
         pass
diff --git a/delfin/tests/unit/drivers/ibm/storwize_svc/test_ibm_storwize_svc.py b/delfin/tests/unit/drivers/ibm/storwize_svc/test_ibm_storwize_svc.py
@@ -405,7 +405,7 @@ def test_ssh_pool_put(self):
         ssh_pool.remove(ssh)
 
     def test_parse_alert(self):
-        SSHHandler.parse_alert(trap_info)
+        self.driver.parse_alert(context, trap_info)
 
     def test_reset_connection(self):
         self.driver.reset_connection(context, **ACCESS_INFO)