use PVE::Storage;
use PVE::Storage::Plugin;
use PVE::QemuServer;
+use PVE::QemuConfig;
use PVE::Tools;
+use PVE::ReplicationConfig;
use Test::MockModule;
use Test::More;
die "volume_rollback_is_possible failed\n";
}
+sub mocked_activate_volumes {
+ my ($storecfg, $volumes) = @_;
+ die "Storage config not mocked! aborting\n"
+ if defined($storecfg);
+ die "wrong volume - fake vmstate expected!\n"
+ if ((scalar @$volumes != 1) || @$volumes[0] ne "somestorage:state-volume");
+ return;
+}
+
+sub mocked_deactivate_volumes {
+ my ($storecfg, $volumes) = @_;
+ die "Storage config not mocked! aborting\n"
+ if defined($storecfg);
+ die "wrong volume - fake vmstate expected!\n"
+ if ((scalar @$volumes != 1) || @$volumes[0] ne "somestorage:state-volume");
+ return;
+}
+
sub mocked_vdisk_free {
my ($storecfg, $vmstate) = @_;
die "Storage config not mocked! aborting\n"
plan tests => 2;
$@ = undef;
eval {
- PVE::QemuServer::snapshot_prepare($vmid, $snapname, $save_vmstate, $comment);
+ PVE::QemuConfig->__snapshot_prepare($vmid, $snapname, $save_vmstate, $comment);
};
is($@, $exp_err, "\$@ correct");
ok(test_file("snapshot-expected/prepare/qemu-server/$vmid.conf", "snapshot-working/prepare/qemu-server/$vmid.conf"), "config file correct");
plan tests => 2;
$@ = undef;
eval {
- PVE::QemuServer::snapshot_commit($vmid, $snapname);
+ PVE::QemuConfig->__snapshot_commit($vmid, $snapname);
};
is($@, $exp_err, "\$@ correct");
ok(test_file("snapshot-expected/commit/qemu-server/$vmid.conf", "snapshot-working/commit/qemu-server/$vmid.conf"), "config file correct");
$exp_vol_snap_delete = {} if !defined($exp_vol_snap_delete);
$@ = undef;
eval {
- PVE::QemuServer::snapshot_create($vmid, $snapname, $save_vmstate, $comment);
+ PVE::QemuConfig->snapshot_create($vmid, $snapname, $save_vmstate, $comment);
};
is($@, $exp_err, "\$@ correct");
is_deeply($vol_snapshot, $exp_vol_snap, "created correct volume snapshots");
$exp_vol_snap_delete = {} if !defined($exp_vol_snap_delete);
$@ = undef;
eval {
- PVE::QemuServer::snapshot_delete($vmid, $snapname, $force);
+ PVE::QemuConfig->snapshot_delete($vmid, $snapname, $force);
};
is($@, $exp_err, "\$@ correct");
is_deeply($vol_snapshot_delete, $exp_vol_snap_delete, "deleted correct volume snapshots");
$exp_vol_snap_rollback = {} if !defined($exp_vol_snap_rollback);
$@ = undef;
eval {
- PVE::QemuServer::snapshot_rollback($vmid, $snapname);
+ PVE::QemuConfig->snapshot_rollback($vmid, $snapname);
};
is($@, $exp_err, "\$@ correct");
is_deeply($vol_snapshot_rollback, $exp_vol_snap_rollback, "rolled back to correct volume snapshots");
};
}
-# BEGIN redefine PVE::QemuServer methods
+# BEGIN mocked PVE::QemuConfig methods
sub config_file_lock {
return "snapshot-working/pve-test.lock";
}
sub cfs_config_path {
- my ($vmid, $node) = @_;
+ my ($class, $vmid, $node) = @_;
$node = $nodename if !$node;
return "snapshot-working/$node/qemu-server/$vmid.conf";
}
sub load_config {
- my ($vmid, $node) = @_;
+ my ($class, $vmid, $node) = @_;
- my $filename = cfs_config_path($vmid, $node);
+ my $filename = $class->cfs_config_path($vmid, $node);
my $raw = PVE::Tools::file_get_contents($filename);
}
sub write_config {
- my ($vmid, $conf) = @_;
+ my ($class, $vmid, $conf) = @_;
- my $filename = cfs_config_path($vmid);
+ my $filename = $class->cfs_config_path($vmid);
if ($conf->{snapshots}) {
foreach my $snapname (keys %{$conf->{snapshots}}) {
}
sub has_feature {
- my ($feature, $conf, $storecfg, $snapname, $running, $backup_only) = @_;
+ my ($class, $feature, $conf, $storecfg, $snapname, $running, $backup_only) = @_;
return $snapshot_possible;
}
-sub check_running {
- return $running;
-}
-
-sub snapshot_save_vmstate {
- my ($vmid, $conf, $snapname, $storecfg) = @_;
+sub __snapshot_save_vmstate {
+ my ($class, $vmid, $conf, $snapname, $storecfg) = @_;
die "save_vmstate failed\n"
if !$save_vmstate_works;
my $snap = $conf->{snapshots}->{$snapname};
$snap->{vmstate} = "somestorage:state-volume";
- $snap->{machine} = "somemachine";
+ $snap->{runningmachine} = "somemachine"
+}
+# END mocked PVE::QemuConfig methods
+
+# BEGIN redefine PVE::QemuServer methods
+
+sub check_running {
+ return $running;
}
+
sub do_snapshots_with_qemu {
return 0;
}
PVE::Tools::run_command("rm -rf snapshot-working");
PVE::Tools::run_command("cp -a snapshot-input snapshot-working");
+my $qemu_config_module = new Test::MockModule('PVE::QemuConfig');
+$qemu_config_module->mock('config_file_lock', \&config_file_lock);
+$qemu_config_module->mock('cfs_config_path', \&cfs_config_path);
+$qemu_config_module->mock('load_config', \&load_config);
+$qemu_config_module->mock('write_config', \&write_config);
+$qemu_config_module->mock('has_feature', \&has_feature);
+$qemu_config_module->mock('__snapshot_save_vmstate', \&__snapshot_save_vmstate);
+
+# ignore existing replication config
+my $repl_config_module = new Test::MockModule('PVE::ReplicationConfig');
+$repl_config_module->mock('check_for_existing_jobs' => sub { return undef });
+
$running = 1;
$freeze_possible = 1;
$save_vmstate_works = 1;
my $storage_module = new Test::MockModule('PVE::Storage');
$storage_module->mock('config', sub { return undef; });
$storage_module->mock('path', sub { return "/some/store/statefile/path"; });
+$storage_module->mock('activate_volumes', \&mocked_activate_volumes);
+$storage_module->mock('deactivate_volumes', \&mocked_deactivate_volumes);
$storage_module->mock('vdisk_free', \&mocked_vdisk_free);
$storage_module->mock('volume_snapshot', \&mocked_volume_snapshot);
$storage_module->mock('volume_snapshot_delete', \&mocked_volume_snapshot_delete);
$freeze_possible = 1;
printf("Expected error for snapshot_create when volume snapshot is not possible\n");
-testcase_create("201", "test", 0, "test comment", "volume snapshot disabled\n");
+testcase_create("201", "test", 0, "test comment", "volume snapshot disabled\n\n");
printf("Expected error for snapshot_create when volume snapshot is not possible for one drive\n");
-testcase_create("202", "test", 0, "test comment", "volume snapshot disabled\n", { "local:snapshotable-disk-1" => "test" }, { "local:snapshotable-disk-1" => "test" });
+testcase_create("202", "test", 0, "test comment", "volume snapshot disabled\n\n", { "local:snapshotable-disk-1" => "test" }, { "local:snapshotable-disk-1" => "test" });
$vm_mon->{savevm_start} = 0;
printf("Expected error for snapshot_create when Qemu mon command 'savevm-start' fails\n");
-testcase_create("203", "test", 0, "test comment", "savevm-start disabled\n");
+testcase_create("203", "test", 0, "test comment", "savevm-start disabled\n\n");
$vm_mon->{savevm_start} = 1;
+printf("Successful snapshot_create with no existing snapshots but set machine type\n");
+testcase_create("301", "test", 1, "test comment", "", { "local:snapshotable-disk-1" => "test" });
$nodename = "delete";
printf("\n");
printf("Expected error for snapshot_rollback with mp rollback failure (results in inconsistent state)\n");
testcase_rollback("207", "test", "volume snapshot rollback disabled\n", { "local:snapshotable-disk-1" => "test", "local:snapshotable-disk-2" => "test" });
+printf("Successful snapshot_rollback with saved vmstate and machine config only in snapshot\n");
+testcase_rollback("301", "test", "", { "local:snapshotable-disk-1" => "test" });
+
+printf("Successful snapshot_rollback with saved vmstate and machine config and runningmachine \n");
+testcase_rollback("302", "test", "", { "local:snapshotable-disk-1" => "test" });
+
done_testing();
projects / qemu-server.git / blobdiff