mirror of
https://github.com/GoodOlClint/PSProxmoxVE.git
synced 2026-09-06 12:09:01 +00:00
0026ef2b57
NodeService.GetNodeConfig/GetNodeDns, ClusterConfigService.GetClusterConfig, BackupService.GetNotBackedUp and VmService.GetGuestExecStatus returned raw Dictionary/List<Dictionary> instead of a Pve* model, per issue #157. Each now has a typed model under Models/{Nodes,Cluster,Backup,Vms}/ with [JsonProperty] for documented fields and a [JsonExtensionData]-backed AdditionalProperties catch-all, following the PveVmConfig pattern. The five consuming cmdlets and their [OutputType] attributes are updated to match. GetClusterConfig also fixes a latent bug: GET /cluster/config returns a JSON array (a directory index), but the old code did `data is JObject obj ? ... : empty dict`, which silently always returned an empty dictionary since data was a JArray. PveClusterConfigEntry decodes the array correctly and exposes a typed Name property (the array items' schema documents no named fields, but the endpoint's "links" metadata gives the child-URL template as "{name}"). The guest-exec poll loop in InvokePveVmGuestExecCmdlet keeps its exact Stopwatch + Thread.Sleep(1000) structure (ADR 0001 accepted exception); only the type it reads from changed. A TolerantBooleanConverter was added so PveGuestExecStatus.Exited keeps accepting PVE's boolean/integer/string forms, matching what ApiValueHelper.IsExited already tolerated for the old dictionary path. Reviewed with codex-rescue, correctness-reviewer and api-compat-reviewer before commit; both real findings above (the name/subdir key and the Exited string-form regression) came from that pass and are mutation-tested. Co-authored-by: goodolclint-claude[bot] <323206664+goodolclint-claude[bot]@users.noreply.github.com>
155 lines
5.7 KiB
C#
155 lines
5.7 KiB
C#
using Xunit;
|
|
using Newtonsoft.Json.Linq;
|
|
using PSProxmoxVE.Core.Models.Backup;
|
|
|
|
namespace PSProxmoxVE.Core.Tests.Models
|
|
{
|
|
public class BackupModelTests
|
|
{
|
|
[Fact]
|
|
public void PveBackupJob_Deserialize_Pve9_ReturnsCorrectCount()
|
|
{
|
|
var json = TestHelper.LoadFixture("pve9_backup_jobs.json");
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var jobs = data.ToObject<PveBackupJob[]>();
|
|
Assert.NotNull(jobs);
|
|
Assert.Equal(2, jobs.Length);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupJob_Deserialize_Pve9_FirstJob_HasCorrectId()
|
|
{
|
|
var json = TestHelper.LoadFixture("pve9_backup_jobs.json");
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var jobs = data.ToObject<PveBackupJob[]>();
|
|
Assert.NotNull(jobs);
|
|
Assert.Equal("backup-1a2b3c", jobs[0].Id);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupJob_Deserialize_Pve9_FirstJob_IsEnabled()
|
|
{
|
|
var json = TestHelper.LoadFixture("pve9_backup_jobs.json");
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var jobs = data.ToObject<PveBackupJob[]>();
|
|
Assert.NotNull(jobs);
|
|
Assert.Equal(1, jobs[0].Enabled);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupJob_Deserialize_Pve9_FirstJob_HasCorrectProperties()
|
|
{
|
|
var json = TestHelper.LoadFixture("pve9_backup_jobs.json");
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var jobs = data.ToObject<PveBackupJob[]>();
|
|
Assert.NotNull(jobs);
|
|
Assert.Equal("vzdump", jobs[0].Type);
|
|
Assert.Equal("0 2 * * *", jobs[0].Schedule);
|
|
Assert.Equal("local", jobs[0].Storage);
|
|
Assert.Equal("snapshot", jobs[0].Mode);
|
|
Assert.Equal("zstd", jobs[0].Compress);
|
|
Assert.Equal("100,101", jobs[0].VmId);
|
|
Assert.Equal("Nightly backup", jobs[0].Comment);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupJob_Deserialize_Pve9_FirstJob_AllIsNull()
|
|
{
|
|
var json = TestHelper.LoadFixture("pve9_backup_jobs.json");
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var jobs = data.ToObject<PveBackupJob[]>();
|
|
Assert.NotNull(jobs);
|
|
Assert.Null(jobs[0].All);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupJob_Deserialize_Pve9_SecondJob_IsDisabled()
|
|
{
|
|
var json = TestHelper.LoadFixture("pve9_backup_jobs.json");
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var jobs = data.ToObject<PveBackupJob[]>();
|
|
Assert.NotNull(jobs);
|
|
Assert.Equal(0, jobs[1].Enabled);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupJob_Deserialize_Pve9_SecondJob_HasCorrectProperties()
|
|
{
|
|
var json = TestHelper.LoadFixture("pve9_backup_jobs.json");
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var jobs = data.ToObject<PveBackupJob[]>();
|
|
Assert.NotNull(jobs);
|
|
Assert.Equal("backup-4d5e6f", jobs[1].Id);
|
|
Assert.Equal("vzdump", jobs[1].Type);
|
|
Assert.Equal("0 4 * * 0", jobs[1].Schedule);
|
|
Assert.Equal("nfs-backup", jobs[1].Storage);
|
|
Assert.Equal("stop", jobs[1].Mode);
|
|
Assert.Equal("Weekly full", jobs[1].Comment);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupJob_Deserialize_Pve9_SecondJob_BacksUpAll()
|
|
{
|
|
var json = TestHelper.LoadFixture("pve9_backup_jobs.json");
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var jobs = data.ToObject<PveBackupJob[]>();
|
|
Assert.NotNull(jobs);
|
|
Assert.Equal(1, jobs[1].All);
|
|
Assert.Null(jobs[1].VmId);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupJob_Deserialize_Pve9_SecondJob_OptionalFieldsAreNull()
|
|
{
|
|
var json = TestHelper.LoadFixture("pve9_backup_jobs.json");
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var jobs = data.ToObject<PveBackupJob[]>();
|
|
Assert.NotNull(jobs);
|
|
Assert.Null(jobs[1].Compress);
|
|
Assert.Null(jobs[1].MaxFiles);
|
|
Assert.Null(jobs[1].PruneBackups);
|
|
Assert.Null(jobs[1].MailNotification);
|
|
Assert.Null(jobs[1].MailTo);
|
|
Assert.Null(jobs[1].Node);
|
|
Assert.Null(jobs[1].Exclude);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupInfo_Deserialize_HasDocumentedFields()
|
|
{
|
|
var json = @"{""data"": [
|
|
{ ""vmid"": 100, ""name"": ""webserver"", ""type"": ""qemu"" }
|
|
]}";
|
|
var data = JObject.Parse(json)["data"];
|
|
Assert.NotNull(data);
|
|
var items = data.ToObject<PveBackupInfo[]>();
|
|
Assert.NotNull(items);
|
|
Assert.Equal(100, items[0].VmId);
|
|
Assert.Equal("webserver", items[0].Name);
|
|
Assert.Equal("qemu", items[0].Type);
|
|
}
|
|
|
|
[Fact]
|
|
public void PveBackupInfo_UnmappedKey_LandsInAdditionalProperties()
|
|
{
|
|
var json = @"{""data"": [
|
|
{ ""vmid"": 200, ""name"": ""db"", ""type"": ""lxc"", ""comment"": ""prod"" }
|
|
]}";
|
|
var data = JObject.Parse(json)["data"];
|
|
var items = data!.ToObject<PveBackupInfo[]>();
|
|
Assert.NotNull(items);
|
|
Assert.Equal("prod", items![0].AdditionalProperties["comment"]);
|
|
Assert.False(items[0].AdditionalProperties.ContainsKey("vmid"));
|
|
}
|
|
}
|
|
}
|