Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

macro_san storage serial_number #954

Closed
wants to merge 2 commits into from
Closed

macro_san storage serial_number #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d41fed
edit storage serial_number
zhilong-xu Dec 6, 2022
1a089db
Merge pull request #606 from zhilong-xu/macro_san
ghxiaobo Dec 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions delfin/drivers/macro_san/ms/ms_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def get_storage(self, storage_id):
if not storage_data_map:
raise exception.SSHException('The command returns empty data')
device_uuid = storage_data_map.get('DeviceUUID')
serial_number = '{}/{}'.format(self.ssh_host, device_uuid)
serial_number = '{}:{}'.format(self.ssh_host, device_uuid)
storage_name = storage_data_map.get('DeviceName')
firmware_version = self.get_firmware_version()
pools = self.list_storage_pools(storage_id)
Expand Down Expand Up @@ -1048,7 +1048,7 @@ def get_storages(self):
device_uuid = storage_data_map.get('DeviceUUID')
storage_name = storage_data_map.get('DeviceName')
resource_name = storage_name if storage_name else device_uuid
resource_id = '{}/{}'.format(self.ssh_host, device_uuid)
resource_id = '{}:{}'.format(self.ssh_host, device_uuid)
return resource_id, resource_name

def down_perf_file(self, folder, storage_id, pattern):
Expand Down
4 changes: 2 additions & 2 deletions delfin/tests/unit/drivers/macro_san/ms/test_ms_stor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -864,7 +864,7 @@
STORAGE_DATA = {
'name': '0x00b34202-fea90000-fa41e0d6-ded905a8',
'vendor': 'MacroSAN', 'status': 'normal',
'serial_number': '110.143.133.200/0x00b34202-fea90000-fa41e0d6-ded905a8',
'serial_number': '110.143.133.200:0x00b34202-fea90000-fa41e0d6-ded905a8',
'firmware_version': 'V2.0.14T04',
'raw_capacity': 1917702897664.0,
'total_capacity': 7670811590656.0,
Expand All @@ -875,7 +875,7 @@
STORAGE_TWO_DATA = {
'name': 'Storage-1', 'vendor': 'MacroSAN',
'status': 'normal',
'serial_number': '110.143.133.200/0x50b34200-0b750056-42ab74ff-6265d80e',
'serial_number': '110.143.133.200:0x50b34200-0b750056-42ab74ff-6265d80e',
'firmware_version': 'V2.0.14T04',
'raw_capacity': 1917702897664.0,
'total_capacity': 7670811590656.0,
Expand Down