Merge pull request #929 from qinwang-murphy/add_disk_type

add disk type and the dependency package of xlrd
sodafoundation · Oct 27, 2022 · f5b25eb · f5b25eb
2 parents 4ef0c82 + 739fe39
commit f5b25eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/delfin/common/constants.py b/delfin/common/constants.py
@@ -154,11 +154,12 @@ class DiskPhysicalType(object):
     NL_SAS = 'nl-sas'
     SSD_CARD = 'ssd-card'
     SAS_FLASH_VP = 'sas-flash-vp'
+    HDD = 'hdd'
     UNKNOWN = 'unknown'
 
     ALL = (
         SATA, SAS, SSD, NL_SSD, FC, LUN, ATA, FLASH, VMDISK,
-        NL_SAS, SSD_CARD, SAS_FLASH_VP, UNKNOWN)
+        NL_SAS, SSD_CARD, SAS_FLASH_VP, HDD, UNKNOWN)
 
 
 class DiskLogicalType(object):
@@ -177,11 +178,12 @@ class DiskLogicalType(object):
     UNSUPPORTED = 'unsupported'
     REMOTE = 'remote'
     MEDIATOR = 'mediator'
+    DATA = 'data'
     UNKNOWN = 'unknown'
 
     ALL = (FREE, MEMBER, HOTSPARE, CACHE, AGGREGATE, BROKEN, FOREIGN,
            LABELMAINT, MAINTENANCE, SHARED, SPARE, UNASSIGNED, UNSUPPORTED,
-           REMOTE, MEDIATOR, UNKNOWN)
+           REMOTE, MEDIATOR, DATA, UNKNOWN)
 
 
 class FilesystemStatus(object):

diff --git a/requirements.txt b/requirements.txt
@@ -44,3 +44,4 @@ tenacity==6.3.1
 tzlocal<3.0
 scp>=0.13.0
 defusedxml==0.6.0
+xlrd>=2.0.1