Remove core id - update tests

This commit is contained in:
Robert Baldyga 2019-07-25 16:03:03 +02:00
parent 92c7e12549
commit 37396e7f1b

View File

@ -38,10 +38,9 @@ class UserMetadata(Structure):
class CoreConfig(Structure): class CoreConfig(Structure):
_fields_ = [ _fields_ = [
("_name", c_char_p),
("_uuid", Uuid), ("_uuid", Uuid),
("_volume_type", c_uint8), ("_volume_type", c_uint8),
("_core_id", c_uint16),
("_name", c_char_p),
("_try_add", c_bool), ("_try_add", c_bool),
("_seq_cutoff_threshold", c_uint32), ("_seq_cutoff_threshold", c_uint32),
("_user_metadata", UserMetadata), ("_user_metadata", UserMetadata),
@ -57,13 +56,11 @@ class Core:
device: Volume, device: Volume,
try_add: bool, try_add: bool,
name: str = "core", name: str = "core",
core_id: int = DEFAULT_ID,
seq_cutoff_threshold: int = DEFAULT_SEQ_CUTOFF_THRESHOLD, seq_cutoff_threshold: int = DEFAULT_SEQ_CUTOFF_THRESHOLD,
): ):
self.cache = None self.cache = None
self.device = device self.device = device
self.device_name = device.uuid self.device_name = device.uuid
self.core_id = core_id
self.handle = c_void_p() self.handle = c_void_p()
self.cfg = CoreConfig( self.cfg = CoreConfig(
_uuid=Uuid( _uuid=Uuid(
@ -73,7 +70,6 @@ class Core:
), ),
_size=len(self.device_name) + 1, _size=len(self.device_name) + 1,
), ),
_core_id=self.core_id,
_name=cast(create_string_buffer(name.encode("ascii")), c_char_p), _name=cast(create_string_buffer(name.encode("ascii")), c_char_p),
_volume_type=self.device.type_id, _volume_type=self.device.type_id,
_try_add=try_add, _try_add=try_add,