diff --git a/bareon/drivers/deploy/generic.py b/bareon/drivers/deploy/generic.py index c7d0f3b..96b0536 100644 --- a/bareon/drivers/deploy/generic.py +++ b/bareon/drivers/deploy/generic.py @@ -505,7 +505,7 @@ class PartitionPolicyClean(AbstractPartitionPolicy): lu.pvremove_all() def _handle_disk(self, disk): - gdisk = block_device.GDisk(disk.dev) + gdisk = block_device.SGDisk(disk.dev) gdisk.zap() try: diff --git a/bareon/utils/block_device.py b/bareon/utils/block_device.py index 2c6be71..2c86d1f 100644 --- a/bareon/utils/block_device.py +++ b/bareon/utils/block_device.py @@ -32,7 +32,7 @@ from bareon.utils import utils LOG = logging.getLogger(__name__) -class GDisk(object): +class SGDisk(object): def __init__(self, dev): self.dev = dev @@ -60,7 +60,7 @@ class GDisk(object): output = utils.execute( 'sgdisk', '--info', '{}'.format(partition.index), self.dev)[0] - guid = _GDiskInfo(output).guid + guid = _SGDiskInfo(output).guid return guid @@ -510,7 +510,7 @@ class Disk(BlockDevicePayload, AbstractStorage): @classmethod def new_by_scan(cls, dev, partitions=True): output = utils.execute('sgdisk', '--print', dev)[0] - disk_info = _GDiskPrint(output) + disk_info = _SGDiskPrint(output) disk_block = _BlockDevice( dev, disk_info.sectors, disk_info.sector_size) @@ -530,7 +530,7 @@ class Disk(BlockDevicePayload, AbstractStorage): output = utils.execute( 'sgdisk', '--info', '{}'.format(listing_info.index), disk_block.dev)[0] - detailed_info = _GDiskInfo(output) + detailed_info = _SGDiskInfo(output) dev = disk_block.device_by_index(listing_info.index) block = _BlockDevice( @@ -971,7 +971,7 @@ class _BlockDevice(object): return any('boot sector' in x for x in records) -class _GDiskMessage(object): +class _SGDiskMessage(object): _payload_field_match_rules = () _payload_field_converts = {} _payload_mandatory_fields = frozenset() @@ -1092,7 +1092,7 @@ class _GDiskMessage(object): return chars.pop() == '*' -class _GDiskPrint(_GDiskMessage): +class _SGDiskPrint(_SGDiskMessage): _payload_field_match_rules = ( re.compile(r'^[Dd]isk\s+(?P/dev/[A-Za-z][A-Za-z0-9]+): ' r'(?P\d+) sectors'), @@ -1127,7 +1127,7 @@ class _GDiskPrint(_GDiskMessage): align = 1 def __init__(self, data): - super(_GDiskPrint, self).__init__(data) + super(_SGDiskPrint, self).__init__(data) table_format = 'gpt' if self._notice: @@ -1168,7 +1168,7 @@ class _GDiskPrint(_GDiskMessage): return partitions -class _GDiskInfo(_GDiskMessage): +class _SGDiskInfo(_SGDiskMessage): _payload_field_match_rules = ( re.compile(r'^[Pp]artition\s+unique\s+GUID:\s*(?P\S+)$'), re.compile(r'^[Ff]irst\s+sector:\s+(?P\d+)\s+\('), @@ -1189,7 +1189,7 @@ class _GDiskInfo(_GDiskMessage): guid = begin = end = size = attributes = None def __init__(self, data): - super(_GDiskInfo, self).__init__(data) + super(_SGDiskInfo, self).__init__(data) for field, value in self._payload.items(): setattr(self, field, value)