Commit b0f095f9 authored by Eric Dieckman's avatar Eric Dieckman
Browse files

remove wn_ prefix from areas

parent 97f664fa

src/infrastructure/Contexts/ApplicationDbContext.cs

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ public class ApplicationDbContext : DbContext 
    public DbSet<Person> People => Set<Person>();

    public DbSet<PaloAltoFirewall> Firewalls => Set<PaloAltoFirewall>();

    public DbSet<Subnet> Subnets => Set<Subnet>();

    public DbSet<WiscNicArea> Areas => Set<WiscNicArea>();

    public DbSet<Area> Areas => Set<Area>();

    public DbSet<PaloAltoAccessDomain> AccessDomains => Set<PaloAltoAccessDomain>();

    public DbSet<Vlan> Vlans => Set<Vlan>();

    public DbSet<PaloAltoVsys> Vsyses => Set<PaloAltoVsys>();

src/infrastructure/Models/WiscNicAreaEntityTypeConfiguration.cs→src/infrastructure/Models/AreaEntityTypeConfiguration.cs

+2 −2
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ using Microsoft.EntityFrameworkCore.Metadata.Builders; 


namespace Cals.Visor.Infrastructure.Models;



public class WiscNicAreaEntityTypeConfiguration : IEntityTypeConfiguration<WiscNicArea>

public class AreaEntityTypeConfiguration : IEntityTypeConfiguration<Area>

{

    public void Configure(EntityTypeBuilder<WiscNicArea> builder)

    public void Configure(EntityTypeBuilder<Area> builder)

    {

        builder.ToTable(TableNames.WiscNicAreas);

src/migrations/scripts/20251023141300_InitialDatabase.sql

+6 −6
Original line number Diff line number Diff line
@@ -21,13 +21,13 @@ CREATE TABLE `pa_access_domains` ( 
  PRIMARY KEY (`pa_access_domain_id`)

) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;



CREATE TABLE `wn_areas` (

  `wn_area_id` bigint unsigned NOT NULL AUTO_INCREMENT,

CREATE TABLE `areas` (

  `area_id` bigint unsigned NOT NULL AUTO_INCREMENT,

  `name` varchar(100) NOT NULL,

  `is_active` tinyint unsigned NOT NULL DEFAULT (1),

  `created_at` datetime NOT NULL DEFAULT (utc_timestamp()),

  `updated_at` datetime NOT NULL DEFAULT (utc_timestamp()),

  PRIMARY KEY (`wn_area_id`)

  PRIMARY KEY (`area_id`)

) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;



CREATE TABLE `pa_firewalls` (
@@ -53,7 +53,7 @@ CREATE TABLE `locations` ( 
CREATE TABLE `vlans` (

  `vlan_id` bigint unsigned NOT NULL AUTO_INCREMENT,

  `tag` smallint unsigned NOT NULL,

  `wn_area_id` bigint unsigned NOT NULL,

  `area_id` bigint unsigned NOT NULL,

  `name` varchar(100) DEFAULT NULL,

  `descr` varchar(255) DEFAULT NULL,

  `notes` text,
@@ -61,8 +61,8 @@ CREATE TABLE `vlans` ( 
  `created_at` datetime NOT NULL DEFAULT (utc_timestamp()),

  `updated_at` datetime NOT NULL DEFAULT (utc_timestamp()),

  PRIMARY KEY (`vlan_id`),

  KEY `vlans_wn_areas_FK` (`wn_area_id`),

  CONSTRAINT `vlans_wn_areas_FK` FOREIGN KEY (`wn_area_id`) REFERENCES `wn_areas` (`wn_area_id`)

  KEY `vlans_areas_FK` (`area_id`),

  CONSTRAINT `vlans_areas_FK` FOREIGN KEY (`area_id`) REFERENCES `areas` (`area_id`)

) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;



CREATE TABLE `subnets` (

src/migrations/scripts/20251027152500_InitialDataLoad.sql

+4 −2
Original line number Diff line number Diff line 
INSERT INTO pa_access_domains (pa_access_domain_id,name,manifest_uuid,manifest_path,created_at,updated_at,is_active) VALUES

	 (1,'CALS','76c429a7ea354759848f9b1291828f79','uw:domain:firewall.net.wisc.edu:access_domains:CALS:Vsys-Admin-Role','2025-10-27 19:37:26','2025-10-27 19:37:26',1);

INSERT INTO wn_areas (wn_area_id,name,created_at,updated_at,is_active) VALUES



INSERT INTO areas (area_id,name,created_at,updated_at,is_active) VALUES

	 (1,'ANIMAL','2025-10-27 19:27:07','2025-10-27 19:27:07',1),

	 (2,'CSSC','2025-10-27 19:27:07','2025-10-27 19:27:07',1),

	 (3,'BORDER','2025-10-27 19:27:07','2025-10-27 19:27:07',1),
@@ -10,11 +11,12 @@ INSERT INTO wn_areas (wn_area_id,name,created_at,updated_at,is_active) VALUES 
	 (7,'WIRELESS','2025-10-27 19:27:07','2025-10-27 19:27:07',1),

	 (8,'RBN','2025-10-27 19:27:07','2025-10-27 19:27:07',1),

	 (9,'LAB','2025-10-27 19:27:07','2025-10-27 19:27:07',1);



INSERT INTO pa_firewalls (pa_firewall_id,has_vsys,name,notes,created_at,updated_at) VALUES

	 (1,1,'Animal-Primary',NULL,'2025-10-27 19:37:51','2025-10-27 19:37:51'),

     (2,0,'fp-arlswine-131-1-vpn-pri269s',NULL,'2025-11-01 02:14:51','2025-11-01 02:14:51');



INSERT INTO vlans (vlan_id,name,descr,notes,created_at,updated_at,tag,wn_area_id,is_active) VALUES

INSERT INTO vlans (vlan_id,name,descr,notes,created_at,updated_at,tag,area_id,is_active) VALUES

	 (2,'AG-AND-APPLIED-ECON_PRIVATE','Ag and Applied Economics Private FWSM network',NULL,'2025-10-27 19:29:30','2025-10-27 19:29:30',98,1,1),

     (3,'ARL-SWINE-DOIT-NS-NET-EQPT','Arlington Swine - DoIT Network Services Management Network',NULL,'2025-10-27 19:29:30','2025-10-27 19:29:30',1135,4,1),

     (4,'ARL-SWINE-CAMERAS','Arlington Swine Research - Cameras',NULL,'2025-10-27 19:29:30','2025-10-27 19:29:30',11,4,1),

src/models/WiscNicArea.cs→src/models/Area.cs

+1 −1
Original line number Diff line number Diff line 
namespace Cals.Visor.Models;



public class WiscNicArea

public class Area

{

    public long? AreaId { get; set; }