  class PhysicalDisk(PhysicalDiskTuple):
  
      def __new__(cls, **kwargs):
-@@ -633,15 +637,17 @@
+@@ -231,7 +235,12 @@
+         drac_raid_level = self._get_virtual_disk_attr(drac_disk, 'RAIDTypes')
+         size_b = self._get_virtual_disk_attr(drac_disk, 'SizeInBytes')
+         drac_status = self._get_virtual_disk_attr(drac_disk, 'PrimaryStatus')
+-        drac_raid_status = self._get_virtual_disk_attr(drac_disk, 'RAIDStatus')
++        drac_raid_status = self._get_virtual_disk_attr(
++            drac_disk, 'RAIDStatus', allow_missing=True)
++        if drac_raid_status is None:
++            drac_raid_status = self._get_virtual_disk_attr(
++                drac_disk, 'RaidStatus')
++
+         drac_pending_operations = self._get_virtual_disk_attr(
+             drac_disk, 'PendingOperations')
+ 
+@@ -256,10 +265,12 @@
+             physical_disks=self._get_virtual_disk_attrs(drac_disk,
+                                                         'PhysicalDiskIDs'))
+ 
+-    def _get_virtual_disk_attr(self, drac_disk, attr_name, nullable=False):
++    def _get_virtual_disk_attr(self, drac_disk, attr_name,
++                               nullable=False, allow_missing=False):
+         return utils.get_wsman_resource_attr(
+             drac_disk, uris.DCIM_VirtualDiskView, attr_name,
+-            nullable=nullable)
++            nullable=nullable,
++            allow_missing=allow_missing)
+ 
+     def _get_virtual_disk_attrs(self, drac_disk, attr_name):
+         return utils.get_all_wsman_resource_attrs(
+@@ -633,15 +644,17 @@
          :param mode: constants.RaidStatus enumeration used to
                       determine what raid status to check for.
          :param physical_disks: all physical disks

             if physical_disk_ids:
                 LOG.debug("Converting the following disks to {} on RAID "
                           "controller {}: {}".format(
@@ -773,22 +783,39 @@
                     if constants.NOT_SUPPORTED_MSG in str(ex):
                         LOG.debug("Controller {} does not support "
                                   "JBOD mode".format(controller))

         p_disk_id_to_status = {}
         for physical_disk in physical_disks:
             p_disk_id_to_status[physical_disk.id] = physical_disk.raid_status
@@ -700,34 +713,37 @@
 
             raise ValueError(error_msg)
 
