[PATCH storage v2 6/7] zfsnvme: accept short volume activation calls

[Joaquin Varela <joaquinvarela@neatech.ar>]

Default optional snapshot and cache arguments so internal callers such as
cloud-init can use the short activation and deactivation form. Cover both
calls in the storage plugin test.

Signed-off-by: Joaquin Varela <joaquinvarela@neatech.ar>
---
 src/PVE/Storage/ZFSNVMePlugin.pm | 11 +++++++++--
 src/test/zfsnvme_test.pm         | 25 +++++++++++++++++++++++++
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/PVE/Storage/ZFSNVMePlugin.pm b/src/PVE/Storage/ZFSNVMePlugin.pm
index 21fa00d..54c406d 100644
--- a/src/PVE/Storage/ZFSNVMePlugin.pm
+++ b/src/PVE/Storage/ZFSNVMePlugin.pm
@@ -777,7 +777,7 @@ sub activate_volume(
     $storeid,
     $scfg,
     $volname,
-    $snapname,
+    $snapname = undef,
     $cache = undef,
     $hints = undef,
 ) {
@@ -795,7 +795,14 @@ sub activate_volume(
     return 1;
 }
 
-sub deactivate_volume($class, $storeid, $scfg, $volname, $snapname, $cache = undef) {
+sub deactivate_volume(
+    $class,
+    $storeid,
+    $scfg,
+    $volname,
+    $snapname = undef,
+    $cache = undef,
+) {
     die "unable to deactivate snapshot from remote zfs storage\n" if $snapname;
     return 1;
 }
diff --git a/src/test/zfsnvme_test.pm b/src/test/zfsnvme_test.pm
index 128ebf1..d64b149 100644
--- a/src/test/zfsnvme_test.pm
+++ b/src/test/zfsnvme_test.pm
@@ -219,6 +219,31 @@ like(
     'activate_volume accepts the current storage API hints argument',
 );
 
+$nvme_mock->redefine(activate_storage => sub { die "activation attempted\n" });
+eval {
+    PVE::Storage::ZFSNVMePlugin->activate_volume(
+        'nvmetest',
+        $scfg,
+        'vm-100-disk-0',
+    );
+};
+like(
+    $@,
+    qr/activation attempted/,
+    'activate_volume accepts the short direct-call form used by cloud-init',
+);
+$nvme_mock->unmock('activate_storage');
+
+is(
+    PVE::Storage::ZFSNVMePlugin->deactivate_volume(
+        'nvmetest',
+        $scfg,
+        'vm-100-disk-0',
+    ),
+    1,
+    'deactivate_volume accepts the short direct-call form',
+);
+
 my $lio_mock = Test::MockModule->new('PVE::Storage::LunCmd::LIO');
 my @provider_args;
 $lio_mock->redefine(
-- 
2.54.0.windows.1