Merge pull request #98 from franklupo/main

Fix snap size
Corsinvest · Mar 27, 2024 · fb1d474 · fb1d474
2 parents b704087 + 521e903
commit fb1d474
Show file tree

Hide file tree

Showing 23 changed files with 127 additions and 76 deletions.
diff --git a/Corsinvest.ProxmoxVE.Admin.sln b/Corsinvest.ProxmoxVE.Admin.sln
@@ -57,6 +57,13 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cmd", "cmd", "{974C975A-9A4
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Corsinvest.ProxmoxVE.Admin.ReplicationTrend", "src\Corsinvest.ProxmoxVE.Admin.ReplicationTrend\Corsinvest.ProxmoxVE.Admin.ReplicationTrend.csproj", "{24D3D8B6-5268-4890-815A-27C29C7D72D0}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docker", "Docker", "{37CEAF31-E743-4DE3-B81E-A8BDBC6C2B8A}"
+	ProjectSection(SolutionItems) = preProject
+		src\Docker\.dockerignore = src\Docker\.dockerignore
+		src\Docker\Dockerfile = src\Docker\Dockerfile
+		src\Docker\README.md = src\Docker\README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/src/Corsinvest.ProxmoxVE.Admin.AutoSnap/Components/Status.razor b/src/Corsinvest.ProxmoxVE.Admin.AutoSnap/Components/Status.razor
@@ -30,7 +30,7 @@
         <AHPropertyColumn T="AutoSnapInfo" TProperty="string" Property="a => a.Label" Grouping="true">
             <GroupTemplate>
                 <span style="font-weight:bold">
-                    @L["Label"]: @context.Grouping.Key (@context.Grouping.Count()) - Size: @FormatHelper.FromBytes(context.Grouping.Sum(a => a.Size))
+                    @L["Label"]: @context.Grouping.Key (@context.Grouping.Count()) - Size: @FormatHelper.FromBytes(context.Grouping.Sum(a => a.SnapshotsSize))
                 </span>
             </GroupTemplate>
         </AHPropertyColumn>

diff --git a/src/Corsinvest.ProxmoxVE.Admin.AutoSnap/Components/Status.razor.cs b/src/Corsinvest.ProxmoxVE.Admin.AutoSnap/Components/Status.razor.cs
@@ -25,7 +25,7 @@ public partial class Status
     private readonly AggregateDefinition<AutoSnapInfo> SizeAggregation = new()
     {
         Type = AggregateType.Custom,
-        CustomAggregate = x => $"Total: {FormatHelper.FromBytes(x.Sum(a => a.Size))}"
+        CustomAggregate = x => $"Total: {FormatHelper.FromBytes(x.Sum(a => a.SnapshotsSize))}"
     };
 
     protected override void OnInitialized()
@@ -55,17 +55,7 @@ protected override void OnInitialized()
             var data = await Helper.GetInfo(client, options, LoggerFactory, vmIdsOrNames);
 
             //snapshot size
-            var disks = await PveClientService.GetDisksInfo(client, (await PveClientService.GetCurrentClusterOptionsAsync())!);
-
-            foreach (var item in data)
-            {
-                item.Size = disks.Where(a => a.VmId == item.VmId)
-                                 .SelectMany(a => a.Snapshots)
-                                 .Where(a => a.Name == item.Name && !a.Replication)
-                                 .Select(a => a.Size)
-                                 .DefaultIfEmpty(0)
-                                 .Sum();
-            }
+            await PveAdminHelper.MapSnapshotSize(client, PveClientService, data, false, true);
 
             return data;
         };

diff --git a/src/Corsinvest.ProxmoxVE.Admin.AutoSnap/Models/AutoSnapInfo.cs b/src/Corsinvest.ProxmoxVE.Admin.AutoSnap/Models/AutoSnapInfo.cs
@@ -2,13 +2,14 @@
  * SPDX-FileCopyrightText: Copyright Corsinvest Srl
  * SPDX-License-Identifier: AGPL-3.0-only
  */
+using Corsinvest.ProxmoxVE.Admin.Core.Models;
 using Corsinvest.ProxmoxVE.Api.Shared.Models.Vm;
 using Corsinvest.ProxmoxVE.Api.Shared.Utils;
 using System.ComponentModel;
 
 namespace Corsinvest.ProxmoxVE.Admin.AutoSnap.Models;
 
-internal class AutoSnapInfo
+internal class AutoSnapInfo : INode, IVmId, ISnapshotsSize, IName
 {
     public string Node { get; set; } = default!;
     public long VmId { get; set; }
@@ -20,8 +21,11 @@ internal class AutoSnapInfo
     public string Label { get; set; } = default!;
     public string Description { get; set; } = default!;
     public bool VmStatus { get; set; }
-    public double Size { get; set; }
+
+    [Display(Name = "Snapshots Size")]
+    [DisplayFormat(DataFormatString = "{0:" + FormatHelper.FormatBytes + "}")]
+    public double SnapshotsSize { get; set; }
 
     [DisplayName("Size")]
-    public string TextSize => FormatHelper.FromBytes(Size);
+    public string TextSize => FormatHelper.FromBytes(SnapshotsSize);
 }
diff --git a/src/Corsinvest.ProxmoxVE.Admin.ClusterStatus/Components/RenderIndex.razor.cs b/src/Corsinvest.ProxmoxVE.Admin.ClusterStatus/Components/RenderIndex.razor.cs
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 using Corsinvest.AppHero.Core.Domain.Contracts;
+using Corsinvest.ProxmoxVE.Admin.Core.Helpers;
 using Corsinvest.ProxmoxVE.Admin.Core.Models;
 using Corsinvest.ProxmoxVE.Admin.Core.Services.DiskInfo;
 using Corsinvest.ProxmoxVE.Admin.Core.UI.ProxmoxVE.Cluster;
@@ -93,22 +94,8 @@ private async Task<IEnumerable<ClusterResourceVmExtraInfo>> GetResources()
 
         if (ClusterOptions.CalculateSnapshotSize)
         {
-            Disks = (await PveClientService.GetDisksInfo(PveClient, ClusterOptions))
-                        .OrderBy(a => a.Type)
-                        .ThenBy(a => a.Host)
-                        .ThenBy(a => a.SpaceName)
-                        .ToList();
-
-            foreach (var item in data)
-            {
-                item.SnapshotsSize = Disks.Where(a => a.VmId == item.VmId)
-                                          .SelectMany(a => a.Snapshots)
-                                          .Where(a => !a.Replication)
-                                          .Select(a => a.Size)
-                                          .DefaultIfEmpty(0)
-                                          .Sum();
-            }
-
+            //snapshot size
+            Disks = await PveAdminHelper.MapSnapshotSize(PveClient, PveClientService, data, false, false);
             StateHasChanged();
         }
 

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Corsinvest.ProxmoxVE.Admin.Core.csproj b/src/Corsinvest.ProxmoxVE.Admin.Core/Corsinvest.ProxmoxVE.Admin.Core.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="Blazored.SessionStorage" Version="2.4.0" />
     <PackageReference Include="Corsinvest.ProxmoxVE.Api.Extension" Version="8.1.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.3" />
-    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.102.2" />
+    <PackageReference Include="Z.EntityFramework.Plus.EFCore" Version="8.102.2.1" />
     <PackageReference Include="SSH.NET" Version="2024.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.3" />
   </ItemGroup>

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Helpers/PveAdminHelper.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Helpers/PveAdminHelper.cs
@@ -3,6 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 using Corsinvest.AppHero.Core.Modularity;
+using Corsinvest.ProxmoxVE.Admin.Core.Models;
 using Corsinvest.ProxmoxVE.Admin.Core.Modularity;
 using Corsinvest.ProxmoxVE.Api;
 using Corsinvest.ProxmoxVE.Api.Shared.Models.Cluster;
@@ -101,12 +102,41 @@ public static async Task<string> GetSupportInfo(PveClient client)
             if (!string.IsNullOrEmpty(subscription.Key))
             {
                 var data = subscription.Key.Split("-");
-                level = NodeHelper.DecodeLevelSupport(data[0][^1]+"").ToString();
-            }            
+                level = NodeHelper.DecodeLevelSupport(data[0][^1] + "").ToString();
+            }
 
             rows.Add($"{item.Node}: {subscription.Serverid} {level}");
         }
 
         return rows.JoinAsString(Environment.NewLine);
     }
+
+    public static async Task<IEnumerable<Services.DiskInfo.DiskInfoBase>> MapSnapshotSize<T>(PveClient client,
+                                                                                             IPveClientService pveClientService,
+                                                                                             IEnumerable<T> items,
+                                                                                             bool includeReplication,
+                                                                                             bool filterByName)
+        where T : ISnapshotsSize, INode, IVmId
+    {
+        //snapshot size
+        var disks = await pveClientService.GetDisksInfo(client, (await pveClientService.GetCurrentClusterOptionsAsync())!);
+
+        foreach (var item in items)
+        {
+            var aa = disks.Where(a => a.VmId == item.VmId
+                                       && (!a.HostContainSnapshot || a.Host == item.Node))
+                          .ToArray();
+
+            item.SnapshotsSize = disks.Where(a => a.VmId == item.VmId
+                                                    && (!a.HostContainSnapshot || a.Host == item.Node))
+                                      .SelectMany(a => a.Snapshots)
+                                      .Where(a => !a.Replication, !includeReplication)
+                                      .Where(a => a.Name == ((IName)item).Name, filterByName)
+                                      .Select(a => a.Size)
+                                      .DefaultIfEmpty(0)
+                                      .Sum();
+        }
+
+        return disks;
+    }
 }
diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Models/ClusterResourceVmExtraInfo.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Models/ClusterResourceVmExtraInfo.cs
@@ -8,7 +8,7 @@
 
 namespace Corsinvest.ProxmoxVE.Admin.Core.Models;
 
-public class ClusterResourceVmExtraInfo : ClusterResource, IClusterResourceVmOsInfo
+public class ClusterResourceVmExtraInfo : ClusterResource, IClusterResourceVmOsInfo, INode, IVmId, ISnapshotsSize
 {
     [Display(Name = "Snapshots Size")]
     [DisplayFormat(DataFormatString = "{0:" + FormatHelper.FormatBytes + "}")]

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Models/IName.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Models/IName.cs
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: Copyright Corsinvest Srl
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+namespace Corsinvest.ProxmoxVE.Admin.Core.Models;
+
+public interface IName
+{
+    string Name { get; set; }
+}
diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Models/INode.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Models/INode.cs
@@ -0,0 +1,12 @@
+/*
+ * SPDX-FileCopyrightText: Copyright Corsinvest Srl
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+using Markdig.Helpers;
+
+namespace Corsinvest.ProxmoxVE.Admin.Core.Models;
+
+public interface INode
+{
+    string Node { get; set; }
+}
diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Models/ISnapshotsSize.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Models/ISnapshotsSize.cs
@@ -0,0 +1,14 @@
+/*
+ * SPDX-FileCopyrightText: Copyright Corsinvest Srl
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+using Corsinvest.ProxmoxVE.Api.Shared.Utils;
+
+namespace Corsinvest.ProxmoxVE.Admin.Core.Models;
+
+public interface ISnapshotsSize
+{
+    [Display(Name = "Snapshots Size")]
+    [DisplayFormat(DataFormatString = "{0:" + FormatHelper.FormatBytes + "}")]
+    double SnapshotsSize { get; set; }
+}
diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Models/IVmId.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Models/IVmId.cs
@@ -0,0 +1,10 @@
+/*
+ * SPDX-FileCopyrightText: Copyright Corsinvest Srl
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+namespace Corsinvest.ProxmoxVE.Admin.Core.Models;
+
+public interface IVmId
+{
+    long VmId { get; set; }
+}
diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Options/ClusterOptions.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Options/ClusterOptions.cs
@@ -20,7 +20,7 @@ public class ClusterOptions
     [Display(Name = "Timeout (millisec)")]
     public int Timeout { get; set; } = 1000;
 
-    [Display(Name = "Calculate snapshot size (require time)")]
+    [Display(Name = "Calculate snapshot size (require ssh configuration)")]
     public bool CalculateSnapshotSize { get; set; }
 
     public bool UseApiToken { get; set; }

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Services/DiskInfo/CephDiskInfo.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Services/DiskInfo/CephDiskInfo.cs
@@ -8,19 +8,12 @@
 
 namespace Corsinvest.ProxmoxVE.Admin.Core.Services.DiskInfo;
 
-public class CephDiskInfo : DiskInfoBase
+public class CephDiskInfo(string storage, string pool, long vmId, string disk, string monitorHosts)
+    : DiskInfoBase(vmId, disk, monitorHosts, pool, false)
 {
-    public CephDiskInfo(string storage, string pool, long vmId, string disk, string monitorHosts)
-        : base(vmId, disk, monitorHosts, pool)
-    {
-        Storage = storage;
-        Pool = pool;
-        MonitorHosts = monitorHosts;
-    }
-
-    public string Storage { get; }
-    public string Pool { get; }
-    public string MonitorHosts { get; }
+    public string Storage { get; } = storage;
+    public string Pool { get; } = pool;
+    public string MonitorHosts { get; } = monitorHosts;
     public override string Type => "Ceph";
 
     class ImageSnapshot

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Services/DiskInfo/DiskInfoBase.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Services/DiskInfo/DiskInfoBase.cs
@@ -4,11 +4,12 @@
  */
 namespace Corsinvest.ProxmoxVE.Admin.Core.Services.DiskInfo;
 
-public abstract class DiskInfoBase(long vmId, string disk, string host, string spaceName)
+public abstract class DiskInfoBase(long vmId, string disk, string host, string spaceName,bool hostContainSnapshot)
 {
     public long VmId { get; } = vmId;
     public string Disk { get; } = disk;
     public string Host { get; } = host;
+    public bool HostContainSnapshot { get; }= hostContainSnapshot;
     public string SpaceName { get; } = spaceName;
     public abstract string Type { get; }
 

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Services/DiskInfo/ZfsDiskInfo.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Services/DiskInfo/ZfsDiskInfo.cs
@@ -9,17 +9,11 @@
 
 namespace Corsinvest.ProxmoxVE.Admin.Core.Services.DiskInfo;
 
-public class ZfsDiskInfo : DiskInfoBase
+public class ZfsDiskInfo(string ipAddress, string path, long vmId, string disk, string host, string spaceName) 
+    : DiskInfoBase(vmId, disk, host, spaceName, true)
 {
-    public ZfsDiskInfo(string ipAddress, string path, long vmId, string disk, string host, string spaceName) :
-        base(vmId, disk, host, spaceName)
-    {
-        IpAddress = ipAddress;
-        Path = path;
-    }
-
-    public string IpAddress { get; }
-    public string Path { get; }
+    public string IpAddress { get; } = ipAddress;
+    public string Path { get; } = path;
     public override string Type => "ZFS";
 
     public static async Task<IEnumerable<ZfsDiskInfo>> Read(PveClient client, ClusterOptions clusterOptions)
@@ -60,7 +54,7 @@ public static async Task<IEnumerable<ZfsDiskInfo>> Read(PveClient client, Cluste
                                                                fullPath[0],
                                                                long.Parse(diskVm.Split('-')[1]),
                                                                diskVm,
-                                                               ipAddress,
+                                                               host,
                                                                spaceName);
 
                                     //check if exists

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/Services/PveClientService.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/Services/PveClientService.cs
@@ -196,6 +196,4 @@ public async Task<IEnumerable<DiskInfoBase>> GetDisksInfo(PveClient client, Clus
 
         return ret;
     }
-
-
 }
diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/UI/Layout/SelectCluster.razor.cs b/src/Corsinvest.ProxmoxVE.Admin.Core/UI/Layout/SelectCluster.razor.cs
@@ -55,7 +55,7 @@ private async Task ValueChanged(string value)
         {
             await PveClientService.SetCurrentClusterNameAsync(value);
             CurrentClusterName = value;
-            if (_refresh) { NavigationManager.NavigateTo(NavigationManager.Uri, true); }
+            if (_refresh) { NavigationManager.Refresh(true); }
         }
         else
         {

diff --git a/src/Corsinvest.ProxmoxVE.Admin.Core/UI/ProxmoxVE/Cluster/Snapshots.razor b/src/Corsinvest.ProxmoxVE.Admin.Core/UI/ProxmoxVE/Cluster/Snapshots.razor
@@ -2,6 +2,7 @@
  * SPDX-FileCopyrightText: Copyright Corsinvest Srl
  * SPDX-License-Identifier: AGPL-3.0-only
 *@
+@using Corsinvest.AppHero.Core.MudBlazorUI.Style
 @using Corsinvest.ProxmoxVE.Admin.Core.Services.DiskInfo
 
 @inherits AHComponentBase
@@ -25,14 +26,14 @@
 {
     [Parameter] public IEnumerable<DiskInfoBase> Disks { get; set; } = [];
 
-    [Inject] public Corsinvest.AppHero.Core.MudBlazorUI.Style.UIOptions UIOptions { get; set; } = default!;
+    [Inject] public IOptionsSnapshot<UIOptions> UIOptions { get; set; } = default!;
 
     private RenderFragment RenderTable(bool replication) => __builder =>
     {
         @if (replication)
         {
             <MudText>
-                <div class="d-flex">
+                <div class="d-flex gap-3">
                     <MudIcon Icon="@PveBlazorHelper.Icons.Replication" />
                     Replication
                 </div>
@@ -49,10 +50,10 @@
         }
 
         <MudSimpleTable Style="overflow-x: auto;"
-                        Bordered="@UIOptions.Theme.Table.IsBordered"
-                        Striped="@UIOptions.Theme.Table.IsStriped"
-                        Hover="@UIOptions.Theme.Table.IsHoverable"
-                        Dense="@UIOptions.Theme.Table.IsDense">
+                        Bordered="@UIOptions.Value.Theme.Table.IsBordered"
+                        Striped="@UIOptions.Value.Theme.Table.IsStriped"
+                        Hover="@UIOptions.Value.Theme.Table.IsHoverable"
+                        Dense="@UIOptions.Value.Theme.Table.IsDense">
             <thead>
                 <tr>
                     <th>Type</th>

diff --git a/src/Corsinvest.ProxmoxVE.Admin/wwwroot/doc/index.adoc b/src/Corsinvest.ProxmoxVE.Admin/wwwroot/doc/index.adoc
@@ -11,7 +11,7 @@ Powered by Corsinvest Srl
 :icons: font
 :pve-name: Proxmox VE
 :app-name: cv4pve-admin
-:app-version: v1.0.1
+:app-version: v1.1.0
 :app-url-site: https://www.corsinvest.it/cv4pve-admin
 :company-url: https://www.corsinvest.it
 :company-name: Corsinvest Srl