Merge pull request stratis-storage#3295 from jbaublitz/3r6

Update to 3.6.0
mulkieran · May 1, 2023 · 8eefece · 8eefece
2 parents 02bd6e7 + c97dc6c
commit 8eefece
Show file tree

Hide file tree

Showing 11 changed files with 235 additions and 14 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "stratisd"
-version = "3.5.4"
+version = "3.6.0"
 authors = ["Stratis Developers <[email protected]>"]
 edition = "2021"
 rust-version = "1.66.1"  # LOWEST SUPPORTED RUST TOOLCHAIN

diff --git a/src/dbus_api/api/mod.rs b/src/dbus_api/api/mod.rs
@@ -126,6 +126,20 @@ where
                 .add_p(manager_3_0::version_property(&f))
                 .add_p(manager_3_2::stopped_pools_property(&f)),
         )
+        .add(
+            f.interface(consts::MANAGER_INTERFACE_NAME_3_6, ())
+                .add_m(manager_3_5::create_pool_method(&f))
+                .add_m(manager_3_0::set_key_method(&f))
+                .add_m(manager_3_0::unset_key_method(&f))
+                .add_m(manager_3_0::list_keys_method(&f))
+                .add_m(manager_3_0::destroy_pool_method(&f))
+                .add_m(manager_3_0::engine_state_report_method(&f))
+                .add_m(manager_3_4::start_pool_method(&f))
+                .add_m(manager_3_2::stop_pool_method(&f))
+                .add_m(manager_3_2::refresh_state_method(&f))
+                .add_p(manager_3_0::version_property(&f))
+                .add_p(manager_3_2::stopped_pools_property(&f)),
+        )
         .add(
             f.interface(consts::REPORT_INTERFACE_NAME_3_0, ())
                 .add_m(report_3_0::get_report_method(&f)),
@@ -149,6 +163,10 @@ where
         .add(
             f.interface(consts::REPORT_INTERFACE_NAME_3_5, ())
                 .add_m(report_3_0::get_report_method(&f)),
+        )
+        .add(
+            f.interface(consts::REPORT_INTERFACE_NAME_3_6, ())
+                .add_m(report_3_0::get_report_method(&f)),
         );
 
     let path = obj_path.get_name().to_owned();

diff --git a/src/dbus_api/blockdev/mod.rs b/src/dbus_api/blockdev/mod.rs
@@ -115,6 +115,19 @@ where
                 .add_p(blockdev_3_0::physical_path_property(&f))
                 .add_p(blockdev_3_0::size_property(&f))
                 .add_p(blockdev_3_3::new_size_property(&f)),
+        )
+        .add(
+            f.interface(consts::BLOCKDEV_INTERFACE_NAME_3_6, ())
+                .add_p(blockdev_3_0::devnode_property(&f))
+                .add_p(blockdev_3_0::hardware_info_property(&f))
+                .add_p(blockdev_3_0::initialization_time_property(&f))
+                .add_p(blockdev_3_0::pool_property(&f))
+                .add_p(blockdev_3_0::tier_property(&f))
+                .add_p(blockdev_3_3::user_info_property(&f))
+                .add_p(blockdev_3_0::uuid_property(&f))
+                .add_p(blockdev_3_0::physical_path_property(&f))
+                .add_p(blockdev_3_0::size_property(&f))
+                .add_p(blockdev_3_3::new_size_property(&f)),
         );
 
     let path = object_path.get_name().to_owned();
@@ -192,6 +205,18 @@ where
             consts::BLOCKDEV_NEW_SIZE_PROP => shared::blockdev_new_size_prop::<E>(dev)
         },
         consts::BLOCKDEV_INTERFACE_NAME_3_5 => {
+            consts::BLOCKDEV_DEVNODE_PROP => shared::blockdev_devnode_prop::<E>(dev),
+            consts::BLOCKDEV_HARDWARE_INFO_PROP => shared::blockdev_hardware_info_prop::<E>(dev),
+            consts::BLOCKDEV_USER_INFO_PROP => shared::blockdev_user_info_prop::<E>(dev),
+            consts::BLOCKDEV_INIT_TIME_PROP => shared::blockdev_init_time_prop::<E>(dev),
+            consts::BLOCKDEV_POOL_PROP => parent.clone(),
+            consts::BLOCKDEV_UUID_PROP => uuid_to_string!(dev_uuid),
+            consts::BLOCKDEV_TIER_PROP => shared::blockdev_tier_prop(tier),
+            consts::BLOCKDEV_PHYSICAL_PATH_PROP => shared::blockdev_physical_path_prop::<E>(dev),
+            consts::BLOCKDEV_TOTAL_SIZE_PROP => shared::blockdev_size_prop::<E>(dev),
+            consts::BLOCKDEV_NEW_SIZE_PROP => shared::blockdev_new_size_prop::<E>(dev)
+        },
+        consts::BLOCKDEV_INTERFACE_NAME_3_6 => {
             consts::BLOCKDEV_DEVNODE_PROP => shared::blockdev_devnode_prop::<E>(dev),
             consts::BLOCKDEV_HARDWARE_INFO_PROP => shared::blockdev_hardware_info_prop::<E>(dev),
             consts::BLOCKDEV_USER_INFO_PROP => shared::blockdev_user_info_prop::<E>(dev),

diff --git a/src/dbus_api/consts.rs b/src/dbus_api/consts.rs
@@ -13,12 +13,14 @@ pub const MANAGER_INTERFACE_NAME_3_2: &str = "org.storage.stratis3.Manager.r2";
 pub const MANAGER_INTERFACE_NAME_3_3: &str = "org.storage.stratis3.Manager.r3";
 pub const MANAGER_INTERFACE_NAME_3_4: &str = "org.storage.stratis3.Manager.r4";
 pub const MANAGER_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.Manager.r5";
+pub const MANAGER_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.Manager.r6";
 pub const REPORT_INTERFACE_NAME_3_0: &str = "org.storage.stratis3.Report.r0";
 pub const REPORT_INTERFACE_NAME_3_1: &str = "org.storage.stratis3.Report.r1";
 pub const REPORT_INTERFACE_NAME_3_2: &str = "org.storage.stratis3.Report.r2";
 pub const REPORT_INTERFACE_NAME_3_3: &str = "org.storage.stratis3.Report.r3";
 pub const REPORT_INTERFACE_NAME_3_4: &str = "org.storage.stratis3.Report.r4";
 pub const REPORT_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.Report.r5";
+pub const REPORT_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.Report.r6";
 
 pub const LOCKED_POOLS_PROP: &str = "LockedPools";
 pub const STOPPED_POOLS_PROP: &str = "StoppedPools";
@@ -29,6 +31,7 @@ pub const POOL_INTERFACE_NAME_3_2: &str = "org.storage.stratis3.pool.r2";
 pub const POOL_INTERFACE_NAME_3_3: &str = "org.storage.stratis3.pool.r3";
 pub const POOL_INTERFACE_NAME_3_4: &str = "org.storage.stratis3.pool.r4";
 pub const POOL_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.pool.r5";
+pub const POOL_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.pool.r6";
 pub const POOL_NAME_PROP: &str = "Name";
 pub const POOL_UUID_PROP: &str = "Uuid";
 pub const POOL_HAS_CACHE_PROP: &str = "HasCache";
@@ -49,6 +52,7 @@ pub const FILESYSTEM_INTERFACE_NAME_3_2: &str = "org.storage.stratis3.filesystem
 pub const FILESYSTEM_INTERFACE_NAME_3_3: &str = "org.storage.stratis3.filesystem.r3";
 pub const FILESYSTEM_INTERFACE_NAME_3_4: &str = "org.storage.stratis3.filesystem.r4";
 pub const FILESYSTEM_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.filesystem.r5";
+pub const FILESYSTEM_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.filesystem.r6";
 pub const FILESYSTEM_NAME_PROP: &str = "Name";
 pub const FILESYSTEM_UUID_PROP: &str = "Uuid";
 pub const FILESYSTEM_USED_PROP: &str = "Used";
@@ -63,6 +67,7 @@ pub const BLOCKDEV_INTERFACE_NAME_3_2: &str = "org.storage.stratis3.blockdev.r2"
 pub const BLOCKDEV_INTERFACE_NAME_3_3: &str = "org.storage.stratis3.blockdev.r3";
 pub const BLOCKDEV_INTERFACE_NAME_3_4: &str = "org.storage.stratis3.blockdev.r4";
 pub const BLOCKDEV_INTERFACE_NAME_3_5: &str = "org.storage.stratis3.blockdev.r5";
+pub const BLOCKDEV_INTERFACE_NAME_3_6: &str = "org.storage.stratis3.blockdev.r6";
 pub const BLOCKDEV_DEVNODE_PROP: &str = "Devnode";
 pub const BLOCKDEV_HARDWARE_INFO_PROP: &str = "HardwareInfo";
 pub const BLOCKDEV_USER_INFO_PROP: &str = "UserInfo";
@@ -72,7 +77,6 @@ pub const BLOCKDEV_UUID_PROP: &str = "Uuid";
 pub const BLOCKDEV_TIER_PROP: &str = "Tier";
 pub const BLOCKDEV_PHYSICAL_PATH_PROP: &str = "PhysicalPath";
 pub const BLOCKDEV_NEW_SIZE_PROP: &str = "NewPhysicalSize";
-
 pub const BLOCKDEV_TOTAL_SIZE_PROP: &str = "TotalPhysicalSize";
 
 /// Get a list of all the standard pool interfaces
@@ -84,6 +88,7 @@ pub fn standard_pool_interfaces() -> Vec<String> {
         POOL_INTERFACE_NAME_3_3,
         POOL_INTERFACE_NAME_3_4,
         POOL_INTERFACE_NAME_3_5,
+        POOL_INTERFACE_NAME_3_6,
     ]
     .iter()
     .map(|s| (*s).to_string())
@@ -99,6 +104,7 @@ pub fn standard_filesystem_interfaces() -> Vec<String> {
         FILESYSTEM_INTERFACE_NAME_3_3,
         FILESYSTEM_INTERFACE_NAME_3_4,
         FILESYSTEM_INTERFACE_NAME_3_5,
+        FILESYSTEM_INTERFACE_NAME_3_6,
     ]
     .iter()
     .map(|s| (*s).to_string())
@@ -114,6 +120,7 @@ pub fn standard_blockdev_interfaces() -> Vec<String> {
         BLOCKDEV_INTERFACE_NAME_3_3,
         BLOCKDEV_INTERFACE_NAME_3_4,
         BLOCKDEV_INTERFACE_NAME_3_5,
+        BLOCKDEV_INTERFACE_NAME_3_6,
     ]
     .iter()
     .map(|s| (*s).to_string())

diff --git a/src/dbus_api/filesystem/mod.rs b/src/dbus_api/filesystem/mod.rs
@@ -103,6 +103,17 @@ where
                 .add_p(filesystem_3_0::created_property(&f))
                 .add_p(filesystem_3_0::size_property(&f))
                 .add_p(filesystem_3_0::used_property(&f)),
+        )
+        .add(
+            f.interface(consts::FILESYSTEM_INTERFACE_NAME_3_6, ())
+                .add_m(filesystem_3_0::rename_method(&f))
+                .add_p(filesystem_3_0::devnode_property(&f))
+                .add_p(filesystem_3_0::name_property(&f))
+                .add_p(filesystem_3_0::pool_property(&f))
+                .add_p(filesystem_3_0::uuid_property(&f))
+                .add_p(filesystem_3_0::created_property(&f))
+                .add_p(filesystem_3_0::size_property(&f))
+                .add_p(filesystem_3_0::used_property(&f)),
         );
 
     let path = object_path.get_name().to_owned();
@@ -169,6 +180,15 @@ where
             consts::FILESYSTEM_USED_PROP => shared::fs_used_prop::<E>(fs)
         },
         consts::FILESYSTEM_INTERFACE_NAME_3_5 => {
+            consts::FILESYSTEM_NAME_PROP => shared::fs_name_prop(fs_name),
+            consts::FILESYSTEM_UUID_PROP => uuid_to_string!(fs_uuid),
+            consts::FILESYSTEM_DEVNODE_PROP => shared::fs_devnode_prop::<E>(fs, pool_name, fs_name),
+            consts::FILESYSTEM_POOL_PROP => parent.clone(),
+            consts::FILESYSTEM_CREATED_PROP => shared::fs_created_prop::<E>(fs),
+            consts::FILESYSTEM_SIZE_PROP => shared::fs_size_prop(fs),
+            consts::FILESYSTEM_USED_PROP => shared::fs_used_prop::<E>(fs)
+        },
+        consts::FILESYSTEM_INTERFACE_NAME_3_6 => {
             consts::FILESYSTEM_NAME_PROP => shared::fs_name_prop(fs_name),
             consts::FILESYSTEM_UUID_PROP => uuid_to_string!(fs_uuid),
             consts::FILESYSTEM_DEVNODE_PROP => shared::fs_devnode_prop::<E>(fs, pool_name, fs_name),

diff --git a/src/dbus_api/pool/mod.rs b/src/dbus_api/pool/mod.rs
@@ -213,6 +213,36 @@ where
                 .add_p(pool_3_1::fs_limit_property(&f))
                 .add_p(pool_3_1::enable_overprov_property(&f))
                 .add_p(pool_3_1::no_alloc_space_property(&f)),
+        )
+        .add(
+            f.interface(consts::POOL_INTERFACE_NAME_3_6, ())
+                .add_m(pool_3_0::create_filesystems_method(&f))
+                .add_m(pool_3_0::destroy_filesystems_method(&f))
+                .add_m(pool_3_0::snapshot_filesystem_method(&f))
+                .add_m(pool_3_0::add_blockdevs_method(&f))
+                .add_m(pool_3_0::bind_clevis_method(&f))
+                .add_m(pool_3_0::unbind_clevis_method(&f))
+                .add_m(pool_3_5::init_cache_method(&f))
+                .add_m(pool_3_0::add_cachedevs_method(&f))
+                .add_m(pool_3_0::bind_keyring_method(&f))
+                .add_m(pool_3_0::unbind_keyring_method(&f))
+                .add_m(pool_3_0::rebind_keyring_method(&f))
+                .add_m(pool_3_0::rebind_clevis_method(&f))
+                .add_m(pool_3_0::rename_method(&f))
+                .add_m(pool_3_3::grow_physical_device_method(&f))
+                .add_p(pool_3_0::name_property(&f))
+                .add_p(pool_3_0::uuid_property(&f))
+                .add_p(pool_3_0::encrypted_property(&f))
+                .add_p(pool_3_0::avail_actions_property(&f))
+                .add_p(pool_3_0::key_desc_property(&f))
+                .add_p(pool_3_0::clevis_info_property(&f))
+                .add_p(pool_3_0::has_cache_property(&f))
+                .add_p(pool_3_0::alloc_size_property(&f))
+                .add_p(pool_3_0::used_size_property(&f))
+                .add_p(pool_3_0::total_size_property(&f))
+                .add_p(pool_3_1::fs_limit_property(&f))
+                .add_p(pool_3_1::enable_overprov_property(&f))
+                .add_p(pool_3_1::no_alloc_space_property(&f)),
         );
 
     let path = object_path.get_name().to_owned();
@@ -317,6 +347,21 @@ where
             consts::POOL_FS_LIMIT_PROP => shared::pool_fs_limit::<E>(pool),
             consts::POOL_OVERPROV_PROP => shared::pool_overprov_enabled::<E>(pool),
             consts::POOL_NO_ALLOCABLE_SPACE_PROP => shared::pool_no_alloc_space::<E>(pool)
+        },
+        consts::POOL_INTERFACE_NAME_3_6 => {
+            consts::POOL_NAME_PROP => shared::pool_name_prop(pool_name),
+            consts::POOL_UUID_PROP => uuid_to_string!(pool_uuid),
+            consts::POOL_ENCRYPTED_PROP => shared::pool_enc_prop::<E>(pool),
+            consts::POOL_AVAIL_ACTIONS_PROP => shared::pool_avail_actions_prop::<E>(pool),
+            consts::POOL_KEY_DESC_PROP => shared::pool_key_desc_prop::<E>(pool),
+            consts::POOL_CLEVIS_INFO_PROP => shared::pool_clevis_info_prop::<E>(pool),
+            consts::POOL_HAS_CACHE_PROP => shared::pool_has_cache_prop::<E>(pool),
+            consts::POOL_ALLOC_SIZE_PROP => shared::pool_allocated_size::<E>(pool),
+            consts::POOL_TOTAL_USED_PROP => shared::pool_used_size::<E>(pool),
+            consts::POOL_TOTAL_SIZE_PROP => shared::pool_total_size::<E>(pool),
+            consts::POOL_FS_LIMIT_PROP => shared::pool_fs_limit::<E>(pool),
+            consts::POOL_OVERPROV_PROP => shared::pool_overprov_enabled::<E>(pool),
+            consts::POOL_NO_ALLOCABLE_SPACE_PROP => shared::pool_no_alloc_space::<E>(pool)
         }
     }
 }