Improve network configuration of catlets

src/apps/src/Eryph-zero/NetworkSyncServiceBridgeService.cs

@@ -32,11 +32,4 @@ public EitherAsync<Error, string[]> ValidateChanges(NetworkProvider[] networkPro
             .GetInstance<INetworkSyncService>()
             .ValidateChanges(networkProviders);
     }
-
-    public EitherAsync<Error, Unit> RealizeProviderNetworks(CancellationToken cancellationToken)
-    {
-        return _controllerModule.Services.GetRequiredService<Container>()
-            .GetInstance<INetworkSyncService>()
-            .RealizeProviderNetworks(cancellationToken);
-    }
-}
+}

src/core/src/Eryph.Core/INetworkSyncService.cs

@@ -8,14 +8,11 @@
 using LanguageExt;
 using LanguageExt.Common;
 
-namespace Eryph.Core
-{
-    public interface INetworkSyncService
-    {
+namespace Eryph.Core;
 
-        public EitherAsync<Error, Unit> SyncNetworks(CancellationToken cancellationToken);
+public interface INetworkSyncService
+{
+    public EitherAsync<Error, Unit> SyncNetworks(CancellationToken cancellationToken);
 
-        public EitherAsync<Error, string[]> ValidateChanges(NetworkProvider[] networkProviders);
-        EitherAsync<Error, Unit> RealizeProviderNetworks(CancellationToken cancellationToken);
-    }
+    public EitherAsync<Error, string[]> ValidateChanges(NetworkProvider[] networkProviders);
 }

src/core/src/Eryph.Messages/Resources/Catlets/Commands/UpdateCatletNetworksCommand.cs

@@ -8,9 +8,12 @@ namespace Eryph.Messages.Resources.Catlets.Commands;
 public class UpdateCatletNetworksCommand: IHasResource, IHasProjectId
 {
     public Guid ProjectId { get; set; }
+
     public CatletConfig Config { get; set; }
+
     public Guid CatletId { get; set; }
 
-    public Resource Resource => new(ResourceType.Catlet, CatletId);
+    public Guid CatletMetadataId { get; set; }
 
-}
+    public Resource Resource => new(ResourceType.Catlet, CatletId);
+}

src/core/src/Eryph.VmConfig.Primitives/Resources/Machines/MachineNetworkSettings.cs

@@ -1,4 +1,6 @@
-namespace Eryph.Resources.Machines;
+using System.Collections.Generic;
+
+namespace Eryph.Resources.Machines;
 
 
 public sealed class MachineNetworkSettings
@@ -8,11 +10,16 @@ public sealed class MachineNetworkSettings
     public string NetworkName { get; set; }
 
     public string NetworkProviderName { get; set; }
+
     public string PortName { get; set; }
+
     public string MacAddress { get; set; }
-    public string AddressesV4 { get; set; }
-    public string AddressesV6 { get; set; }
+
+    public IReadOnlyList<string> AddressesV4 { get; set; }
+
+    public IReadOnlyList<string> AddressesV6 { get; set; }
+
     public string FloatingAddressV4 { get; set; }
-    public string FloatingAddressV6 { get; set; }
 
-}
+    public string FloatingAddressV6 { get; set; }
+}

src/core/src/Eryph.VmManagement/Converging/ConvergeCloudInitDisk.cs

@@ -76,7 +76,6 @@ private async Task<Either<Error, NetworkData>> GenerateNetworkData(TypedPsObject
                     var physicalNetworkSettings = new
                     {
                         type = "physical",
-                        id = adapter.Value.Name,
                         name = adapter.Value.Name,
                         mac_address = macFormatted,
                         subnets = (Context.Config.Networks?.Filter(x=>x.AdapterName == adapter.Value.Name) 

src/data/src/Eryph.StateDb.MySql/Migrations/20241023105139_InitialCreate.cs → src/data/src/Eryph.StateDb.MySql/Migrations/20241125150528_InitialCreate.cs

@@ -332,7 +332,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                         .Annotation("MySql:CharSet", "utf8mb4"),
                     Environment = table.Column<string>(type: "longtext", nullable: false)
                         .Annotation("MySql:CharSet", "utf8mb4"),
-                    NetworkProvider = table.Column<string>(type: "longtext", nullable: true)
+                    NetworkProvider = table.Column<string>(type: "longtext", nullable: false)
                         .Annotation("MySql:CharSet", "utf8mb4"),
                     IpNetwork = table.Column<string>(type: "longtext", nullable: true)
                         .Annotation("MySql:CharSet", "utf8mb4")
@@ -461,7 +461,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     Id = table.Column<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
                     ProviderName = table.Column<string>(type: "longtext", nullable: true)
                         .Annotation("MySql:CharSet", "utf8mb4"),
-                    MacAddress = table.Column<string>(type: "varchar(255)", nullable: true)
+                    MacAddress = table.Column<string>(type: "varchar(255)", nullable: false)
                         .Annotation("MySql:CharSet", "utf8mb4"),
                     AddressName = table.Column<string>(type: "longtext", nullable: true)
                         .Annotation("MySql:CharSet", "utf8mb4"),

src/data/src/Eryph.StateDb.MySql/Migrations/MySqlStateStoreContextModelSnapshot.cs

@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.4")
+                .HasAnnotation("ProductVersion", "8.0.11")
                 .HasAnnotation("Relational:MaxIdentifierLength", 64);
 
             MySqlModelBuilderExtensions.AutoIncrementColumns(modelBuilder);
@@ -188,7 +188,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.ToTable("IpAssignment");
 
-                    b.HasDiscriminator<string>("Discriminator").HasValue("IpAssignment");
+                    b.HasDiscriminator().HasValue("IpAssignment");
 
                     b.UseTphMappingStrategy();
                 });
@@ -241,6 +241,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("varchar(21)");
 
                     b.Property<string>("MacAddress")
+                        .IsRequired()
                         .HasColumnType("varchar(255)");
 
                     b.Property<string>("Name")
@@ -257,7 +258,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.ToTable("NetworkPorts");
 
-                    b.HasDiscriminator<string>("Discriminator").HasValue("NetworkPort");
+                    b.HasDiscriminator().HasValue("NetworkPort");
 
                     b.UseTphMappingStrategy();
                 });
@@ -544,7 +545,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.ToTable("Subnet");
 
-                    b.HasDiscriminator<string>("Discriminator").HasValue("Subnet");
+                    b.HasDiscriminator().HasValue("Subnet");
 
                     b.UseTphMappingStrategy();
                 });
@@ -778,6 +779,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("longtext");
 
                     b.Property<string>("NetworkProvider")
+                        .IsRequired()
                         .HasColumnType("longtext");
 
                     b.ToTable("VirtualNetworks");

src/data/src/Eryph.StateDb.Sqlite/Migrations/20241023105135_InitialCreate.cs → src/data/src/Eryph.StateDb.Sqlite/Migrations/20241125150524_InitialCreate.cs

@@ -282,7 +282,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     ResourceType = table.Column<int>(type: "INTEGER", nullable: false),
                     Name = table.Column<string>(type: "TEXT", nullable: false),
                     Environment = table.Column<string>(type: "TEXT", nullable: false),
-                    NetworkProvider = table.Column<string>(type: "TEXT", nullable: true),
+                    NetworkProvider = table.Column<string>(type: "TEXT", nullable: false),
                     IpNetwork = table.Column<string>(type: "TEXT", nullable: true)
                 },
                 constraints: table =>
@@ -395,7 +395,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                 {
                     Id = table.Column<Guid>(type: "TEXT", nullable: false),
                     ProviderName = table.Column<string>(type: "TEXT", nullable: true),
-                    MacAddress = table.Column<string>(type: "TEXT", nullable: true),
+                    MacAddress = table.Column<string>(type: "TEXT", nullable: false),
                     AddressName = table.Column<string>(type: "TEXT", nullable: true),
                     Name = table.Column<string>(type: "TEXT", nullable: false),
                     Discriminator = table.Column<string>(type: "TEXT", maxLength: 21, nullable: false),

src/data/src/Eryph.StateDb.Sqlite/Migrations/SqliteStateStoreContextModelSnapshot.cs

@@ -15,7 +15,7 @@ partial class SqliteStateStoreContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "8.0.4");
+            modelBuilder.HasAnnotation("ProductVersion", "8.0.11");
 
             modelBuilder.Entity("Eryph.StateDb.Model.CatletDrive", b =>
                 {
@@ -183,7 +183,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.ToTable("IpAssignment");
 
-                    b.HasDiscriminator<string>("Discriminator").HasValue("IpAssignment");
+                    b.HasDiscriminator().HasValue("IpAssignment");
 
                     b.UseTphMappingStrategy();
                 });
@@ -236,6 +236,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("MacAddress")
+                        .IsRequired()
                         .HasColumnType("TEXT");
 
                     b.Property<string>("Name")
@@ -252,7 +253,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.ToTable("NetworkPorts");
 
-                    b.HasDiscriminator<string>("Discriminator").HasValue("NetworkPort");
+                    b.HasDiscriminator().HasValue("NetworkPort");
 
                     b.UseTphMappingStrategy();
                 });
@@ -539,7 +540,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
 
                     b.ToTable("Subnet");
 
-                    b.HasDiscriminator<string>("Discriminator").HasValue("Subnet");
+                    b.HasDiscriminator().HasValue("Subnet");
 
                     b.UseTphMappingStrategy();
                 });
@@ -773,6 +774,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("TEXT");
 
                     b.Property<string>("NetworkProvider")
+                        .IsRequired()
                         .HasColumnType("TEXT");
 
                     b.ToTable("VirtualNetworks");

src/data/src/Eryph.StateDb/Model/NetworkPort.cs

@@ -8,7 +8,8 @@ public abstract class NetworkPort
     public string? ProviderName { get; set; }
 
     public Guid Id { get; set; }
-    public string? MacAddress { get; set; }
+
+    public required string MacAddress { get; set; }
 
     public string? AddressName { get; set; }
 

src/data/src/Eryph.StateDb/Model/VirtualNetwork.cs

@@ -12,7 +12,7 @@ public VirtualNetwork()
         ResourceType = ResourceType.VirtualNetwork;
     }
 
-    public string? NetworkProvider { get; set; }
+    public required string NetworkProvider { get; set; }
 
     public string? IpNetwork { get; set; }