From 36f96fea9b82f9c4de798add3fdbc8fa55db8f9b Mon Sep 17 00:00:00 2001 From: os-d Date: Wed, 22 May 2019 13:53:33 -0400 Subject: [PATCH] Add ability to set T10 Vendor ID for backstore --- targetcli/ui_backstore.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/targetcli/ui_backstore.py b/targetcli/ui_backstore.py index a42d1bd..0380456 100644 --- a/targetcli/ui_backstore.py +++ b/targetcli/ui_backstore.py @@ -381,7 +381,7 @@ def __init__(self, parent): self.so_cls = UIRamdiskStorageObject UIBackstore.__init__(self, 'ramdisk', parent) - def ui_command_create(self, name, size, nullio=None, wwn=None): + def ui_command_create(self, name, size, nullio=None, wwn=None, vendor_id=None): ''' Creates an RDMCP storage object. I{size} is the size of the ramdisk. @@ -400,7 +400,8 @@ def ui_command_create(self, name, size, nullio=None, wwn=None): nullio = self.ui_eval_param(nullio, 'bool', False) wwn = self.ui_eval_param(wwn, 'string', None) - so = RDMCPStorageObject(name, human_to_bytes(size), nullio=nullio, wwn=wwn) + so = RDMCPStorageObject(name, human_to_bytes(size), nullio=nullio, wwn=wwn, + vendor_id=vendor_id) ui_so = UIRamdiskStorageObject(so, self) self.setup_model_alias(so) self.shell.log.info("Created ramdisk %s with size %s." @@ -555,7 +556,8 @@ def _ui_block_ro_check(self, dev): return False return True - def ui_command_create(self, name, dev, readonly=None, wwn=None): + def ui_command_create(self, name, dev, readonly=None, wwn=None, + vendor_id=None): ''' Creates an Block Storage object. I{dev} is the path to the TYPE_DISK block device to use. @@ -571,7 +573,8 @@ def ui_command_create(self, name, dev, readonly=None, wwn=None): wwn = self.ui_eval_param(wwn, 'string', None) - so = BlockStorageObject(name, dev, readonly=readonly, wwn=wwn) + so = BlockStorageObject(name, dev, readonly=readonly, wwn=wwn, + vendor_id=vendor_id) ui_so = UIBlockStorageObject(so, self) self.setup_model_alias(so) self.shell.log.info("Created block storage object %s using %s." @@ -620,7 +623,8 @@ def ui_command_help(self, topic=None): print() def ui_command_create(self, name, size, cfgstring, wwn=None, - hw_max_sectors=None, control=None): + hw_max_sectors=None, control=None, + vendor_id=None): ''' Creates a User-backed storage object. @@ -637,6 +641,7 @@ def ui_command_create(self, name, size, cfgstring, wwn=None, size = human_to_bytes(size) wwn = self.ui_eval_param(wwn, 'string', None) + vendor_id = self.ui_eval_param(vendor_id, 'string', None) config = self.handler + "/" + cfgstring @@ -647,7 +652,7 @@ def ui_command_create(self, name, size, cfgstring, wwn=None, try: so = UserBackedStorageObject(name, size=size, config=config, wwn=wwn, hw_max_sectors=hw_max_sectors, - control=control) + control=control, vendor_id=vendor_id) except: raise ExecutionError("UserBackedStorageObject creation failed.")