Skip to content

Commit ffc0d7b

Browse files
mulkieranmulkieran
authored
Merge pull request #3854 from jbaublitz/r9
Bump revision to r9
2 parents 42fd9f4 + df59445 commit ffc0d7b

File tree

10 files changed

+258
-13
lines changed

10 files changed

+258
-13
lines changed

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "stratisd"
3-
version = "3.8.2"
3+
version = "3.9.0"
44
authors.workspace = true
55
edition.workspace = true
66
rust-version.workspace = true

‎src/dbus_api/api/mod.rs‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,20 @@ pub fn get_base_tree<'a>(
164164
.add_p(manager_3_0::version_property(&f))
165165
.add_p(manager_3_8::stopped_pools_property(&f)),
166166
)
167+
.add(
168+
f.interface(consts::MANAGER_INTERFACE_NAME_3_9, ())
169+
.add_m(manager_3_8::create_pool_method(&f))
170+
.add_m(manager_3_0::set_key_method(&f))
171+
.add_m(manager_3_0::unset_key_method(&f))
172+
.add_m(manager_3_0::list_keys_method(&f))
173+
.add_m(manager_3_0::destroy_pool_method(&f))
174+
.add_m(manager_3_0::engine_state_report_method(&f))
175+
.add_m(manager_3_8::start_pool_method(&f))
176+
.add_m(manager_3_6::stop_pool_method(&f))
177+
.add_m(manager_3_2::refresh_state_method(&f))
178+
.add_p(manager_3_0::version_property(&f))
179+
.add_p(manager_3_8::stopped_pools_property(&f)),
180+
)
167181
.add(
168182
f.interface(consts::REPORT_INTERFACE_NAME_3_0, ())
169183
.add_m(report_3_0::get_report_method(&f)),
@@ -199,6 +213,10 @@ pub fn get_base_tree<'a>(
199213
.add(
200214
f.interface(consts::REPORT_INTERFACE_NAME_3_8, ())
201215
.add_m(report_3_0::get_report_method(&f)),
216+
)
217+
.add(
218+
f.interface(consts::REPORT_INTERFACE_NAME_3_9, ())
219+
.add_m(report_3_0::get_report_method(&f)),
202220
);
203221

204222
let path = obj_path.get_name().to_owned();

‎src/dbus_api/blockdev/mod.rs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,19 @@ pub fn create_dbus_blockdev<'a>(
151151
.add_p(blockdev_3_0::physical_path_property(&f))
152152
.add_p(blockdev_3_0::size_property(&f))
153153
.add_p(blockdev_3_3::new_size_property(&f)),
154+
)
155+
.add(
156+
f.interface(consts::BLOCKDEV_INTERFACE_NAME_3_9, ())
157+
.add_p(blockdev_3_0::devnode_property(&f))
158+
.add_p(blockdev_3_0::hardware_info_property(&f))
159+
.add_p(blockdev_3_0::initialization_time_property(&f))
160+
.add_p(blockdev_3_0::pool_property(&f))
161+
.add_p(blockdev_3_0::tier_property(&f))
162+
.add_p(blockdev_3_3::user_info_property(&f))
163+
.add_p(blockdev_3_0::uuid_property(&f))
164+
.add_p(blockdev_3_0::physical_path_property(&f))
165+
.add_p(blockdev_3_0::size_property(&f))
166+
.add_p(blockdev_3_3::new_size_property(&f)),
154167
);
155168

156169
let path = object_path.get_name().to_owned();
@@ -261,6 +274,18 @@ pub fn get_blockdev_properties(
261274
consts::BLOCKDEV_NEW_SIZE_PROP => shared::blockdev_new_size_prop(dev)
262275
},
263276
consts::BLOCKDEV_INTERFACE_NAME_3_8 => {
277+
consts::BLOCKDEV_DEVNODE_PROP => shared::blockdev_devnode_prop(dev),
278+
consts::BLOCKDEV_HARDWARE_INFO_PROP => shared::blockdev_hardware_info_prop(dev),
279+
consts::BLOCKDEV_USER_INFO_PROP => shared::blockdev_user_info_prop(dev),
280+
consts::BLOCKDEV_INIT_TIME_PROP => shared::blockdev_init_time_prop(dev),
281+
consts::BLOCKDEV_POOL_PROP => parent.clone(),
282+
consts::BLOCKDEV_UUID_PROP => uuid_to_string!(dev_uuid),
283+
consts::BLOCKDEV_TIER_PROP => shared::blockdev_tier_prop(tier),
284+
consts::BLOCKDEV_PHYSICAL_PATH_PROP => shared::blockdev_physical_path_prop(dev),
285+
consts::BLOCKDEV_TOTAL_SIZE_PROP => shared::blockdev_size_prop(dev),
286+
consts::BLOCKDEV_NEW_SIZE_PROP => shared::blockdev_new_size_prop(dev)
287+
},
288+
consts::BLOCKDEV_INTERFACE_NAME_3_9 => {
264289
consts::BLOCKDEV_DEVNODE_PROP => shared::blockdev_devnode_prop(dev),
265290
consts::BLOCKDEV_HARDWARE_INFO_PROP => shared::blockdev_hardware_info_prop(dev),
266291
consts::BLOCKDEV_USER_INFO_PROP => shared::blockdev_user_info_prop(dev),

‎src/dbus_api/consts.rs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ pub const MANAGER_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.Manager.r5";
1616
pub const MANAGER_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.Manager.r6";
1717
pub const MANAGER_INTERFACE_NAME_3_7: &str = "org.storage.stratis3.Manager.r7";
1818
pub const MANAGER_INTERFACE_NAME_3_8: &str = "org.storage.stratis3.Manager.r8";
19+
pub const MANAGER_INTERFACE_NAME_3_9: &str = "org.storage.stratis3.Manager.r9";
1920
pub const REPORT_INTERFACE_NAME_3_0: &str = "org.storage.stratis3.Report.r0";
2021
pub const REPORT_INTERFACE_NAME_3_1: &str = "org.storage.stratis3.Report.r1";
2122
pub const REPORT_INTERFACE_NAME_3_2: &str = "org.storage.stratis3.Report.r2";
@@ -25,6 +26,7 @@ pub const REPORT_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.Report.r5";
2526
pub const REPORT_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.Report.r6";
2627
pub const REPORT_INTERFACE_NAME_3_7: &str = "org.storage.stratis3.Report.r7";
2728
pub const REPORT_INTERFACE_NAME_3_8: &str = "org.storage.stratis3.Report.r8";
29+
pub const REPORT_INTERFACE_NAME_3_9: &str = "org.storage.stratis3.Report.r9";
2830

2931
pub const LOCKED_POOLS_PROP: &str = "LockedPools";
3032
pub const STOPPED_POOLS_PROP: &str = "StoppedPools";
@@ -38,6 +40,7 @@ pub const POOL_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.pool.r5";
3840
pub const POOL_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.pool.r6";
3941
pub const POOL_INTERFACE_NAME_3_7: &str = "org.storage.stratis3.pool.r7";
4042
pub const POOL_INTERFACE_NAME_3_8: &str = "org.storage.stratis3.pool.r8";
43+
pub const POOL_INTERFACE_NAME_3_9: &str = "org.storage.stratis3.pool.r9";
4144
pub const POOL_NAME_PROP: &str = "Name";
4245
pub const POOL_UUID_PROP: &str = "Uuid";
4346
pub const POOL_HAS_CACHE_PROP: &str = "HasCache";
@@ -66,6 +69,7 @@ pub const FILESYSTEM_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.filesystem
6669
pub const FILESYSTEM_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.filesystem.r6";
6770
pub const FILESYSTEM_INTERFACE_NAME_3_7: &str = "org.storage.stratis3.filesystem.r7";
6871
pub const FILESYSTEM_INTERFACE_NAME_3_8: &str = "org.storage.stratis3.filesystem.r8";
72+
pub const FILESYSTEM_INTERFACE_NAME_3_9: &str = "org.storage.stratis3.filesystem.r9";
6973
pub const FILESYSTEM_NAME_PROP: &str = "Name";
7074
pub const FILESYSTEM_UUID_PROP: &str = "Uuid";
7175
pub const FILESYSTEM_USED_PROP: &str = "Used";
@@ -86,6 +90,7 @@ pub const BLOCKDEV_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.blockdev.r5"
8690
pub const BLOCKDEV_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.blockdev.r6";
8791
pub const BLOCKDEV_INTERFACE_NAME_3_7: &str = "org.storage.stratis3.blockdev.r7";
8892
pub const BLOCKDEV_INTERFACE_NAME_3_8: &str = "org.storage.stratis3.blockdev.r8";
93+
pub const BLOCKDEV_INTERFACE_NAME_3_9: &str = "org.storage.stratis3.blockdev.r9";
8994
pub const BLOCKDEV_DEVNODE_PROP: &str = "Devnode";
9095
pub const BLOCKDEV_HARDWARE_INFO_PROP: &str = "HardwareInfo";
9196
pub const BLOCKDEV_USER_INFO_PROP: &str = "UserInfo";
@@ -109,6 +114,7 @@ pub fn standard_pool_interfaces() -> Vec<String> {
109114
POOL_INTERFACE_NAME_3_6,
110115
POOL_INTERFACE_NAME_3_7,
111116
POOL_INTERFACE_NAME_3_8,
117+
POOL_INTERFACE_NAME_3_9,
112118
]
113119
.iter()
114120
.map(|s| (*s).to_string())
@@ -127,6 +133,7 @@ pub fn standard_filesystem_interfaces() -> Vec<String> {
127133
FILESYSTEM_INTERFACE_NAME_3_6,
128134
FILESYSTEM_INTERFACE_NAME_3_7,
129135
FILESYSTEM_INTERFACE_NAME_3_8,
136+
FILESYSTEM_INTERFACE_NAME_3_9,
130137
]
131138
.iter()
132139
.map(|s| (*s).to_string())
@@ -145,6 +152,7 @@ pub fn standard_blockdev_interfaces() -> Vec<String> {
145152
BLOCKDEV_INTERFACE_NAME_3_6,
146153
BLOCKDEV_INTERFACE_NAME_3_7,
147154
BLOCKDEV_INTERFACE_NAME_3_8,
155+
BLOCKDEV_INTERFACE_NAME_3_9,
148156
]
149157
.iter()
150158
.map(|s| (*s).to_string())

‎src/dbus_api/filesystem/mod.rs‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,20 @@ pub fn create_dbus_filesystem<'a>(
142142
.add_p(filesystem_3_6::size_limit_property(&f))
143143
.add_p(filesystem_3_7::origin_property(&f))
144144
.add_p(filesystem_3_7::merge_scheduled_property(&f)),
145+
)
146+
.add(
147+
f.interface(consts::FILESYSTEM_INTERFACE_NAME_3_9, ())
148+
.add_m(filesystem_3_0::rename_method(&f))
149+
.add_p(filesystem_3_0::devnode_property(&f))
150+
.add_p(filesystem_3_0::name_property(&f))
151+
.add_p(filesystem_3_0::pool_property(&f))
152+
.add_p(filesystem_3_0::uuid_property(&f))
153+
.add_p(filesystem_3_0::created_property(&f))
154+
.add_p(filesystem_3_0::size_property(&f))
155+
.add_p(filesystem_3_0::used_property(&f))
156+
.add_p(filesystem_3_6::size_limit_property(&f))
157+
.add_p(filesystem_3_7::origin_property(&f))
158+
.add_p(filesystem_3_7::merge_scheduled_property(&f)),
145159
);
146160

147161
let path = object_path.get_name().to_owned();
@@ -236,6 +250,18 @@ pub fn get_fs_properties(
236250
consts::FILESYSTEM_MERGE_SCHEDULED_PROP => shared::fs_merge_scheduled_prop(fs)
237251
},
238252
consts::FILESYSTEM_INTERFACE_NAME_3_8 => {
253+
consts::FILESYSTEM_NAME_PROP => shared::fs_name_prop(fs_name),
254+
consts::FILESYSTEM_UUID_PROP => uuid_to_string!(fs_uuid),
255+
consts::FILESYSTEM_DEVNODE_PROP => shared::fs_devnode_prop(fs, pool_name, fs_name),
256+
consts::FILESYSTEM_POOL_PROP => parent.clone(),
257+
consts::FILESYSTEM_CREATED_PROP => shared::fs_created_prop(fs),
258+
consts::FILESYSTEM_SIZE_PROP => shared::fs_size_prop(fs),
259+
consts::FILESYSTEM_USED_PROP => shared::fs_used_prop(fs),
260+
consts::FILESYSTEM_SIZE_LIMIT_PROP => shared::fs_size_limit_prop(fs),
261+
consts::FILESYSTEM_ORIGIN_PROP => shared::fs_origin_prop(fs),
262+
consts::FILESYSTEM_MERGE_SCHEDULED_PROP => shared::fs_merge_scheduled_prop(fs)
263+
},
264+
consts::FILESYSTEM_INTERFACE_NAME_3_9 => {
239265
consts::FILESYSTEM_NAME_PROP => shared::fs_name_prop(fs_name),
240266
consts::FILESYSTEM_UUID_PROP => uuid_to_string!(fs_uuid),
241267
consts::FILESYSTEM_DEVNODE_PROP => shared::fs_devnode_prop(fs, pool_name, fs_name),

‎src/dbus_api/pool/mod.rs‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -310,6 +310,41 @@ pub fn create_dbus_pool<'a>(
310310
.add_p(pool_3_8::metadata_version_property(&f))
311311
.add_p(pool_3_8::free_token_slots_property(&f))
312312
.add_p(pool_3_8::volume_key_loaded_property(&f)),
313+
)
314+
.add(
315+
f.interface(consts::POOL_INTERFACE_NAME_3_9, ())
316+
.add_m(pool_3_6::create_filesystems_method(&f))
317+
.add_m(pool_3_7::destroy_filesystems_method(&f))
318+
.add_m(pool_3_0::snapshot_filesystem_method(&f))
319+
.add_m(pool_3_0::add_blockdevs_method(&f))
320+
.add_m(pool_3_8::bind_clevis_method(&f))
321+
.add_m(pool_3_8::unbind_clevis_method(&f))
322+
.add_m(pool_3_5::init_cache_method(&f))
323+
.add_m(pool_3_0::add_cachedevs_method(&f))
324+
.add_m(pool_3_8::bind_keyring_method(&f))
325+
.add_m(pool_3_8::unbind_keyring_method(&f))
326+
.add_m(pool_3_8::rebind_keyring_method(&f))
327+
.add_m(pool_3_8::rebind_clevis_method(&f))
328+
.add_m(pool_3_0::rename_method(&f))
329+
.add_m(pool_3_3::grow_physical_device_method(&f))
330+
.add_m(pool_3_7::get_metadata_method(&f))
331+
.add_m(pool_3_7::get_fs_metadata_method(&f))
332+
.add_p(pool_3_0::name_property(&f))
333+
.add_p(pool_3_0::uuid_property(&f))
334+
.add_p(pool_3_0::encrypted_property(&f))
335+
.add_p(pool_3_0::avail_actions_property(&f))
336+
.add_p(pool_3_8::key_descs_property(&f))
337+
.add_p(pool_3_8::clevis_infos_property(&f))
338+
.add_p(pool_3_0::has_cache_property(&f))
339+
.add_p(pool_3_0::alloc_size_property(&f))
340+
.add_p(pool_3_0::used_size_property(&f))
341+
.add_p(pool_3_0::total_size_property(&f))
342+
.add_p(pool_3_1::fs_limit_property(&f))
343+
.add_p(pool_3_1::enable_overprov_property(&f))
344+
.add_p(pool_3_1::no_alloc_space_property(&f))
345+
.add_p(pool_3_8::metadata_version_property(&f))
346+
.add_p(pool_3_8::free_token_slots_property(&f))
347+
.add_p(pool_3_8::volume_key_loaded_property(&f)),
313348
);
314349

315350
let path = object_path.get_name().to_owned();
@@ -459,6 +494,24 @@ pub fn get_pool_properties(
459494
consts::POOL_METADATA_VERSION_PROP => shared::pool_metadata_version(pool),
460495
consts::POOL_FREE_TOKEN_SLOTS_PROP => shared::pool_free_token_slots(pool),
461496
consts::POOL_VOLUME_KEY_LOADED => shared::pool_volume_key_loaded(pool, pool_uuid)
497+
},
498+
consts::POOL_INTERFACE_NAME_3_9 => {
499+
consts::POOL_NAME_PROP => shared::pool_name_prop(pool_name),
500+
consts::POOL_UUID_PROP => uuid_to_string!(pool_uuid),
501+
consts::POOL_ENCRYPTED_PROP => shared::pool_enc_prop(pool),
502+
consts::POOL_AVAIL_ACTIONS_PROP => shared::pool_avail_actions_prop(pool),
503+
consts::POOL_KEY_DESCS_PROP => shared::pool_key_descs_prop(pool),
504+
consts::POOL_CLEVIS_INFOS_PROP => shared::pool_clevis_infos_prop(pool),
505+
consts::POOL_HAS_CACHE_PROP => shared::pool_has_cache_prop(pool),
506+
consts::POOL_ALLOC_SIZE_PROP => shared::pool_allocated_size(pool),
507+
consts::POOL_TOTAL_USED_PROP => shared::pool_used_size(pool),
508+
consts::POOL_TOTAL_SIZE_PROP => shared::pool_total_size(pool),
509+
consts::POOL_FS_LIMIT_PROP => shared::pool_fs_limit(pool),
510+
consts::POOL_OVERPROV_PROP => shared::pool_overprov_enabled(pool),
511+
consts::POOL_NO_ALLOCABLE_SPACE_PROP => shared::pool_no_alloc_space(pool),
512+
consts::POOL_METADATA_VERSION_PROP => shared::pool_metadata_version(pool),
513+
consts::POOL_FREE_TOKEN_SLOTS_PROP => shared::pool_free_token_slots(pool),
514+
consts::POOL_VOLUME_KEY_LOADED => shared::pool_volume_key_loaded(pool, pool_uuid)
462515
}
463516
}
464517
}

0 commit comments

Comments
 (0)