From 317bb099afdd9474364124b7e2733525c0354407 Mon Sep 17 00:00:00 2001
From: Matthew Winston <Matthew.Winston@inl.gov>
Date: Wed, 20 Dec 2023 15:10:22 -0500
Subject: [PATCH 01/19] progress on Malcolm data parsing

---
 .../Malcolm/IMalcolmBusiness.cs               | 19 +++++
 .../CSETWebCore.Model/Malcolm/Buckets.cs      | 23 +++++
 .../CSETWebCore.Model/Malcolm/Filters.cs      | 14 +++
 .../CSETWebCore.Model/Malcolm/GenericInput.cs | 20 +++++
 .../CSETWebCore.Model/Malcolm/ValuePairs.cs   | 15 ++++
 .../CSETWebCore.Model/Malcolm/Values.cs       | 15 ++++
 .../Controllers/MalcolmController.cs          | 85 +++++++++++++++++++
 .../my-assessments.component.html             |  1 +
 .../my-assessments.component.ts               |  8 +-
 CSETWebNg/src/app/models/malcolm.model.ts     | 48 +++++++++++
 CSETWebNg/src/app/services/hydro.service.ts   |  4 +
 11 files changed, 251 insertions(+), 1 deletion(-)
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Filters.cs
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs.cs
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Values.cs
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
 create mode 100644 CSETWebNg/src/app/models/malcolm.model.ts

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
new file mode 100644
index 0000000000..1c222d309c
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
@@ -0,0 +1,19 @@
+//////////////////////////////// 
+// 
+//   Copyright 2023 Battelle Energy Alliance, LLC  
+// 
+// 
+//////////////////////////////// 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CSETWebCore.Interfaces.Malcolm
+{
+    public interface IMalcolmBusiness
+    {
+
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs
new file mode 100644
index 0000000000..4c37a8b75a
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs
@@ -0,0 +1,23 @@
+//////////////////////////////// 
+// 
+//   Copyright 2023 Battelle Energy Alliance, LLC  
+// 
+// 
+//////////////////////////////// 
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CSETWebCore.Model.Malcolm
+{
+    public class Buckets
+    {
+        public int DocNumber { get; set; }
+        public string Key { get; set; }
+        public List<ValuePairs> Values { get; set; }
+        //public int DocCountErrorUpperBound { get; set; }
+        //public int SumOtherDocCount { get; set; }
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Filters.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Filters.cs
new file mode 100644
index 0000000000..3052aca66d
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Filters.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CSETWebCore.Model.Malcolm
+{
+    public class Filters
+    {
+        public List<string> NetworkDirection { get; set; }
+        public string Tags { get; set; }
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs
new file mode 100644
index 0000000000..3685a6b9ff
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CSETWebCore.Model.Malcolm;
+using Newtonsoft.Json.Linq;
+
+namespace CSETWebCore.Model.Malcolm
+{
+    public class GenericInput: List<GenericInput>
+    {
+        public List<string> Fields { get; set; }
+        public List<Filters> Filters { get; set; }
+        public List<int> Range { get; set; }
+        public List<string> Urls { get; set; }
+        //public JArray Buckets { get; set; }
+        public Values Values { get; set; }
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs.cs
new file mode 100644
index 0000000000..c875cbf5b1
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CSETWebCore.Model.Malcolm
+{
+    public class ValuePairs
+    {
+        public int DocNumber { get; set; }
+        public string Key { get; set; }
+        public Values Values { get; set; }
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Values.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Values.cs
new file mode 100644
index 0000000000..b93b524855
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Values.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CSETWebCore.Model.Malcolm
+{
+    public class Values
+    {
+        public List<Buckets> Buckets { get; set; }
+        public int DocCountErrorUpperBound { get; set; }
+        public int SumOtherDocCount { get; set; }
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
new file mode 100644
index 0000000000..1813e7e324
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
@@ -0,0 +1,85 @@
+//////////////////////////////// 
+// 
+//   Copyright 2023 Battelle Energy Alliance, LLC  
+// 
+// 
+//////////////////////////////// 
+using CSETWebCore.Business.AssessmentIO.Export;
+using CSETWebCore.Business.Merit;
+using CSETWebCore.DataLayer.Model;
+using CSETWebCore.Helpers;
+using CSETWebCore.Interfaces.Helpers;
+using CSETWebCore.Model.AssessmentIO;
+using CSETWebCore.Model.Malcolm;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
+using NPOI.XSSF.UserModel;
+using NuGet.Protocol;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text.Json;
+
+namespace CSETWebCore.Api.Controllers
+{
+    public class MalcolmController : ControllerBase
+    {
+        private ITokenManager _token;
+        private CSETContext _context;
+        private IHttpContextAccessor _http;
+        private IJSONFileExport _json;
+        private TextWriter jsonWriter;
+
+
+        /// <summary>
+        /// Controller
+        /// </summary>
+        public MalcolmController(ITokenManager token, CSETContext context, IHttpContextAccessor http)
+        {
+            _token = token;
+            _context = context;
+            _http = http;
+        }
+
+
+        [HttpGet]
+        [Route("api/malcolm")]
+        public IActionResult MapSourceToDestinationData()
+        {
+            try
+            {
+                //string text = System.IO.File.ReadAllText("C:\\Users\\WINSMR\\Downloads\\source_to_destination_ip.json");
+                
+                //GenericInput json = JsonConvert.DeserializeObject<GenericInput>(text);
+
+                string[] files = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
+                var malcolmDataList = new List<GenericInput>();
+
+                try
+                {
+                    foreach (string file in files)
+                    {
+                        string jsonString = System.IO.File.ReadAllText(file);
+                        var malcolmData = JsonConvert.DeserializeObject<GenericInput>(jsonString);
+                        //weatherData = model.AladinModel.ToList();
+
+                        malcolmDataList.Add(malcolmData);
+                    }
+                }
+                catch (Exception exc)
+                {
+                    NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}");
+                }
+                
+                return Ok();
+            }
+            catch (Exception exc)
+            {
+                NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}");
+            }
+
+            return null;
+        }
+    }
+}
diff --git a/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.html b/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.html
index c325266568..7a2f49a1fc 100644
--- a/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.html
+++ b/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.html
@@ -41,6 +41,7 @@ <h3 class="mt-0" *ngIf="sortedAssessments?.length > 0">{{ t('my assessments') }}
                                 <input type="file" tabindex="0" class="display-none" id="importFile" multiple
                                     accept="{{ importExtensions }},.cset" (change)="importAssessmentFile($event)">
                             </label>
+                            <button (click)="malcolmTest()">malcolm</button>
 
                             <label *ngIf="!authSvc.isLocal && configSvc.showImportButton()"
                                 class="m-0 btn btn-secondary d-flex align-items-center flex-00a"
diff --git a/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.ts b/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.ts
index 33d6c85d3e..231c23e4ec 100644
--- a/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.ts
+++ b/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.ts
@@ -51,6 +51,7 @@ import { forEach } from "lodash";
 import { NcuaExcelExportComponent } from "../../dialogs/excel-export/ncua-export/ncua-excel-export.component";
 import { TranslocoService } from "@ngneat/transloco";
 import { DateAdapter } from '@angular/material/core';
+import { HydroService } from "../../services/hydro.service";
 
 
 interface UserAssessment {
@@ -124,7 +125,8 @@ export class MyAssessmentsComponent implements OnInit {
     public layoutSvc: LayoutService,
     public dateAdapter: DateAdapter<any>,
     public datePipe: DatePipe,
-    public reportSvc: ReportService
+    public reportSvc: ReportService,
+    private hydroSvc: HydroService
   ) { }
 
   ngOnInit() {
@@ -453,4 +455,8 @@ export class MyAssessmentsComponent implements OnInit {
     this.disabledEncrypt = false;
   }
 
+  malcolmTest() {
+    this.hydroSvc.getMalcolmTest().subscribe();
+  }
+
 }
diff --git a/CSETWebNg/src/app/models/malcolm.model.ts b/CSETWebNg/src/app/models/malcolm.model.ts
new file mode 100644
index 0000000000..0627894410
--- /dev/null
+++ b/CSETWebNg/src/app/models/malcolm.model.ts
@@ -0,0 +1,48 @@
+////////////////////////////////
+//
+//   Copyright 2023 Battelle Energy Alliance, LLC
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+////////////////////////////////
+export class InitailInput {
+    fields: string[];
+    filters: Filters[];
+    range: number[];
+    urls: string[];
+    values: Buckets[];
+}
+
+export class Buckets {
+    docCount: number;
+    key: string;
+    values: ValuePairs[];
+    docCountErrorUpperBound: number;
+    sumOtherDocCount: number;
+}
+
+export class ValuePairs {
+    docCount: number;
+    key: string;
+}
+
+export class Filters {
+    networkDirection: string[];
+    tags: string;
+}
\ No newline at end of file
diff --git a/CSETWebNg/src/app/services/hydro.service.ts b/CSETWebNg/src/app/services/hydro.service.ts
index fb26567d26..a5b8558cc2 100644
--- a/CSETWebNg/src/app/services/hydro.service.ts
+++ b/CSETWebNg/src/app/services/hydro.service.ts
@@ -63,6 +63,10 @@ export class HydroService {
   getHydroActionItems(): any {
     return this.http.get(this.configSvc.apiUrl + 'reports/getHydroActionItems');
   }
+
+  getMalcolmTest(): any {
+    return this.http.get(this.configSvc.apiUrl + 'malcolm');
+  }
 }
 
 export class HydroProgressComment {

From 1d5d9d7f0f5ca3e4ea4eadd76f75c2684425e9e6 Mon Sep 17 00:00:00 2001
From: Matthew Winston <Matthew.Winston@inl.gov>
Date: Tue, 2 Jan 2024 11:19:25 -0500
Subject: [PATCH 02/19] Malcolm data mapping to object (import WIP)

---
 .../Malcolm/MalcolmBusiness.cs                | 79 +++++++++++++++++++
 .../Malcolm/IMalcolmBusiness.cs               |  3 +-
 .../CSETWebCore.Model/Malcolm/Buckets.cs      |  6 +-
 .../CSETWebCore.Model/Malcolm/Filters.cs      |  6 +-
 .../CSETWebCore.Model/Malcolm/GenericInput.cs | 10 +--
 .../CSETWebCore.Model/Malcolm/ValuePairs.cs   |  6 +-
 .../CSETWebCore.Model/Malcolm/ValuePairs2.cs  | 14 ++++
 .../CSETWebCore.Model/Malcolm/Values.cs       |  7 +-
 .../Controllers/MalcolmController.cs          | 38 ++++-----
 .../diagram-info/diagram-info.component.html  | 13 ++-
 .../diagram-info/diagram-info.component.ts    | 18 +++++
 .../my-assessments.component.html             |  1 -
 .../my-assessments.component.ts               |  4 -
 CSETWebNg/src/app/services/hydro.service.ts   |  5 +-
 14 files changed, 161 insertions(+), 49 deletions(-)
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs2.cs

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
new file mode 100644
index 0000000000..16e998cf47
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
@@ -0,0 +1,79 @@
+using CSETWebCore.Interfaces.Malcolm;
+using CSETWebCore.Model.Malcolm;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CSETWebCore.Business.Malcolm
+{
+    public class MalcolmBusiness : IMalcolmBusiness
+    {
+        //public MalcolmBusiness() { }
+
+        public IEnumerable<GenericInput> GetMalcolmJsonData()
+        {
+            string[] files = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
+            var malcolmDataList = new List<GenericInput>();
+
+            try
+            {
+                foreach (string file in files)
+                {
+                    string jsonString = File.ReadAllText(file);
+                    var malcolmData = JsonConvert.DeserializeObject<GenericInput>(jsonString);
+
+                    malcolmDataList.Add(malcolmData);
+                }
+
+                return malcolmDataList;
+            }
+            catch (Exception exc)
+            {
+                NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}");
+            }
+
+            return null;
+        }
+
+        /*
+        private static Dictionary<string, List<Buckets>> dict = new Dictionary<string, List<Buckets>>();
+
+        public void Dijkstras (GenericInput malcolmData) 
+        {
+            for (malcolmData.Values.Buckets)
+            {
+
+            }
+
+            dict.Add(malcolmDataList);
+
+            return 
+        }
+
+        public List<Buckets> DijkstrasRecursive (ValuePairs valuePair, List<Buckets> continuousBucketList)
+        {
+            if (valuePair.Buckets != null && valuePair.Buckets.Count > 0) 
+            { 
+                foreach (Buckets bucket in  valuePair.Buckets)
+                {
+                    if (bucket.Key != "")
+                    {
+                        continuousBucketList.Add(bucket);
+                    }
+
+                    if (bucket.Values != null)
+                    {
+
+                    }
+                }
+            }
+
+            return
+        }
+        */
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
index 1c222d309c..af6a5b0232 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
@@ -4,6 +4,7 @@
 // 
 // 
 //////////////////////////////// 
+using CSETWebCore.Model.Malcolm;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -14,6 +15,6 @@ namespace CSETWebCore.Interfaces.Malcolm
 {
     public interface IMalcolmBusiness
     {
-
+        public IEnumerable<GenericInput> GetMalcolmJsonData();
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs
index 4c37a8b75a..d8b08da282 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs
@@ -14,9 +14,11 @@ namespace CSETWebCore.Model.Malcolm
 {
     public class Buckets
     {
-        public int DocNumber { get; set; }
+        public int Doc_Count { get; set; }
         public string Key { get; set; }
-        public List<ValuePairs> Values { get; set; }
+        public ValuePairs Values { get; set; }
+        //public List<ValuePairs> Values { get; set; }
+
         //public int DocCountErrorUpperBound { get; set; }
         //public int SumOtherDocCount { get; set; }
     }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Filters.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Filters.cs
index 3052aca66d..975e2a7523 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Filters.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Filters.cs
@@ -1,4 +1,5 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -8,7 +9,8 @@ namespace CSETWebCore.Model.Malcolm
 {
     public class Filters
     {
-        public List<string> NetworkDirection { get; set; }
+        [JsonProperty(PropertyName = "network.direction")]
+        public List<string> Network_Direction { get; set; } = new List<string>();
         public string Tags { get; set; }
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs
index 3685a6b9ff..d9ca0d04d9 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs
@@ -8,12 +8,12 @@
 
 namespace CSETWebCore.Model.Malcolm
 {
-    public class GenericInput: List<GenericInput>
+    public class GenericInput
     {
-        public List<string> Fields { get; set; }
-        public List<Filters> Filters { get; set; }
-        public List<int> Range { get; set; }
-        public List<string> Urls { get; set; }
+        public List<string> Fields { get; set; } = new List<string>();
+        public Filters Filter { get; set; }
+        public List<int> Range { get; set; } = new List<int>();
+        public List<string> Urls { get; set; } = new List<string>();
         //public JArray Buckets { get; set; }
         public Values Values { get; set; }
     }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs.cs
index c875cbf5b1..8b849f2889 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs.cs
@@ -8,8 +8,8 @@ namespace CSETWebCore.Model.Malcolm
 {
     public class ValuePairs
     {
-        public int DocNumber { get; set; }
-        public string Key { get; set; }
-        public Values Values { get; set; }
+        public int Doc_Count_Error_Upper_Bound { get; set; }
+        public int Sum_Other_Doc_Count { get; set; }
+        public List<Buckets> Buckets { get; set; } = new List<Buckets>();
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs2.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs2.cs
new file mode 100644
index 0000000000..2ce334f35e
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/ValuePairs2.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CSETWebCore.Model.Malcolm
+{
+    public class ValuePairs2
+    {
+        public int Doc_Count { get; set; }
+        public string Key { get; set; }
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Values.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Values.cs
index b93b524855..a90bd74967 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Values.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Values.cs
@@ -8,8 +8,9 @@ namespace CSETWebCore.Model.Malcolm
 {
     public class Values
     {
-        public List<Buckets> Buckets { get; set; }
-        public int DocCountErrorUpperBound { get; set; }
-        public int SumOtherDocCount { get; set; }
+        //public Dictionary<string, Buckets> Buckets { get; set; } = new Dictionary<string, Buckets>();
+        public List<Buckets> Buckets { get; set; } = new List<Buckets>();
+        public int Doc_Count_Error_Upper_Bound { get; set; }
+        public int Sum_Other_Doc_Count { get; set; }
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
index 1813e7e324..01c74456c7 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
@@ -4,22 +4,17 @@
 // 
 // 
 //////////////////////////////// 
-using CSETWebCore.Business.AssessmentIO.Export;
 using CSETWebCore.Business.Merit;
 using CSETWebCore.DataLayer.Model;
-using CSETWebCore.Helpers;
 using CSETWebCore.Interfaces.Helpers;
-using CSETWebCore.Model.AssessmentIO;
+using CSETWebCore.Interfaces.Malcolm;
 using CSETWebCore.Model.Malcolm;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Newtonsoft.Json;
-using NPOI.XSSF.UserModel;
-using NuGet.Protocol;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Text.Json;
 
 namespace CSETWebCore.Api.Controllers
 {
@@ -30,6 +25,8 @@ public class MalcolmController : ControllerBase
         private IHttpContextAccessor _http;
         private IJSONFileExport _json;
         private TextWriter jsonWriter;
+        private IMalcolmBusiness _malcolm;
+
 
 
         /// <summary>
@@ -40,46 +37,39 @@ public MalcolmController(ITokenManager token, CSETContext context, IHttpContextA
             _token = token;
             _context = context;
             _http = http;
+            //_malcolm = malcolm;
         }
 
 
         [HttpGet]
         [Route("api/malcolm")]
-        public IActionResult MapSourceToDestinationData()
+        public IActionResult MapSourceToDestinationData([FromQuery] string files)
         {
+            string[] fileList = files.Split(',');
+            //fileList = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
+            var malcolmDataList = new List<GenericInput>();
+
             try
             {
-                //string text = System.IO.File.ReadAllText("C:\\Users\\WINSMR\\Downloads\\source_to_destination_ip.json");
-                
-                //GenericInput json = JsonConvert.DeserializeObject<GenericInput>(text);
-
-                string[] files = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
-                var malcolmDataList = new List<GenericInput>();
-
-                try
+                foreach (string file in fileList)
                 {
-                    foreach (string file in files)
+                    if (System.IO.File.Exists(file))
                     {
                         string jsonString = System.IO.File.ReadAllText(file);
                         var malcolmData = JsonConvert.DeserializeObject<GenericInput>(jsonString);
-                        //weatherData = model.AladinModel.ToList();
 
                         malcolmDataList.Add(malcolmData);
                     }
                 }
-                catch (Exception exc)
-                {
-                    NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}");
-                }
-                
-                return Ok();
+
+                return Ok(malcolmDataList);
             }
             catch (Exception exc)
             {
                 NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}");
             }
 
-            return null;
+            return null; 
         }
     }
 }
diff --git a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html
index 7fb6e43305..f5a2656646 100644
--- a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html
+++ b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html
@@ -41,11 +41,20 @@ <h4>Network Diagram</h4>
 
         </div>
     </div>
-    <div class="mt-3 mb-5">
-        <button class="btn btn-primary" (click)="navToDiagram('')"><i
+    <div class="mt-3 mb-5" style="display: flex; justify-content: space-between;">
+            <button class="btn btn-primary" (click)="navToDiagram('')"><i
                 class="fas fa-project-diagram mr-2"></i>{{buttonText}}</button>
+        
         <!-- <button class="btn btn-primary" (click)="navToDiagram('orig')"><i
                 class="fas fa-project-diagram mr-2"></i>{{buttonText}} ORIG</button> -->
+            <label for="importFile" class="btn btn-primary cset-icons-import">
+                Import Malcolm
+            </label>
+            <input type="file" class="display-none" id="importFile" multiple
+                accept=".json" (change)="malcolmTest($event)">
+
+            <!-- <button type="file" multiple accept=".acet,.cset" class="btn btn-primary" (click)="malcolmTest()">
+                <i class="mr-2 fs-base cset-icons-import"></i>Malcolm Import</button> -->
     </div>
 
     <app-nav-back-next [page]="'diagram'"></app-nav-back-next>
diff --git a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts
index c401238dc9..864af55bec 100644
--- a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts
+++ b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts
@@ -30,6 +30,7 @@ import { ConfigService } from '../../../services/config.service';
 import { Location } from '@angular/common';
 import { AuthenticationService } from '../../../services/authentication.service';
 import { DiagramInventoryComponent } from '../diagram-inventory/diagram-inventory.component';
+import { HydroService } from '../../../services/hydro.service';
 
 @Component({
     selector: 'app-info',
@@ -47,6 +48,7 @@ export class DiagramInfoComponent implements OnInit {
         public navSvc: NavigationService,
         public configSvc: ConfigService,
         public authSvc: AuthenticationService,
+        public hydroSvc: HydroService,
         private location: Location
     ) { }
     tree: NavTreeNode[] = [];
@@ -111,4 +113,20 @@ export class DiagramInfoComponent implements OnInit {
             '&l=' + this.authSvc.isLocal +
             '&a=' + localStorage.getItem('assessmentId');
     }
+
+    malcolmTest(e: any) {
+        if (e.target.files[0].name.endsWith(".json")) {
+            let fileList = [];
+            for (let file of e.target.files) {
+                console.log(e.target.value)
+                fileList.push(file.name);
+            };
+            this.hydroSvc.getMalcolmTest(fileList).subscribe(
+                (result: any) => {
+                    console.log(result)
+                }
+            );
+        }
+        
+    }
 }
diff --git a/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.html b/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.html
index 7a2f49a1fc..c325266568 100644
--- a/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.html
+++ b/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.html
@@ -41,7 +41,6 @@ <h3 class="mt-0" *ngIf="sortedAssessments?.length > 0">{{ t('my assessments') }}
                                 <input type="file" tabindex="0" class="display-none" id="importFile" multiple
                                     accept="{{ importExtensions }},.cset" (change)="importAssessmentFile($event)">
                             </label>
-                            <button (click)="malcolmTest()">malcolm</button>
 
                             <label *ngIf="!authSvc.isLocal && configSvc.showImportButton()"
                                 class="m-0 btn btn-secondary d-flex align-items-center flex-00a"
diff --git a/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.ts b/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.ts
index 231c23e4ec..20d35375c6 100644
--- a/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.ts
+++ b/CSETWebNg/src/app/initial/my-assessments/my-assessments.component.ts
@@ -455,8 +455,4 @@ export class MyAssessmentsComponent implements OnInit {
     this.disabledEncrypt = false;
   }
 
-  malcolmTest() {
-    this.hydroSvc.getMalcolmTest().subscribe();
-  }
-
 }
diff --git a/CSETWebNg/src/app/services/hydro.service.ts b/CSETWebNg/src/app/services/hydro.service.ts
index a5b8558cc2..9c81ed82cc 100644
--- a/CSETWebNg/src/app/services/hydro.service.ts
+++ b/CSETWebNg/src/app/services/hydro.service.ts
@@ -64,8 +64,9 @@ export class HydroService {
     return this.http.get(this.configSvc.apiUrl + 'reports/getHydroActionItems');
   }
 
-  getMalcolmTest(): any {
-    return this.http.get(this.configSvc.apiUrl + 'malcolm');
+  getMalcolmTest(fileList: any) {
+    console.log(fileList.toString())
+    return this.http.get(this.configSvc.apiUrl + 'malcolm?files=' + fileList.toString(), headers);
   }
 }
 

From 352c960b26c3b30b4409ad5b47289f6453e555ec Mon Sep 17 00:00:00 2001
From: Brett <43300357+MathesonBrett@users.noreply.github.com>
Date: Tue, 2 Jan 2024 16:00:02 -0700
Subject: [PATCH 03/19] Initial upload support

---
 .../Controllers/MalcolmController.cs          | 42 ++++++++++---------
 .../diagram-info/diagram-info.component.html  |  9 +---
 .../diagram-info/diagram-info.component.ts    | 25 ++++++-----
 CSETWebNg/src/app/services/hydro.service.ts   | 11 +++--
 4 files changed, 45 insertions(+), 42 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
index 01c74456c7..e9e340b225 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
@@ -11,7 +11,9 @@
 using CSETWebCore.Model.Malcolm;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing.Constraints;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -41,35 +43,37 @@ public MalcolmController(ITokenManager token, CSETContext context, IHttpContextA
         }
 
 
-        [HttpGet]
+        [HttpPost]
         [Route("api/malcolm")]
-        public IActionResult MapSourceToDestinationData([FromQuery] string files)
+        public IActionResult MapSourceToDestinationData()
         {
-            string[] fileList = files.Split(',');
-            //fileList = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
-            var malcolmDataList = new List<GenericInput>();
+            var formFiles = HttpContext.Request.Form.Files;
+            String fileName = "";
+            String fileExtension = "";
 
-            try
-            {
-                foreach (string file in fileList)
+            foreach (FormFile file in formFiles)
+            {       
+                try
                 {
-                    if (System.IO.File.Exists(file))
+                    using (var stream = new MemoryStream())
                     {
-                        string jsonString = System.IO.File.ReadAllText(file);
-                        var malcolmData = JsonConvert.DeserializeObject<GenericInput>(jsonString);
+                        fileName = file.FileName;
+                        fileExtension = System.IO.Path.GetExtension(fileName);
 
-                        malcolmDataList.Add(malcolmData);
+                        if (fileExtension == ".json")
+                        {
+                            
+                        }
                     }
+                } catch (Exception ex)
+                {
+                    return BadRequest(ex);
                 }
-
-                return Ok(malcolmDataList);
-            }
-            catch (Exception exc)
-            {
-                NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}");
             }
 
-            return null; 
+            return Ok();
         }
     }
+
+
 }
diff --git a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html
index f5a2656646..c607745db8 100644
--- a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html
+++ b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html
@@ -44,17 +44,12 @@ <h4>Network Diagram</h4>
     <div class="mt-3 mb-5" style="display: flex; justify-content: space-between;">
             <button class="btn btn-primary" (click)="navToDiagram('')"><i
                 class="fas fa-project-diagram mr-2"></i>{{buttonText}}</button>
-        
-        <!-- <button class="btn btn-primary" (click)="navToDiagram('orig')"><i
-                class="fas fa-project-diagram mr-2"></i>{{buttonText}} ORIG</button> -->
+                
             <label for="importFile" class="btn btn-primary cset-icons-import">
                 Import Malcolm
             </label>
             <input type="file" class="display-none" id="importFile" multiple
-                accept=".json" (change)="malcolmTest($event)">
-
-            <!-- <button type="file" multiple accept=".acet,.cset" class="btn btn-primary" (click)="malcolmTest()">
-                <i class="mr-2 fs-base cset-icons-import"></i>Malcolm Import</button> -->
+                accept=".json" (change)="uploadMalcolmData($event)">
     </div>
 
     <app-nav-back-next [page]="'diagram'"></app-nav-back-next>
diff --git a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts
index 864af55bec..a42404b5b0 100644
--- a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts
+++ b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts
@@ -43,6 +43,9 @@ export class DiagramInfoComponent implements OnInit {
     buttonText: string = this.msgNoDiagramExists;
     hasDiagram: boolean = false;
 
+    malcolmFiles: File[];
+
+
     constructor(private router: Router,
         public assessSvc: AssessmentService,
         public navSvc: NavigationService,
@@ -114,19 +117,15 @@ export class DiagramInfoComponent implements OnInit {
             '&a=' + localStorage.getItem('assessmentId');
     }
 
-    malcolmTest(e: any) {
-        if (e.target.files[0].name.endsWith(".json")) {
-            let fileList = [];
-            for (let file of e.target.files) {
-                console.log(e.target.value)
-                fileList.push(file.name);
-            };
-            this.hydroSvc.getMalcolmTest(fileList).subscribe(
-                (result: any) => {
-                    console.log(result)
-                }
-            );
+    uploadMalcolmData(event: any) {
+        this.malcolmFiles = event.target.files;
+
+        if (this.malcolmFiles) {
+            this.hydroSvc.uploadMalcolmFiles(this.malcolmFiles).subscribe((result: any) => {
+                console.log("SUCCESS... MAYBE!?");
+            });
         }
-        
     }
+
+
 }
diff --git a/CSETWebNg/src/app/services/hydro.service.ts b/CSETWebNg/src/app/services/hydro.service.ts
index 9c81ed82cc..3fa5d39915 100644
--- a/CSETWebNg/src/app/services/hydro.service.ts
+++ b/CSETWebNg/src/app/services/hydro.service.ts
@@ -64,9 +64,14 @@ export class HydroService {
     return this.http.get(this.configSvc.apiUrl + 'reports/getHydroActionItems');
   }
 
-  getMalcolmTest(fileList: any) {
-    console.log(fileList.toString())
-    return this.http.get(this.configSvc.apiUrl + 'malcolm?files=' + fileList.toString(), headers);
+  uploadMalcolmFiles(files: File[]) {
+    let formData: FormData = new FormData();
+    
+    for (let i = 0; i < files.length; i++) {
+      formData.append('file', files[i]);
+    }
+
+    return this.http.post(this.configSvc.apiUrl + 'malcolm?', formData);
   }
 }
 

From d39e14035f334e3ab97109f9155fd431ef186cb9 Mon Sep 17 00:00:00 2001
From: Brett <43300357+MathesonBrett@users.noreply.github.com>
Date: Mon, 8 Jan 2024 10:47:07 -0700
Subject: [PATCH 04/19] Initial back end processing of front end json data

---
 .../CSETWebCore.Business/Malcolm/MalcolmBusiness.cs  |  6 +++---
 .../Malcolm/IMalcolmBusiness.cs                      |  2 +-
 .../Malcolm/{GenericInput.cs => MalcolmData.cs}      |  2 +-
 .../CSETWeb_ApiCore/Controllers/MalcolmController.cs | 12 +++++++++---
 4 files changed, 14 insertions(+), 8 deletions(-)
 rename CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/{GenericInput.cs => MalcolmData.cs} (95%)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
index 16e998cf47..3ad9523e8f 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
@@ -14,17 +14,17 @@ public class MalcolmBusiness : IMalcolmBusiness
     {
         //public MalcolmBusiness() { }
 
-        public IEnumerable<GenericInput> GetMalcolmJsonData()
+        public IEnumerable<MalcolmData> GetMalcolmJsonData()
         {
             string[] files = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
-            var malcolmDataList = new List<GenericInput>();
+            var malcolmDataList = new List<MalcolmData>();
 
             try
             {
                 foreach (string file in files)
                 {
                     string jsonString = File.ReadAllText(file);
-                    var malcolmData = JsonConvert.DeserializeObject<GenericInput>(jsonString);
+                    var malcolmData = JsonConvert.DeserializeObject<MalcolmData>(jsonString);
 
                     malcolmDataList.Add(malcolmData);
                 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
index af6a5b0232..2fef408478 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
@@ -15,6 +15,6 @@ namespace CSETWebCore.Interfaces.Malcolm
 {
     public interface IMalcolmBusiness
     {
-        public IEnumerable<GenericInput> GetMalcolmJsonData();
+        public IEnumerable<MalcolmData> GetMalcolmJsonData();
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs
similarity index 95%
rename from CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs
rename to CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs
index d9ca0d04d9..519091579e 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/GenericInput.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs
@@ -8,7 +8,7 @@
 
 namespace CSETWebCore.Model.Malcolm
 {
-    public class GenericInput
+    public class MalcolmData
     {
         public List<string> Fields { get; set; } = new List<string>();
         public Filters Filter { get; set; }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
index e9e340b225..9a6e8dda72 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
@@ -48,8 +48,9 @@ public MalcolmController(ITokenManager token, CSETContext context, IHttpContextA
         public IActionResult MapSourceToDestinationData()
         {
             var formFiles = HttpContext.Request.Form.Files;
-            String fileName = "";
-            String fileExtension = "";
+            string fileName = "";
+            string fileExtension = "";
+            string output = "";
 
             foreach (FormFile file in formFiles)
             {       
@@ -59,10 +60,15 @@ public IActionResult MapSourceToDestinationData()
                     {
                         fileName = file.FileName;
                         fileExtension = System.IO.Path.GetExtension(fileName);
+                        MalcolmData data = new MalcolmData();
 
                         if (fileExtension == ".json")
                         {
-                            
+                            file.CopyTo(stream);
+                            stream.Seek(0, SeekOrigin.Begin);
+                            StreamReader sr = new StreamReader(stream);
+                            string jsonString = sr.ReadToEnd();
+                            data = JsonConvert.DeserializeObject<MalcolmData>(jsonString);
                         }
                     }
                 } catch (Exception ex)

From 578429d779bcf76ed3f4e6b5ffe02ce775df5eca Mon Sep 17 00:00:00 2001
From: Brett <43300357+MathesonBrett@users.noreply.github.com>
Date: Mon, 8 Jan 2024 14:42:54 -0700
Subject: [PATCH 05/19] More robust error handling for malcolm upload

---
 .../Controllers/MalcolmController.cs          | 18 +++-
 .../Error/MalcolmUploadError.cs               | 25 ++++++
 CSETWebNg/src/app/app.module.ts               |  2 +
 .../diagram-info/diagram-info.component.ts    | 21 ++++-
 .../malcolm-upload-error.component.html       | 51 ++++++++++++
 .../malcolm/malcolm-upload-error.component.ts | 83 +++++++++++++++++++
 6 files changed, 195 insertions(+), 5 deletions(-)
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/MalcolmUploadError.cs
 create mode 100644 CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.html
 create mode 100644 CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.ts

diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
index 9a6e8dda72..3f31092f89 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
@@ -4,6 +4,7 @@
 // 
 // 
 //////////////////////////////// 
+using CSETWebCore.Api.Error;
 using CSETWebCore.Business.Merit;
 using CSETWebCore.DataLayer.Model;
 using CSETWebCore.Interfaces.Helpers;
@@ -51,6 +52,7 @@ public IActionResult MapSourceToDestinationData()
             string fileName = "";
             string fileExtension = "";
             string output = "";
+            List<MalcolmUploadError> errors = new List<MalcolmUploadError>();
 
             foreach (FormFile file in formFiles)
             {       
@@ -69,15 +71,27 @@ public IActionResult MapSourceToDestinationData()
                             StreamReader sr = new StreamReader(stream);
                             string jsonString = sr.ReadToEnd();
                             data = JsonConvert.DeserializeObject<MalcolmData>(jsonString);
+                        } else
+                        {
+                            MalcolmUploadError error = new MalcolmUploadError(fileName, 415, "files of type " + fileExtension + " are unsupported.");
+                            errors.Add(error);
                         }
                     }
                 } catch (Exception ex)
                 {
-                    return BadRequest(ex);
+                    MalcolmUploadError error = new MalcolmUploadError(fileName, 400, ex.Message);
+                    errors.Add(error);
                 }
             }
 
-            return Ok();
+            if (errors.Count > 0)
+            {
+                return Ok(errors);
+            }
+            else
+            {
+                return Ok();
+            }
         }
     }
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/MalcolmUploadError.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/MalcolmUploadError.cs
new file mode 100644
index 0000000000..269bd7b4ee
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Error/MalcolmUploadError.cs
@@ -0,0 +1,25 @@
+//////////////////////////////// 
+// 
+//   Copyright 2023 Battelle Energy Alliance, LLC  
+// 
+// 
+//////////////////////////////// 
+using Microsoft.AspNetCore.Http;
+using System.IO;
+using System.Text.Json;
+
+namespace CSETWebCore.Api.Error
+{
+    public class MalcolmUploadError
+    {
+        public MalcolmUploadError(string file, int statusCodes, string message) 
+        { 
+            File = file;
+            StatusCode = statusCodes;
+            Message = message;
+        }
+        public string File { get; set; }
+        public int StatusCode { get; set; }
+        public string Message { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/CSETWebNg/src/app/app.module.ts b/CSETWebNg/src/app/app.module.ts
index 13ca0d6f10..7a9ab60e15 100644
--- a/CSETWebNg/src/app/app.module.ts
+++ b/CSETWebNg/src/app/app.module.ts
@@ -608,6 +608,7 @@ import { CmuOtherRemarksComponent } from './reports/cmu/cmu-other-remarks/cmu-ot
 import { TranslocoRootModule } from './transloco-root.module';
 import { TranslocoService } from '@ngneat/transloco';
 import { UserLanguageComponent } from './dialogs/user-language/user-language.component';
+import { MalcolmUploadErrorComponent } from './dialogs/malcolm/malcolm-upload-error.component';
 import { FooterService } from './services/footer.service';
 import { AssessmentConvertCfComponent } from './assessment/prepare/assessment-info/assessment-convert-cf/assessment-convert-cf.component';
 import {
@@ -1181,6 +1182,7 @@ import { IseWarningsComponent } from './assessment/results/reports/ise-warnings/
         OtherRemarksComponent,
         CmuOtherRemarksComponent,
         UserLanguageComponent,
+        MalcolmUploadErrorComponent,
         AssessmentConvertCfComponent,
         IseWarningsComponent,
     ],
diff --git a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts
index a42404b5b0..0033017c56 100644
--- a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts
+++ b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.ts
@@ -31,6 +31,8 @@ import { Location } from '@angular/common';
 import { AuthenticationService } from '../../../services/authentication.service';
 import { DiagramInventoryComponent } from '../diagram-inventory/diagram-inventory.component';
 import { HydroService } from '../../../services/hydro.service';
+import { MatDialog } from '@angular/material/dialog';
+import { MalcolmUploadErrorComponent } from '../../../dialogs/malcolm/malcolm-upload-error.component';
 
 @Component({
     selector: 'app-info',
@@ -52,7 +54,8 @@ export class DiagramInfoComponent implements OnInit {
         public configSvc: ConfigService,
         public authSvc: AuthenticationService,
         public hydroSvc: HydroService,
-        private location: Location
+        private location: Location,
+        private dialog: MatDialog
     ) { }
     tree: NavTreeNode[] = [];
     ngOnInit() {
@@ -121,11 +124,23 @@ export class DiagramInfoComponent implements OnInit {
         this.malcolmFiles = event.target.files;
 
         if (this.malcolmFiles) {
-            this.hydroSvc.uploadMalcolmFiles(this.malcolmFiles).subscribe((result: any) => {
-                console.log("SUCCESS... MAYBE!?");
+            this.hydroSvc.uploadMalcolmFiles(this.malcolmFiles).subscribe(
+                (result) => {
+                    if (result != null) {
+                        this.openUploadErrorDialog(result);
+                    }
             });
         }
     }
 
+    openUploadErrorDialog(errorData: any) {
+        let errorDialog = this.dialog.open(MalcolmUploadErrorComponent, {
+            minHeight: '300px',
+            minWidth: '400px',
+            data: {
+                error: errorData
+            }
+        });
+    }
 
 }
diff --git a/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.html b/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.html
new file mode 100644
index 0000000000..b40cfb013e
--- /dev/null
+++ b/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.html
@@ -0,0 +1,51 @@
+<!---------------------- 
+
+   Copyright 2023 Battelle Energy Alliance, LLC  
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy 
+  of this software and associated documentation files (the "Software"), to deal 
+  in the Software without restriction, including without limitation the rights 
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 
+  copies of the Software, and to permit persons to whom the Software is 
+  furnished to do so, subject to the following conditions: 
+ 
+  The above copyright notice and this permission notice shall be included in all 
+  copies or substantial portions of the Software. 
+ 
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+  SOFTWARE. 
+-------------------------->
+<div class="ok-dialog d-flex flex-column justify-content-center flex-11a">
+    <div class="mat-dialog-header p-3 d-flex justify-content-start align-items-center flex-00a">
+      <span class="mr-3 fs-base-6 {{iconClass}}"></span>
+      <span>{{dialogTitle}}</span>
+    </div>
+
+    <mat-dialog-content class="p-3 pb-0 pr-0 oy-auto d-flex flex-column flex-11a">
+        <div class="pr-3">
+            <p>It appears one or more errors occured during the Malcolm data upload process.<br></p>
+        
+            <div *ngIf="have400errors">
+                The following files were returned with errors
+                <li *ngFor="let file of errorCode400Files"><i>{{ file }}</i></li><br>
+                <p>Please ensure all files are valid JSON and have the correct schema.</p><br>
+            </div>
+
+            <div *ngIf="have415errors">
+                The following files were returned because they are an unsupported file type:
+                <li *ngFor="let file of errorCode415Files"><i>{{ file }}</i></li><br>
+                <p>The upload process only accepts .JSON files at the current time.</p><br>
+            </div>
+
+      </div>
+    </mat-dialog-content>
+
+    <mat-dialog-actions class="p-3 pt-3 mb-0 d-flex ml-auto flex-00a">
+      <button class="btn btn-secondary" (click)="dialogRef.close(true)">OK</button>
+    </mat-dialog-actions>
+  </div>
\ No newline at end of file
diff --git a/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.ts b/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.ts
new file mode 100644
index 0000000000..5629ae3012
--- /dev/null
+++ b/CSETWebNg/src/app/dialogs/malcolm/malcolm-upload-error.component.ts
@@ -0,0 +1,83 @@
+////////////////////////////////
+//
+//   Copyright 2023 Battelle Energy Alliance, LLC
+//
+//  Permission is hereby granted, free of charge, to any person obtaining a copy
+//  of this software and associated documentation files (the "Software"), to deal
+//  in the Software without restriction, including without limitation the rights
+//  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+//  copies of the Software, and to permit persons to whom the Software is
+//  furnished to do so, subject to the following conditions:
+//
+//  The above copyright notice and this permission notice shall be included in all
+//  copies or substantial portions of the Software.
+//
+//  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+//  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+//  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+//  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+//  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+//  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+//  SOFTWARE.
+//
+////////////////////////////////
+import { Component, OnInit, Inject } from '@angular/core';
+import { MatDialogRef, MAT_DIALOG_DATA, MatDialogActions } from '@angular/material/dialog';
+
+@Component({
+  selector: 'app-malcolm-upload-error',
+  templateUrl: './malcolm-upload-error.component.html'
+})
+export class MalcolmUploadErrorComponent implements OnInit {
+
+  constructor(
+    @Inject(MAT_DIALOG_DATA) public data: any,
+    public dialogRef: MatDialogRef<MalcolmUploadErrorComponent>
+  ) { }
+
+  iconClass: string = "cset-icons-bell";
+  dialogTitle: string = "Upload Error(s)";
+
+  errors: any[] = [];
+
+  have400errors: boolean = false;
+  errorCode400Files: any[] = [];
+
+  have415errors: boolean = false;
+  errorCode415Files: any[] = [];
+
+
+  ngOnInit() {
+    this.errors = this.data.error;
+    this.checkErrors();
+
+  }
+
+  checkErrors() {
+    // Check each error we got back, and save the file name
+    this.errors.forEach(error => {
+        if (error.statusCode == 400) {
+            this.errorCode400Files.push(error.file);
+        }
+        if (error.statusCode == 415) {
+            this.errorCode415Files.push(error.file);
+        }
+    });
+
+    // Show the files that caused HTTP code 400
+    if (this.errorCode400Files.length > 0) {
+        this.have400errors = true;
+    } else {
+        this.have400errors = false;
+    }
+
+    // Show the files that caused HTTP code 415
+    if (this.errorCode415Files.length > 0) {
+        this.have415errors = true;
+    } else {
+        this.have415errors = false;
+    }
+
+  }
+
+}

From 78b00898cf227fd6b84507e0f3769584294b7a25 Mon Sep 17 00:00:00 2001
From: Matthew Winston <Matthew.Winston@inl.gov>
Date: Mon, 8 Jan 2024 18:11:52 -0500
Subject: [PATCH 06/19] WIP malcolm data building

---
 .../Malcolm/MalcolmBusiness.cs                | 453 +++++++++++++++++-
 .../CSETWebCore.Model/Malcolm/Buckets.cs      |   1 +
 .../Controllers/MalcolmController.cs          |  48 +-
 CSETWebNg/src/app/models/malcolm.model.ts     |   1 +
 4 files changed, 467 insertions(+), 36 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
index 16e998cf47..c503c4efde 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
@@ -1,32 +1,70 @@
-using CSETWebCore.Interfaces.Malcolm;
+using CSETWebCore.DataLayer.Model;
+using CSETWebCore.Interfaces.Malcolm;
 using CSETWebCore.Model.Malcolm;
 using Newtonsoft.Json;
+using NPOI.POIFS.Properties;
+using NPOI.SS.Formula.Functions;
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using static CSETWebCore.Business.Malcolm.Graph;
 
 namespace CSETWebCore.Business.Malcolm
 {
-    public class MalcolmBusiness : IMalcolmBusiness
+    public class MalcolmBusiness
     {
-        //public MalcolmBusiness() { }
+        private CSETContext _context;
+
+        private Dictionary<string, Node> treeDictionary = new Dictionary<string, Node>();
+        private HashSet<string> alreadySeenList = new HashSet<string>();
+
+
+        public MalcolmBusiness(CSETContext context) 
+        {
+            _context = context;
+        }
 
         public IEnumerable<GenericInput> GetMalcolmJsonData()
         {
             string[] files = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
             var malcolmDataList = new List<GenericInput>();
-
+            //var dict = new Dictionary<string, int>();
             try
             {
                 foreach (string file in files)
                 {
                     string jsonString = File.ReadAllText(file);
                     var malcolmData = JsonConvert.DeserializeObject<GenericInput>(jsonString);
+                    var dict = new Dictionary<string, int>();
+                    var edgeList = new List<Edge>();
+
+                    dict = CreateDictionary(malcolmData.Values.Buckets, dict);
+                    //edgeList = GoThroughEdges(malcolmData.Values.Buckets, edgeList, "");
+                    Node topLevelNodeHolder = GoThroughEdges(malcolmData.Values.Buckets, "");
+                    List<Node> topLevelNodes = topLevelNodeHolder.GetChildren();
+                    List<Edge> topLevelEdges = topLevelNodeHolder.GetEdges();
+
+                    treeDictionary.Clear();
+                    StartTheTreeWalk(dict, topLevelNodeHolder);
+                    //Dictionary<string, Node> minimalSpanningTree_v1 = StartTheTreeWalk(dict, topLevelNodeHolder);
+
+                    // Adjacency list for storing which vertices are connected
+                    List<List<int>> adj = new List<List<int>>(dict.Count());
+
+                    for (int i = 0; i < dict.Count(); i++)
+                    {
+                        adj.Add(new List<int>());
+                    }
+
+                    //List<Node> minimalSpanningTree_v2 = 
+                    //Graph graph = new Graph(dict.Count, edgeList.Count, edgeList.ToArray());
 
                     malcolmDataList.Add(malcolmData);
+                    
                 }
 
                 return malcolmDataList;
@@ -39,41 +77,412 @@ public IEnumerable<GenericInput> GetMalcolmJsonData()
             return null;
         }
 
-        /*
-        private static Dictionary<string, List<Buckets>> dict = new Dictionary<string, List<Buckets>>();
 
-        public void Dijkstras (GenericInput malcolmData) 
+        public Dictionary<string, int> CreateDictionary (List<Buckets> buckets, Dictionary<string, int> childrenDict)
+        {
+            foreach (Buckets bucket in buckets)
+            {
+                if (bucket.Values != null)
+                {
+                    childrenDict.TryAdd(bucket.Key, bucket.Values.Buckets.Count);
+                    childrenDict = CreateDictionary(bucket.Values.Buckets, childrenDict);
+                }
+                else
+                {
+                    childrenDict.TryAdd(bucket.Key, 0);
+                }
+            }
+
+            return childrenDict;
+        }
+
+
+        public Node GoThroughEdges(List<Buckets> buckets, string parentKey)
+        {
+            // this keeps track of all the nodes going to be read from the bucket list
+            Node parentNode = new Node();
+            parentNode.key = parentKey;
+
+            // iterating through the buckets
+            foreach (Buckets bucket in buckets)
+            {
+                // setting up the node info for this bucket
+                Node currentNode = new Node();
+                currentNode.key = bucket.Key;
+                currentNode.parentKey = parentKey;
+
+                // establishing the link between this node's parent (passed into this function) and itself
+                Edge edge = new Edge();
+                edge.src = parentKey;
+                edge.dest = bucket.Key;
+
+                currentNode.AddEdge(edge);
+
+                // if this bucket has values (i.e. if this node has children),
+                // pass this bucket as the parent and recurse through its values
+                Node childrenNodes = new Node();
+                if (bucket.Values != null)
+                {
+                    childrenNodes = GoThroughEdges(bucket.Values.Buckets, bucket.Key);
+                }
+
+                currentNode.AddChildren(childrenNodes.GetChildren());
+                currentNode.AddEdges(childrenNodes.GetEdges());
+
+                // add this currentNode to the lists of its parent's children and edges
+                parentNode.AddChild(currentNode);
+                parentNode.AddEdge(edge);
+            }
+
+            // return list of children
+            return parentNode;
+        }
+
+
+        public void StartTheTreeWalk(Dictionary<string, int> childrenDict, Node topLevelNodeHolder)
+        {
+            //get the root node
+            //var tree = new Dictionary<string, Node>(); //this is the empty tree
+            WalkTree(topLevelNodeHolder);
+        }
+
+
+        public void WalkTree(Node node)
         {
-            for (malcolmData.Values.Buckets)
+            if (alreadySeenList.Contains(node.key))
             {
+                return;
+            }
+            alreadySeenList.Add(node.key);
+
+            var children = node.GetChildren();
+            //var organizedChildren = ;
+            foreach (var child in children)
+            {
+                treeDictionary.TryAdd(child.key, child);
+                WalkTree(child);
 
             }
 
-            dict.Add(malcolmDataList);
+            //treeDictionary.TryAdd(child.key, child);
+
 
-            return 
+            //return tree;
         }
 
-        public List<Buckets> DijkstrasRecursive (ValuePairs valuePair, List<Buckets> continuousBucketList)
+
+        // a modified version of BFS that 
+        // stores predecessor of each vertex 
+        // in array pred and its distance 
+        // from source in array dist
+        private static bool BFS(List<List<int>> adj, int src, int dest, int v, int[] pred, int[] dist)
         {
-            if (valuePair.Buckets != null && valuePair.Buckets.Count > 0) 
-            { 
-                foreach (Buckets bucket in  valuePair.Buckets)
-                {
-                    if (bucket.Key != "")
-                    {
-                        continuousBucketList.Add(bucket);
-                    }
+            // a queue to maintain queue of 
+            // vertices whose adjacency list 
+            // is to be scanned as per normal
+            // BFS algorithm using List of int type
+            List<int> queue = new List<int>();
 
-                    if (bucket.Values != null)
+            // bool array visited[] which 
+            // stores the information whether 
+            // ith vertex is reached at least 
+            // once in the Breadth first search
+            bool[] visited = new bool[v];
+
+            // initially all vertices are 
+            // unvisited so v[i] for all i 
+            // is false and as no path is 
+            // yet constructed dist[i] for 
+            // all i set to infinity
+            for (int i = 0; i < v; i++)
+            {
+                visited[i] = false;
+                dist[i] = int.MaxValue;
+                pred[i] = -1;
+            }
+
+            // now source is first to be 
+            // visited and distance from 
+            // source to itself should be 0
+            visited[src] = true;
+            dist[src] = 0;
+            queue.Add(src);
+
+            // bfs Algorithm
+            while (queue.Count != 0)
+            {
+                int u = queue[0];
+                queue.RemoveAt(0);
+
+                for (int i = 0;
+                         i < adj[u].Count; i++)
+                {
+                    if (visited[adj[u][i]] == false)
                     {
+                        visited[adj[u][i]] = true;
+                        dist[adj[u][i]] = dist[u] + 1;
+                        pred[adj[u][i]] = u;
+                        queue.Add(adj[u][i]);
 
+                        // stopping condition (when we 
+                        // find our destination)
+                        if (adj[u][i] == dest)
+                            return true;
                     }
                 }
             }
+            return false;
+        }
+
+
+        public void AddEdgeMinimalSpanningTree(List<List<int>> adj, int src, int dest)
+        {
+            adj[src].Add(dest);
+            adj[dest].Add(src);
+        }
+
+
+        public class Node
+        {
+            public string key;
+            public string parentKey;
+            List<Edge> edges = new List<Edge>();
+            List<Node> children = new List<Node>();
+
+            public void AddChild(Node node)
+            {
+                //alreadySeenList.Add(node);
+                //fullListOfNodes[node] = true;
+                children.Add(node);
+            }
+
+            public void AddChildren(List<Node> childrenToAdd)
+            {
+                children.AddRange(childrenToAdd);
+            }
+
+            public void AddEdge(string src,string dest)
+            {
+                Edge edge = new Edge();
+                edge.dest = dest;
+                edge.src = src;
+                edges.Add(edge);
+            }
+
+            public void AddEdge(Edge edge)
+            {
+                edges.Add(edge);
+            }
+
+            public void AddEdges(List<Edge> edgesToAdd)
+            {
+                edges.AddRange(edgesToAdd);
+            }
+
+            public List<Node> GetChildren()
+            {
+                return children;
+            }
+
+            public List<Edge> GetEdges()
+            {
+                return edges;
+            }
+
+        }
+
+        //public Dictionary<string, int> AssignIndexKeyPairs(Dictionary<string, int> childrenDict)
+        //{
+        //    int i = 0;
+        //    var keyIndexPairs = new Dictionary<string, int>();
+
+        //    foreach (string key in childrenDict.Keys)
+        //    {
+        //        keyIndexPairs.TryAdd(key, i);
+        //        i++;
+        //    }
+
+        //    return keyIndexPairs;
+        //}
+
+        //
+
+
+    }
+
+
+    public class Graph
+    { 
+        public int V, E;
+        public Edge[] edge;
+
+        public Graph(int nV, int nE, Edge[] edgeArray)
+        {
+            V = nV;
+            E = nE;
+            edge = edgeArray;
+        }
+
+        // class to represent edge
+        public class Edge
+        {
+            public string src, dest;
+        }
+
+        // class to represent Subset
+        class Subset
+        {
+            public int parent;
+            public int rank;
+        }
+
+        // A utility function to find
+        // set of an element i (uses
+        // path compression technique)
+        int find(Subset[] subsets, int i)
+        {
+            if(i > subsets.Length)
+            {
+                if (subsets[i].parent != i)
+                    subsets[i].parent
+                        = find(subsets, subsets[i].parent);
+                return subsets[i].parent;
+            }
+            if (subsets[i].parent != i)
+                subsets[i].parent
+                    = find(subsets, subsets[i].parent);
+            return subsets[i].parent;
+        }
+
+        // A function that does union
+        // of two sets of x and y
+        // (uses union by rank)
+        Subset[] Union(Subset[] subsets, int x, int y)
+        {
+            int xroot = find(subsets, x);
+            int yroot = find(subsets, y);
+
+            if (xroot > subsets.Length || yroot > subsets.Length)
+                subsets[xroot].parent = yroot;
+
+            if (subsets[xroot].rank < subsets[yroot].rank)
+                subsets[xroot].parent = yroot;
+            else if (subsets[yroot].rank < subsets[xroot].rank)
+                subsets[yroot].parent = xroot;
+            else
+            {
+                subsets[xroot].parent = yroot;
+                subsets[yroot].rank++;
+            }
 
-            return
+            return subsets;
         }
-        */
+
+        //// The main function to construct MST 
+        //// using Kruskal's algorithm 
+        //public void KruskalMST()
+        //{
+        //    // This will store the 
+        //    // resultant MST 
+        //    Edge[] result = new Edge[V];
+
+        //    // An index variable, used for result[] 
+        //    int e = 0;
+
+        //    // An index variable, used for sorted edges 
+        //    int i = 0;
+        //    for (i = 0; i < V; ++i)
+        //        result[i] = new Edge();
+
+        //    // Sort all the edges in non-decreasing 
+        //    // order of their weight. If we are not allowed 
+        //    // to change the given graph, we can create 
+        //    // a copy of array of edges 
+        //    Array.Sort(edge);
+
+        //    // Allocate memory for creating V subsets 
+        //    Subset[] subsets = new Subset[V];
+        //    for (i = 0; i < V; ++i)
+        //        subsets[i] = new Subset();
+
+        //    // Create V subsets with single elements 
+        //    for (int v = 0; v < V; ++v)
+        //    {
+        //        subsets[v].parent = v;
+        //        subsets[v].rank = 0;
+        //    }
+        //    i = 0;
+
+        //    // Number of edges to be taken is equal to V-1 
+        //    while (e < V - 1)
+        //    {
+        //        if (e == V - 2)
+        //            Console.WriteLine("");
+        //        // Pick the smallest edge. And increment 
+        //        // the index for next iteration 
+        //        Edge next_edge = new Edge();
+
+        //        if (i == edge.Length)
+        //            next_edge = edge[i++];
+
+        //        next_edge = edge[i++];
+
+        //        int x = find(subsets, next_edge.src);
+        //        int y = find(subsets, next_edge.dest);
+
+        //        // If including this edge doesn't cause cycle, 
+        //        // include it in result and increment the index 
+        //        // of result for next edge 
+        //        if (x != y)
+        //        {
+        //            result[e++] = next_edge;
+        //            Union(subsets, x, y);
+        //            //subsets = Union(subsets, x, y);
+        //        }
+        //    }
+
+        //    // Print the contents of result[] to display 
+        //    // the built MST 
+        //    Console.WriteLine("Following are the edges in "
+        //                      + "the constructed MST");
+
+        //    int minimumCost = 0;
+        //    for (i = 0; i < e; ++i)
+        //    {
+        //        Console.WriteLine(result[i].src + " -- "
+        //                          + result[i].dest
+        //                          + " == " + result[i].weight);
+        //        minimumCost += result[i].weight;
+        //    }
+
+        //    Console.WriteLine("Minimum Cost Spanning Tree: "
+        //                      + minimumCost);
+        //}
+
+        //// The main function to check whether
+        //// a given graph contains cycle or not
+        //int isCycle(Graph graph)
+        //{
+        //    int V = graph.V;
+        //    int E = graph.E;
+
+        //    Subset[] subsets = new Subset[V];
+        //    for (int v = 0; v < V; v++)
+        //    {
+        //        subsets[v] = new Subset();
+        //        subsets[v].parent = v;
+        //        subsets[v].rank = 0;
+        //    }
+
+        //    for (int e = 0; e < E; e++)
+        //    {
+        //        int x = find(subsets, graph.edge[e].src);
+        //        int y = find(subsets, graph.edge[e].dest);
+        //        if (x == y)
+        //            return 1;
+        //        Union(subsets, x, y);
+        //    }
+        //    return 0;
+        //}
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs
index d8b08da282..8e788efee3 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/Buckets.cs
@@ -16,6 +16,7 @@ public class Buckets
     {
         public int Doc_Count { get; set; }
         public string Key { get; set; }
+        public int Distance { get; set; }
         public ValuePairs Values { get; set; }
         //public List<ValuePairs> Values { get; set; }
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
index 01c74456c7..bdcafe6fd9 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
@@ -4,6 +4,7 @@
 // 
 // 
 //////////////////////////////// 
+using CSETWebCore.Business.Malcolm;
 using CSETWebCore.Business.Merit;
 using CSETWebCore.DataLayer.Model;
 using CSETWebCore.Interfaces.Helpers;
@@ -15,6 +16,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 
 namespace CSETWebCore.Api.Controllers
 {
@@ -25,7 +27,6 @@ public class MalcolmController : ControllerBase
         private IHttpContextAccessor _http;
         private IJSONFileExport _json;
         private TextWriter jsonWriter;
-        private IMalcolmBusiness _malcolm;
 
 
 
@@ -37,7 +38,6 @@ public MalcolmController(ITokenManager token, CSETContext context, IHttpContextA
             _token = token;
             _context = context;
             _http = http;
-            //_malcolm = malcolm;
         }
 
 
@@ -45,31 +45,51 @@ public MalcolmController(ITokenManager token, CSETContext context, IHttpContextA
         [Route("api/malcolm")]
         public IActionResult MapSourceToDestinationData([FromQuery] string files)
         {
-            string[] fileList = files.Split(',');
-            //fileList = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
-            var malcolmDataList = new List<GenericInput>();
+            return Ok(new MalcolmBusiness(_context).GetMalcolmJsonData());
+            //return Ok(GetMalcolmJsonData());
+        }
 
+        public IEnumerable<GenericInput> GetMalcolmJsonData()
+        {
+            string[] files = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
+            var malcolmDataList = new List<GenericInput>();
+            //var dict = new Dictionary<string, int>();
             try
             {
-                foreach (string file in fileList)
+                foreach (string file in files)
                 {
-                    if (System.IO.File.Exists(file))
-                    {
-                        string jsonString = System.IO.File.ReadAllText(file);
-                        var malcolmData = JsonConvert.DeserializeObject<GenericInput>(jsonString);
+                    string jsonString = System.IO.File.ReadAllText(file);
+                    var malcolmData = JsonConvert.DeserializeObject<GenericInput>(jsonString);
 
-                        malcolmDataList.Add(malcolmData);
-                    }
+                    var dict = new Dictionary<string, int>();
+                    dict = CreateDictionary(malcolmData.Values.Buckets, dict);
+                    dict.OrderBy(a => a.Value);
+
+                    malcolmDataList.Add(malcolmData);
                 }
 
-                return Ok(malcolmDataList);
+                return malcolmDataList;
             }
             catch (Exception exc)
             {
                 NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}");
             }
 
-            return null; 
+            return null;
+        }
+
+        public Dictionary<string, int> CreateDictionary(List<Buckets> buckets, Dictionary<string, int> dict)
+        {
+            foreach (Buckets bucket in buckets)
+            {
+                if (bucket.Values != null)
+                {
+                    dict.TryAdd(bucket.Key, bucket.Values.Buckets.Count);
+                    dict = CreateDictionary(bucket.Values.Buckets, dict);
+                }
+            }
+
+            return dict;
         }
     }
 }
diff --git a/CSETWebNg/src/app/models/malcolm.model.ts b/CSETWebNg/src/app/models/malcolm.model.ts
index 0627894410..3747464579 100644
--- a/CSETWebNg/src/app/models/malcolm.model.ts
+++ b/CSETWebNg/src/app/models/malcolm.model.ts
@@ -40,6 +40,7 @@ export class Buckets {
 export class ValuePairs {
     docCount: number;
     key: string;
+    distance: number;
 }
 
 export class Filters {

From 454ab4617410211478b611f36ac7f84b9c995d57 Mon Sep 17 00:00:00 2001
From: Matthew Winston <Matthew.Winston@inl.gov>
Date: Mon, 8 Jan 2024 18:41:34 -0500
Subject: [PATCH 07/19] injected business manager

---
 .../CSETWebCore.Business/Malcolm/MalcolmBusiness.cs          | 2 +-
 CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Startup.cs            | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
index e7b1031c49..2b2934ab1d 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
@@ -15,7 +15,7 @@
 
 namespace CSETWebCore.Business.Malcolm
 {
-    public class MalcolmBusiness
+    public class MalcolmBusiness : IMalcolmBusiness
     {
         private CSETContext _context;
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Startup.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Startup.cs
index b6e1f36d04..d9a20913c0 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Startup.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Startup.cs
@@ -76,6 +76,8 @@
 using DocumentFormat.OpenXml.Spreadsheet;
 using System;
 using CSETWebCore.Business.AssessmentIO.Import;
+using CSETWebCore.Interfaces.Malcolm;
+using CSETWebCore.Business.Malcolm;
 
 namespace CSETWeb_ApiCore
 {
@@ -174,7 +176,8 @@ public void ConfigureServices(IServiceCollection services)
             services.AddTransient<IGalleryState, GalleryState>();
             services.AddTransient<IGalleryEditor, GalleryEditor>();
             services.AddScoped<IIRPBusiness, IRPBusiness>();
-            services.AddTransient<IJSONFileExport, JSONFileExport>();
+            services.AddTransient<IJSONFileExport, JSONFileExport>(); 
+            services.AddTransient<IMalcolmBusiness, MalcolmBusiness>();
 
 
             services.AddSwaggerGen(c =>

From c67876865870f75ced1f91850694ee7166806cef Mon Sep 17 00:00:00 2001
From: Barry Hansen <5023364+inlguy@users.noreply.github.com>
Date: Mon, 8 Jan 2024 18:06:39 -0700
Subject: [PATCH 08/19] first pass at the network

---
 .../Malcolm/MalcolmBusiness.cs                | 88 +++++++++----------
 .../CSETWebCore.BusinessTests.csproj          | 22 +++++
 .../Malcolm/IMalcolmBusiness.cs               |  2 +-
 .../CSETWebCore.Model/Malcolm/MalcolmData.cs  |  1 +
 .../Controllers/MalcolmController.cs          |  2 +-
 5 files changed, 66 insertions(+), 49 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
index 2b2934ab1d..846a225b2a 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
@@ -1,16 +1,8 @@
 using CSETWebCore.DataLayer.Model;
 using CSETWebCore.Interfaces.Malcolm;
 using CSETWebCore.Model.Malcolm;
-using Newtonsoft.Json;
-using NPOI.POIFS.Properties;
-using NPOI.SS.Formula.Functions;
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using static CSETWebCore.Business.Malcolm.Graph;
 
 namespace CSETWebCore.Business.Malcolm
@@ -20,6 +12,7 @@ public class MalcolmBusiness : IMalcolmBusiness
         private CSETContext _context;
 
         private Dictionary<string, Node> treeDictionary = new Dictionary<string, Node>();
+        private Dictionary<string, TmpNode> networkOfNodes = new Dictionary<string, TmpNode>();
         private HashSet<string> alreadySeenList = new HashSet<string>();
 
 
@@ -28,56 +21,57 @@ public MalcolmBusiness(CSETContext context)
             _context = context;
         }
 
-        public IEnumerable<MalcolmData> GetMalcolmJsonData()
+        public Dictionary<string,TmpNode> RunTest(List<MalcolmData> datalist)
         {
-            string[] files = Directory.GetFiles("C:\\Users\\WINSMR\\Documents\\MalcolmJson");
-            var malcolmDataList = new List<MalcolmData>();
+            GetMalcolmJsonData(datalist);
+            return networkOfNodes;
+        }
 
-            try
+        public IEnumerable<MalcolmData> GetMalcolmJsonData(List<MalcolmData> datalist)
+        { 
+            var malcolmDataList = new List<MalcolmData>();
+            var tmp = new TmpNode("this is the root");
+            foreach (MalcolmData malcolmData in datalist)
             {
-                foreach (string file in files)
-                {
-                    string jsonString = File.ReadAllText(file);
-                    var malcolmData = JsonConvert.DeserializeObject<MalcolmData>(jsonString);
-                    var dict = new Dictionary<string, int>();
-                    var edgeList = new List<Edge>();
-
-                    dict = CreateDictionary(malcolmData.Values.Buckets, dict);
-                    //edgeList = GoThroughEdges(malcolmData.Values.Buckets, edgeList, "");
-                    Node topLevelNodeHolder = GoThroughEdges(malcolmData.Values.Buckets, "");
-                    List<Node> topLevelNodes = topLevelNodeHolder.GetChildren();
-                    List<Edge> topLevelEdges = topLevelNodeHolder.GetEdges();
-
-                    treeDictionary.Clear();
-                    StartTheTreeWalk(dict, topLevelNodeHolder);
-                    //Dictionary<string, Node> minimalSpanningTree_v1 = StartTheTreeWalk(dict, topLevelNodeHolder);
-
-                    // Adjacency list for storing which vertices are connected
-                    List<List<int>> adj = new List<List<int>>(dict.Count());
-
-                    for (int i = 0; i < dict.Count(); i++)
-                    {
-                        adj.Add(new List<int>());
-                    }
+                if (malcolmData != null)
+                {   
+                    BuildNetwork(tmp, malcolmData.Values.Buckets) ;
+                }             
+            }
 
-                    //List<Node> minimalSpanningTree_v2 = 
-                    //Graph graph = new Graph(dict.Count, edgeList.Count, edgeList.ToArray());
+            return malcolmDataList;
+            
+        }
 
-                    malcolmDataList.Add(malcolmData);
-                    
+        private void BuildNetwork(TmpNode parent, List<Buckets>buckets)
+        {   
+            foreach (var bucket in buckets)
+            {
+                TmpNode tnode;
+                if (String.IsNullOrEmpty(bucket.Key))
+                {
+                    continue;
+                }
+                if(networkOfNodes.TryGetValue(bucket.Key, out tnode))
+                {   
+                    parent.listChildren.Add(tnode);
                 }
+                else
+                {
+                    tnode = new TmpNode(bucket.Key);
+                    networkOfNodes.Add(bucket.Key, tnode);
+                    parent.listChildren.Add(tnode);
 
-                return malcolmDataList;
-            }
-            catch (Exception exc)
-            {
-                NLog.LogManager.GetCurrentClassLogger().Error($"... {exc}");
+                }
+                if(bucket.Values != null)
+                {
+                    BuildNetwork(tnode, bucket.Values.Buckets);
+                }
             }
-
-            return null;
         }
 
 
+
         public Dictionary<string, int> CreateDictionary (List<Buckets> buckets, Dictionary<string, int> childrenDict)
         {
             foreach (Buckets bucket in buckets)
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj
index 76cd13110b..d56ec9253b 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj
@@ -39,6 +39,28 @@
 
   <ItemGroup>
     <ProjectReference Include="..\CSETWebCore.Business\CSETWebCore.Business.csproj" />
+    <ProjectReference Include="..\CSETWebCore.Model\CSETWebCore.Model.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="MalcolmJson\all_detected_software.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="MalcolmJson\all_network_protocols.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="MalcolmJson\cross_segment_traffic.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="MalcolmJson\direction_source_destination_protocol.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="MalcolmJson\source_destination_protocol_inbound_only.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="MalcolmJson\source_to_destination_ip.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
index 2fef408478..d685a00b2d 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
@@ -15,6 +15,6 @@ namespace CSETWebCore.Interfaces.Malcolm
 {
     public interface IMalcolmBusiness
     {
-        public IEnumerable<MalcolmData> GetMalcolmJsonData();
+        public IEnumerable<MalcolmData> GetMalcolmJsonData(List<MalcolmData> list);
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs
index 519091579e..cf9bf5b01f 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs
@@ -16,5 +16,6 @@ public class MalcolmData
         public List<string> Urls { get; set; } = new List<string>();
         //public JArray Buckets { get; set; }
         public Values Values { get; set; }
+        public TmpNode netNode { get; set; }
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
index b89aa95b41..3b2911d443 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
@@ -97,7 +97,7 @@ public IActionResult MapSourceToDestinationData()
             }
             else
             {
-                return Ok(new MalcolmBusiness(_context).GetMalcolmJsonData());
+                return Ok(new MalcolmBusiness(_context).GetMalcolmJsonData(dataList));
             }
         }
     }

From 804b1e5acc9a82e1b0972fd907d9c8df6184ac62 Mon Sep 17 00:00:00 2001
From: Barry Hansen <5023364+inlguy@users.noreply.github.com>
Date: Mon, 8 Jan 2024 18:14:39 -0700
Subject: [PATCH 09/19] working network

---
 .../Malcolm/MalcolmBusiness.cs                |    4 +-
 .../Malcolm/MalcolmBusinessTests.cs           |   53 +
 .../MalcolmJson/all_detected_software.json    |  256 ++
 .../MalcolmJson/all_network_protocols.json    |  276 ++
 .../MalcolmJson/cross_segment_traffic.json    |   98 +
 ...direction_source_destination_protocol.json | 3177 +++++++++++++++++
 ...rce_destination_protocol_inbound_only.json |   24 +
 .../MalcolmJson/source_to_destination_ip.json | 1439 ++++++++
 .../CSETWebCore.Model/Malcolm/TmpNode.cs      |   28 +
 9 files changed, 5353 insertions(+), 2 deletions(-)
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/all_detected_software.json
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/all_network_protocols.json
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/cross_segment_traffic.json
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/direction_source_destination_protocol.json
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/source_destination_protocol_inbound_only.json
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/source_to_destination_ip.json
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TmpNode.cs

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
index 846a225b2a..78bfc5aab7 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
@@ -54,13 +54,13 @@ private void BuildNetwork(TmpNode parent, List<Buckets>buckets)
                 }
                 if(networkOfNodes.TryGetValue(bucket.Key, out tnode))
                 {   
-                    parent.listChildren.Add(tnode);
+                    parent.Children.Add(tnode);
                 }
                 else
                 {
                     tnode = new TmpNode(bucket.Key);
                     networkOfNodes.Add(bucket.Key, tnode);
-                    parent.listChildren.Add(tnode);
+                    parent.Children.Add(tnode);
 
                 }
                 if(bucket.Values != null)
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
new file mode 100644
index 0000000000..b386eea8ca
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
@@ -0,0 +1,53 @@
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using CSETWebCore.Business.Malcolm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using CSETWebCore.Model.Malcolm;
+using Newtonsoft.Json;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+namespace CSETWebCore.Business.Malcolm.Tests
+{
+    [TestClass()]
+    public class MalcolmBusinessTests
+    {
+        [TestMethod()]
+        public void GetMalcolmJsonDataTest()
+        {
+            string dir = Directory.GetCurrentDirectory();
+            string[] files = Directory.GetFiles(Path.Combine(dir,"MalcolmJson"), "source_to_destination_ip.json");
+            List<MalcolmData> datalist = new List<MalcolmData>();
+            foreach (string file in files)
+            {
+                string jsonString = File.ReadAllText(file);
+                var malcolmData = JsonConvert.DeserializeObject<MalcolmData>(jsonString);
+                datalist.Add(malcolmData);
+            }
+            MalcolmBusiness tst = new MalcolmBusiness(new DataLayer.Model.CSETContext());
+            Dictionary<string,TmpNode> nodesList= tst.RunTest(datalist);
+            foreach(TmpNode node in nodesList.Values)
+            {
+                Trace.WriteLine("node");
+                Trace.WriteLine(node.Key);
+                Trace.WriteLine(node.PrintChildrenList());
+                
+                foreach(var n in node.Children)
+                    PrintChildren(n);
+            }
+        }
+        private void PrintChildren(TmpNode node)
+        {
+            Trace.Write(node.Key);
+            foreach (TmpNode c in node.Children)
+            {
+                Trace.WriteLine("->" + c.Key);
+            }
+        }
+    }
+
+   
+}
\ No newline at end of file
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/all_detected_software.json b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/all_detected_software.json
new file mode 100644
index 0000000000..692e5e8a64
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/all_detected_software.json
@@ -0,0 +1,256 @@
+{
+  "fields": [
+    "zeek.software.name",
+    "zeek.software.unparsed_version"
+  ],
+  "filter": null,
+  "range": [
+    1544805405,
+    1702571805
+  ],
+  "urls": [
+    "/dashboards/app/dashboards#/view/87d990cc-9e0b-41e5-b8fe-b10ae1da0c85?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2018-12-14T16:36:45.503184Z',to:'2023-12-14T16:36:45.506891Z'))"
+  ],
+  "values": {
+    "buckets": [
+      {
+        "doc_count": 6,
+        "key": "Nmap-SSH",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 3,
+              "key": "Nmap-SSH1-Hostkey"
+            },
+            {
+              "doc_count": 3,
+              "key": "Nmap-SSH2-Hostkey"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "MSIE",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 10.0; Win64; x64; Trident/7.0; .NET4.0C; .NET4.0E)"
+            },
+            {
+              "doc_count": 1,
+              "key": "Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)"
+            },
+            {
+              "doc_count": 1,
+              "key": "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "NmapNSE",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 3,
+              "key": "NmapNSE_1.0"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "<unknown browser>",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "Mozilla/5.0 (compatible; Nmap Scripting Engine; https://nmap.org/book/nse.html)"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "Firefox",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "Microsoft-Windows",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "Microsoft-Windows/6.1 UPnP/1.0 Windows-Media-Player-DMS/12.0.7601.17514 DLNADOC/1.50"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "Microsoft-Windows-NT",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "Microsoft-Windows-NT/5.1 UPnP/1.0 UPnP-Device-Host/1.0 Microsoft-HTTPAPI/2.0"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "SimpleHTTP",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "SimpleHTTP/0.6 Python/2.7.17"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "Windows-Media-Player-DMS",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "Windows-Media-Player-DMS/12.0.7601.17514"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1,
+        "key": "ClearSCADA",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "ClearSCADA/6.72.4644.1"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1,
+        "key": "GoAhead-Webs",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "GoAhead-Webs"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1,
+        "key": "MSFT",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "MSFT 5.0"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1,
+        "key": "Microsoft-IIS",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "Microsoft-IIS/7.5"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1,
+        "key": "Microsoft-WebDAV-MiniRedir",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "Microsoft-WebDAV-MiniRedir/6.1.7601"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1,
+        "key": "Python-urllib",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "Python-urllib/2.7"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1,
+        "key": "Version",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "Version_1.0"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      }
+    ],
+    "doc_count_error_upper_bound": 0,
+    "sum_other_doc_count": 0
+  }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/all_network_protocols.json b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/all_network_protocols.json
new file mode 100644
index 0000000000..2747797c6a
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/all_network_protocols.json
@@ -0,0 +1,276 @@
+{
+  "fields": [
+    "network.type",
+    "network.transport",
+    "network.protocol",
+    "network.protocol_version"
+  ],
+  "filter": {
+    "network.direction": [
+      "inbound",
+      "outbound",
+      "internal"
+    ]
+  },
+  "range": [
+    1544805334,
+    1702571734
+  ],
+  "urls": [
+    "/dashboards/app/dashboards#/view/abdd7550-2c7c-40dc-947e-f6d186a158c4?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2018-12-14T16:35:34.070664Z',to:'2023-12-14T16:35:34.074320Z'))"
+  ],
+  "values": {
+    "buckets": [
+      {
+        "doc_count": 164833,
+        "key": "ipv4",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 23236,
+              "key": "tcp",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 7180,
+                    "key": "smb",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4224,
+                          "key": "1"
+                        },
+                        {
+                          "doc_count": 1438,
+                          "key": "2"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1383,
+                    "key": "s7comm",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1307,
+                    "key": "cotp",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1280,
+                    "key": "dce_rpc",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 688,
+                    "key": "http",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 151,
+                          "key": "1.0"
+                        },
+                        {
+                          "doc_count": 133,
+                          "key": "1.1"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 410,
+                    "key": "ntlm",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 361,
+                    "key": "gssapi",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 146,
+                    "key": "tds",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 19,
+                    "key": "modbus",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 6,
+                    "key": "rdp",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "enip",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "rfb",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 3,
+                    "key": "ftp",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "telnet",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2276,
+              "key": "udp",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2095,
+                    "key": "dns",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 48,
+                    "key": "dhcp",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "enip",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 20,
+              "key": "icmp",
+              "values": {
+                "buckets": [],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 970,
+        "key": "ipv6",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 955,
+              "key": "udp",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 908,
+                    "key": "dns",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 15,
+              "key": "icmp",
+              "values": {
+                "buckets": [],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      }
+    ],
+    "doc_count_error_upper_bound": 0,
+    "sum_other_doc_count": 0
+  }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/cross_segment_traffic.json b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/cross_segment_traffic.json
new file mode 100644
index 0000000000..85b5284151
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/cross_segment_traffic.json
@@ -0,0 +1,98 @@
+{
+  "fields": [
+    "source.segment.name",
+    "destination.segment.name",
+    "network.protocol"
+  ],
+  "filter": {
+    "tags": "cross_segment"
+  },
+  "range": [
+    1544805569,
+    1702571969
+  ],
+  "urls": [
+    "/dashboards/app/dashboards#/view/abdd7550-2c7c-40dc-947e-f6d186a158c4?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2018-12-14T16:39:29.245668Z',to:'2023-12-14T16:39:29.249354Z'))"
+  ],
+  "values": {
+    "buckets": [
+      {
+        "doc_count": 28,
+        "key": "Battery Network",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 25,
+              "key": "Combined Cycle BOP",
+              "values": {
+                "buckets": [],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "Solar Panel Network",
+              "values": {
+                "buckets": [],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 20,
+        "key": "Combined Cycle BOP",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 11,
+              "key": "Battery Network",
+              "values": {
+                "buckets": [],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 9,
+              "key": "Solar Panel Network",
+              "values": {
+                "buckets": [],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1,
+        "key": "Solar Panel Network",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "Combined Cycle BOP",
+              "values": {
+                "buckets": [],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      }
+    ],
+    "doc_count_error_upper_bound": 0,
+    "sum_other_doc_count": 0
+  }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/direction_source_destination_protocol.json b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/direction_source_destination_protocol.json
new file mode 100644
index 0000000000..70d8c51f69
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/direction_source_destination_protocol.json
@@ -0,0 +1,3177 @@
+{
+  "fields": [
+    "network.direction",
+    "source.ip",
+    "destination.ip",
+    "network.protocol"
+  ],
+  "filter": {
+    "network.direction": [
+      "inbound",
+      "outbound",
+      "internal"
+    ]
+  },
+  "range": [
+    1544805209,
+    1702571609
+  ],
+  "urls": [
+    "/dashboards/app/dashboards#/view/abdd7550-2c7c-40dc-947e-f6d186a158c4?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2018-12-14T16:33:29.784244Z',to:'2023-12-14T16:33:29.787930Z'))"
+  ],
+  "values": {
+    "buckets": [
+      {
+        "doc_count": 165803,
+        "key": "internal",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 36797,
+              "key": "10.10.20.3",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 34031,
+                    "key": "10.10.20.8",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 27347,
+                          "key": "cip"
+                        },
+                        {
+                          "doc_count": 6684,
+                          "key": "enip"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2765,
+                    "key": "10.10.20.6",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1446,
+                          "key": "cip"
+                        },
+                        {
+                          "doc_count": 1319,
+                          "key": "enip"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 35399,
+              "key": "10.10.10.3",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 8150,
+                    "key": "10.10.10.68",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 8150,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 5900,
+                    "key": "10.10.10.64",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 5900,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4075,
+                    "key": "10.10.10.69",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4075,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4072,
+                    "key": "10.10.10.63",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4072,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4072,
+                    "key": "10.10.10.65",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4072,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4072,
+                    "key": "10.10.10.66",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4072,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4072,
+                    "key": "10.10.10.67",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4072,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 344,
+                    "key": "10.10.10.255",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 343,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 327,
+                    "key": "224.0.0.252",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 327,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 285,
+                    "key": "10.10.10.11",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 284,
+                          "key": "http"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 20,
+                    "key": "10.10.10.55",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 20,
+                          "key": "http"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 3,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "255.255.255.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 34441,
+              "key": "10.10.20.8",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 34039,
+                    "key": "10.10.20.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 27353,
+                          "key": "cip"
+                        },
+                        {
+                          "doc_count": 6684,
+                          "key": "enip"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 300,
+                    "key": "10.10.20.11",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 239,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 32,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 16,
+                          "key": "gssapi"
+                        },
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 3,
+                          "key": "dce_rpc"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 85,
+                    "key": "10.10.20.10",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 72,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 24,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 12,
+                          "key": "gssapi"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 11,
+                    "key": "10.10.20.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 6,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 2,
+                          "key": "ntlm"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 3,
+                    "key": "255.255.255.255",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 3,
+                          "key": "enip"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "10.10.20.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 14624,
+              "key": "10.10.10.12",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 14621,
+                    "key": "10.10.10.14",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 14513,
+                          "key": "modbus"
+                        },
+                        {
+                          "doc_count": 64,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 32,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 16,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 8,
+                          "key": "gssapi"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 12774,
+              "key": "10.10.20.5",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 7083,
+                    "key": "10.10.20.11",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1492,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 62,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 53,
+                          "key": "dce_rpc"
+                        },
+                        {
+                          "doc_count": 31,
+                          "key": "gssapi"
+                        },
+                        {
+                          "doc_count": 13,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 3,
+                          "key": "rdp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 5534,
+                    "key": "10.10.20.10",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 87,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 28,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 14,
+                          "key": "gssapi"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 123,
+                    "key": "10.10.20.8",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 67,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 58,
+                          "key": "ntlm"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 11,
+                    "key": "10.10.10.10",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 9,
+                    "key": "192.168.0.11",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 5413,
+              "key": "10.10.10.14",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 5406,
+                    "key": "10.10.10.12",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4837,
+                          "key": "modbus"
+                        },
+                        {
+                          "doc_count": 550,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 26,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 13,
+                          "key": "gssapi"
+                        },
+                        {
+                          "doc_count": 5,
+                          "key": "dce_rpc"
+                        },
+                        {
+                          "doc_count": 2,
+                          "key": "http"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2782,
+              "key": "10.10.20.6",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2769,
+                    "key": "10.10.20.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1447,
+                          "key": "cip"
+                        },
+                        {
+                          "doc_count": 1322,
+                          "key": "enip"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "10.10.20.255",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 3,
+                    "key": "224.0.0.252",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 3,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "255.255.255.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2726,
+              "key": "10.10.10.68",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2716,
+                    "key": "10.10.10.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2716,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "10.10.10.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.10.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2111,
+              "key": "192.168.0.11",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1552,
+                    "key": "192.168.0.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 871,
+                          "key": "cotp"
+                        },
+                        {
+                          "doc_count": 697,
+                          "key": "s7comm"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 267,
+                    "key": "192.168.0.255",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 252,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 267,
+                    "key": "224.0.0.252",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 267,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 10,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 7,
+                    "key": "192.168.0.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 3,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 3,
+                          "key": "smb"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 7,
+                    "key": "255.255.255.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2087,
+              "key": "10.10.10.11",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1848,
+                    "key": "10.10.10.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1577,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 380,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 191,
+                          "key": "gssapi"
+                        },
+                        {
+                          "doc_count": 62,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 7,
+                          "key": "dce_rpc"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 125,
+                    "key": "10.10.10.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 80,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 12,
+                          "key": "dce_rpc"
+                        },
+                        {
+                          "doc_count": 6,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 6,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 3,
+                          "key": "gssapi"
+                        },
+                        {
+                          "doc_count": 3,
+                          "key": "rdp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 111,
+                    "key": "10.10.10.55",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 91,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 30,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 15,
+                          "key": "gssapi"
+                        },
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1972,
+              "key": "10.10.10.64",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1966,
+                    "key": "10.10.10.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1966,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.10.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1818,
+              "key": "10.10.10.5",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1445,
+                    "key": "10.10.10.10",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1402,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 22,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 16,
+                          "key": "dce_rpc"
+                        },
+                        {
+                          "doc_count": 11,
+                          "key": "gssapi"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 342,
+                    "key": "10.10.10.11",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 342,
+                          "key": "http"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 12,
+                    "key": "10.10.20.8",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 12,
+                    "key": "10.10.20.11",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 3,
+                    "key": "192.168.0.11",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.20.10",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1368,
+              "key": "10.10.10.69",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1358,
+                    "key": "10.10.10.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1358,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "10.10.10.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.10.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1367,
+              "key": "10.10.10.67",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1357,
+                    "key": "10.10.10.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1357,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "10.10.10.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.10.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1363,
+              "key": "10.10.10.63",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1357,
+                    "key": "10.10.10.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1357,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.10.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1363,
+              "key": "10.10.10.65",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1357,
+                    "key": "10.10.10.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1357,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.10.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1363,
+              "key": "10.10.10.66",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1357,
+                    "key": "10.10.10.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1357,
+                          "key": "modbus"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.10.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1307,
+              "key": "192.168.0.5",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1301,
+                    "key": "192.168.0.11",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1204,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 54,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 27,
+                          "key": "gssapi"
+                        },
+                        {
+                          "doc_count": 20,
+                          "key": "dce_rpc"
+                        },
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.20.11",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1130,
+              "key": "192.168.0.1",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1127,
+                    "key": "192.168.0.11",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 685,
+                          "key": "s7comm"
+                        },
+                        {
+                          "doc_count": 435,
+                          "key": "cotp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "255.255.255.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 1071,
+              "key": "10.10.30.5",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1070,
+                    "key": "10.10.30.33",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1047,
+                          "key": "dce_rpc"
+                        },
+                        {
+                          "doc_count": 12,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 10,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 2,
+                          "key": "gssapi"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 371,
+              "key": "10.10.30.1",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 159,
+                    "key": "224.0.0.251",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 159,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 120,
+                    "key": "224.0.0.252",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 120,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 68,
+                    "key": "10.10.255.255",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 68,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 24,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 331,
+              "key": "fe80::b528:b15f:1681:3e2",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 329,
+                    "key": "ff02::1:3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 329,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 290,
+              "key": "fe80::31c6:f934:59d4:3744",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 270,
+                    "key": "ff02::1:3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 270,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 6,
+                    "key": "fe80::21de:6a5d:c2fa:e4ac",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 5,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 3,
+                    "key": "ff02::16",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 279,
+              "key": "fe80::4956:29e0:d069:b432",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 155,
+                    "key": "ff02::fb",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 155,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 120,
+                    "key": "ff02::1:3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 120,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 147,
+              "key": "10.0.0.128",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 145,
+                    "key": "10.0.0.131",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 145,
+                          "key": "tds"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.0.0.129",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1,
+                          "key": "ftp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 134,
+              "key": "10.10.30.130",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 104,
+                    "key": "10.10.30.128",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 84,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 12,
+                          "key": "dce_rpc"
+                        },
+                        {
+                          "doc_count": 4,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 1,
+                          "key": "gssapi"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 15,
+                    "key": "10.10.30.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 15,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 14,
+                    "key": "10.10.30.129",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 14,
+                          "key": "smb"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 101,
+              "key": "192.168.95.128",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 80,
+                    "key": "192.168.95.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 80,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 21,
+                    "key": "192.168.95.254",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 21,
+                          "key": "dhcp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 90,
+              "key": "10.10.30.33",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 89,
+                    "key": "10.10.30.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 85,
+                          "key": "dce_rpc"
+                        },
+                        {
+                          "doc_count": 4,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 69,
+              "key": "192.168.95.133",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 67,
+                    "key": "192.168.95.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 67,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "192.168.95.254",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dhcp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 59,
+              "key": "10.0.0.133",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 59,
+                    "key": "10.0.0.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 59,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 56,
+              "key": "192.168.0.129",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 55,
+                    "key": "192.168.0.128",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 50,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 5,
+                          "key": "dce_rpc"
+                        },
+                        {
+                          "doc_count": 2,
+                          "key": "ntlm"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 46,
+              "key": "192.168.95.134",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 44,
+                    "key": "192.168.95.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 44,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "192.168.95.254",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dhcp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 45,
+              "key": "10.10.10.55",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 17,
+                    "key": "10.10.10.3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 16,
+                          "key": "http"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 16,
+                    "key": "10.10.10.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 14,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 4,
+                          "key": "ntlm"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 3,
+                    "key": "10.10.10.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "255.255.255.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 37,
+              "key": "192.168.95.135",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 35,
+                    "key": "192.168.95.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 35,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "192.168.95.254",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dhcp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 34,
+              "key": "10.10.20.11",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 25,
+                    "key": "10.10.20.8",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 7,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 2,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 2,
+                          "key": "rdp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 8,
+                    "key": "10.10.20.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        },
+                        {
+                          "doc_count": 1,
+                          "key": "smb"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 32,
+              "key": "10.0.0.131",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 30,
+                    "key": "10.0.0.128",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 26,
+                          "key": "smb"
+                        },
+                        {
+                          "doc_count": 4,
+                          "key": "ntlm"
+                        },
+                        {
+                          "doc_count": 2,
+                          "key": "gssapi"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.0.0.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 24,
+              "key": "10.0.0.40",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 16,
+                    "key": "10.0.0.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 16,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 5,
+                    "key": "10.0.0.120",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "224.0.0.252",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 22,
+              "key": "192.168.95.132",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 20,
+                    "key": "192.168.95.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 20,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "192.168.95.254",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dhcp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 20,
+              "key": "10.10.30.129",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 18,
+                    "key": "10.10.30.131",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 18,
+                          "key": "http"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 19,
+              "key": "10.10.100.50",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 12,
+                    "key": "224.0.0.252",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 12,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 4,
+                    "key": "10.10.100.121",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "telnet"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.100.100",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.100.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 19,
+              "key": "192.168.95.1",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 15,
+                    "key": "192.168.95.254",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 15,
+                          "key": "dhcp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 3,
+                    "key": "224.0.0.251",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 3,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 15,
+              "key": "10.0.0.120",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 6,
+                    "key": "10.0.0.40",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 4,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 5,
+                    "key": "10.0.0.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 5,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "224.0.0.252",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "10.0.0.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 13,
+              "key": "fe80::21de:6a5d:c2fa:e4ac",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 10,
+                    "key": "fe80::31c6:f934:59d4:3744",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 6,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 11,
+              "key": "10.0.0.5",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 10,
+                    "key": "10.0.0.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 6,
+                          "key": "rfb"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 11,
+              "key": "192.168.0.128",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 10,
+                    "key": "192.168.0.129",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 8,
+                          "key": "smb"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 10,
+              "key": "10.0.0.1",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 3,
+                    "key": "239.255.255.250",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "10.0.0.40",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "10.0.0.120",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "255.255.255.255",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 10,
+              "key": "10.0.0.134",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 10,
+                    "key": "10.0.0.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 10,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 9,
+              "key": "10.0.0.130",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 7,
+                    "key": "10.0.0.1",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 7,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "10.0.0.254",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dhcp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 9,
+              "key": "10.10.10.10",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 8,
+                    "key": "10.10.10.5",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 8,
+                          "key": "smb"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 9,
+              "key": "fe80::166:8730:f79f:e4c1",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 6,
+                    "key": "ff02::1:3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 6,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::16",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 6,
+              "key": "fe80::2cf2:f3d:b0d6:6c21",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 3,
+                    "key": "fe80::806b:8e56:5bb3:1ad9",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::1:3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "fe80::d0c1:8550:8ba9:3d76",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 5,
+              "key": "fe80::806b:8e56:5bb3:1ad9",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 3,
+                    "key": "fe80::2cf2:f3d:b0d6:6c21",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::1:3",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 2,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 4,
+              "key": "fe80::c17a:b794:2299:da9c",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 3,
+                    "key": "ff02::fb",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 3,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::16",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 4,
+              "key": "fe80::dc98:23c:afc5:b198",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 3,
+                    "key": "ff02::fb",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 3,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::16",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "10.10.30.131",
+              "values": {
+                "buckets": [],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "10.10.100.121",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "10.10.100.50",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "192.168.1.2",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 3,
+                    "key": "224.0.0.251",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 3,
+                          "key": "dns"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "fe80::95e:e70e:a1ac:c4cc",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "fe80::317b:81bc:808e:bbd",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "fe80::4de2:5638:38ad:df4f",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "fe80::606f:6bdd:4f3f:219d",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "fe80::753b:8bbb:1f74:54f7",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "fe80::84e6:6909:17d9:1d6e",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 3,
+              "key": "fe80::a1c3:301e:931d:eebf",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  },
+                  {
+                    "doc_count": 1,
+                    "key": "ff02::1:2",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2,
+              "key": "::",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::1:ffd4:3744",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2,
+              "key": "10.0.0.129",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1,
+                    "key": "10.0.0.128",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1,
+                          "key": "ftp"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2,
+              "key": "10.10.20.10",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.20.8",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2,
+              "key": "10.10.30.128",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 1,
+                    "key": "10.10.30.130",
+                    "values": {
+                      "buckets": [
+                        {
+                          "doc_count": 1,
+                          "key": "smb"
+                        }
+                      ],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            },
+            {
+              "doc_count": 2,
+              "key": "fe80::bca4:a139:486c:2f95",
+              "values": {
+                "buckets": [
+                  {
+                    "doc_count": 2,
+                    "key": "ff02::c",
+                    "values": {
+                      "buckets": [],
+                      "doc_count_error_upper_bound": 0,
+                      "sum_other_doc_count": 0
+                    }
+                  }
+                ],
+                "doc_count_error_upper_bound": 0,
+                "sum_other_doc_count": 0
+              }
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      }
+    ],
+    "doc_count_error_upper_bound": 0,
+    "sum_other_doc_count": 0
+  }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/source_destination_protocol_inbound_only.json b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/source_destination_protocol_inbound_only.json
new file mode 100644
index 0000000000..0c577d7b94
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/source_destination_protocol_inbound_only.json
@@ -0,0 +1,24 @@
+{
+  "fields": [
+    "source.ip",
+    "destination.ip",
+    "network.protocol"
+  ],
+  "filter": {
+    "network.direction": [
+      "inbound"
+    ]
+  },
+  "range": [
+    1544805256,
+    1702571656
+  ],
+  "urls": [
+    "/dashboards/app/dashboards#/view/abdd7550-2c7c-40dc-947e-f6d186a158c4?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2018-12-14T16:34:16.174056Z',to:'2023-12-14T16:34:16.177746Z'))"
+  ],
+  "values": {
+    "buckets": [],
+    "doc_count_error_upper_bound": 0,
+    "sum_other_doc_count": 0
+  }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/source_to_destination_ip.json b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/source_to_destination_ip.json
new file mode 100644
index 0000000000..6ee319e21a
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/source_to_destination_ip.json
@@ -0,0 +1,1439 @@
+{
+  "fields": [
+    "source.ip",
+    "destination.ip"
+  ],
+  "filter": {
+    "network.direction": [
+      "inbound",
+      "outbound",
+      "internal"
+    ]
+  },
+  "range": [
+    1544805186,
+    1702571586
+  ],
+  "urls": [
+    "/dashboards/app/dashboards#/view/abdd7550-2c7c-40dc-947e-f6d186a158c4?_g=(filters:!(),refreshInterval:(pause:!t,value:0),time:(from:'2018-12-14T16:33:06.213874Z',to:'2023-12-14T16:33:06.217558Z'))"
+  ],
+  "values": {
+    "buckets": [
+      {
+        "doc_count": 36797,
+        "key": "10.10.20.3",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 34031,
+              "key": "10.10.20.8"
+            },
+            {
+              "doc_count": 2765,
+              "key": "10.10.20.6"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 35399,
+        "key": "10.10.10.3",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 8150,
+              "key": "10.10.10.68"
+            },
+            {
+              "doc_count": 5900,
+              "key": "10.10.10.64"
+            },
+            {
+              "doc_count": 4075,
+              "key": "10.10.10.69"
+            },
+            {
+              "doc_count": 4072,
+              "key": "10.10.10.63"
+            },
+            {
+              "doc_count": 4072,
+              "key": "10.10.10.65"
+            },
+            {
+              "doc_count": 4072,
+              "key": "10.10.10.66"
+            },
+            {
+              "doc_count": 4072,
+              "key": "10.10.10.67"
+            },
+            {
+              "doc_count": 344,
+              "key": "10.10.10.255"
+            },
+            {
+              "doc_count": 327,
+              "key": "224.0.0.252"
+            },
+            {
+              "doc_count": 285,
+              "key": "10.10.10.11"
+            },
+            {
+              "doc_count": 20,
+              "key": "10.10.10.55"
+            },
+            {
+              "doc_count": 3,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 1,
+              "key": "255.255.255.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 34441,
+        "key": "10.10.20.8",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 34039,
+              "key": "10.10.20.3"
+            },
+            {
+              "doc_count": 300,
+              "key": "10.10.20.11"
+            },
+            {
+              "doc_count": 85,
+              "key": "10.10.20.10"
+            },
+            {
+              "doc_count": 11,
+              "key": "10.10.20.5"
+            },
+            {
+              "doc_count": 3,
+              "key": "255.255.255.255"
+            },
+            {
+              "doc_count": 2,
+              "key": "10.10.20.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 14624,
+        "key": "10.10.10.12",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 14621,
+              "key": "10.10.10.14"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 12774,
+        "key": "10.10.20.5",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 7083,
+              "key": "10.10.20.11"
+            },
+            {
+              "doc_count": 5534,
+              "key": "10.10.20.10"
+            },
+            {
+              "doc_count": 123,
+              "key": "10.10.20.8"
+            },
+            {
+              "doc_count": 11,
+              "key": "10.10.10.10"
+            },
+            {
+              "doc_count": 9,
+              "key": "192.168.0.11"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 5413,
+        "key": "10.10.10.14",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 5406,
+              "key": "10.10.10.12"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2782,
+        "key": "10.10.20.6",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2769,
+              "key": "10.10.20.3"
+            },
+            {
+              "doc_count": 4,
+              "key": "10.10.20.255"
+            },
+            {
+              "doc_count": 4,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 3,
+              "key": "224.0.0.252"
+            },
+            {
+              "doc_count": 1,
+              "key": "255.255.255.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2726,
+        "key": "10.10.10.68",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2716,
+              "key": "10.10.10.3"
+            },
+            {
+              "doc_count": 4,
+              "key": "10.10.10.5"
+            },
+            {
+              "doc_count": 4,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.10.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2111,
+        "key": "192.168.0.11",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1552,
+              "key": "192.168.0.1"
+            },
+            {
+              "doc_count": 267,
+              "key": "192.168.0.255"
+            },
+            {
+              "doc_count": 267,
+              "key": "224.0.0.252"
+            },
+            {
+              "doc_count": 10,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 7,
+              "key": "192.168.0.5"
+            },
+            {
+              "doc_count": 7,
+              "key": "255.255.255.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2087,
+        "key": "10.10.10.11",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1848,
+              "key": "10.10.10.3"
+            },
+            {
+              "doc_count": 125,
+              "key": "10.10.10.5"
+            },
+            {
+              "doc_count": 111,
+              "key": "10.10.10.55"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1972,
+        "key": "10.10.10.64",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1966,
+              "key": "10.10.10.3"
+            },
+            {
+              "doc_count": 4,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.10.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1818,
+        "key": "10.10.10.5",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1445,
+              "key": "10.10.10.10"
+            },
+            {
+              "doc_count": 342,
+              "key": "10.10.10.11"
+            },
+            {
+              "doc_count": 12,
+              "key": "10.10.20.8"
+            },
+            {
+              "doc_count": 12,
+              "key": "10.10.20.11"
+            },
+            {
+              "doc_count": 3,
+              "key": "192.168.0.11"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.20.10"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1368,
+        "key": "10.10.10.69",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1358,
+              "key": "10.10.10.3"
+            },
+            {
+              "doc_count": 4,
+              "key": "10.10.10.5"
+            },
+            {
+              "doc_count": 4,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.10.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1367,
+        "key": "10.10.10.67",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1357,
+              "key": "10.10.10.3"
+            },
+            {
+              "doc_count": 4,
+              "key": "10.10.10.5"
+            },
+            {
+              "doc_count": 4,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.10.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1363,
+        "key": "10.10.10.63",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1357,
+              "key": "10.10.10.3"
+            },
+            {
+              "doc_count": 4,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.10.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1363,
+        "key": "10.10.10.65",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1357,
+              "key": "10.10.10.3"
+            },
+            {
+              "doc_count": 4,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.10.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1363,
+        "key": "10.10.10.66",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1357,
+              "key": "10.10.10.3"
+            },
+            {
+              "doc_count": 4,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.10.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1307,
+        "key": "192.168.0.5",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1301,
+              "key": "192.168.0.11"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.20.11"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1130,
+        "key": "192.168.0.1",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1127,
+              "key": "192.168.0.11"
+            },
+            {
+              "doc_count": 1,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 1,
+              "key": "255.255.255.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 1071,
+        "key": "10.10.30.5",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1070,
+              "key": "10.10.30.33"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 371,
+        "key": "10.10.30.1",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 159,
+              "key": "224.0.0.251"
+            },
+            {
+              "doc_count": 120,
+              "key": "224.0.0.252"
+            },
+            {
+              "doc_count": 68,
+              "key": "10.10.255.255"
+            },
+            {
+              "doc_count": 24,
+              "key": "239.255.255.250"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 331,
+        "key": "fe80::b528:b15f:1681:3e2",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 329,
+              "key": "ff02::1:3"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::1:2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 290,
+        "key": "fe80::31c6:f934:59d4:3744",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 270,
+              "key": "ff02::1:3"
+            },
+            {
+              "doc_count": 6,
+              "key": "fe80::21de:6a5d:c2fa:e4ac"
+            },
+            {
+              "doc_count": 5,
+              "key": "ff02::1:2"
+            },
+            {
+              "doc_count": 4,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 3,
+              "key": "ff02::16"
+            },
+            {
+              "doc_count": 2,
+              "key": "ff02::2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 279,
+        "key": "fe80::4956:29e0:d069:b432",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 155,
+              "key": "ff02::fb"
+            },
+            {
+              "doc_count": 120,
+              "key": "ff02::1:3"
+            },
+            {
+              "doc_count": 4,
+              "key": "ff02::c"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 147,
+        "key": "10.0.0.128",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 145,
+              "key": "10.0.0.131"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.0.0.129"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 134,
+        "key": "10.10.30.130",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 104,
+              "key": "10.10.30.128"
+            },
+            {
+              "doc_count": 15,
+              "key": "10.10.30.1"
+            },
+            {
+              "doc_count": 14,
+              "key": "10.10.30.129"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 101,
+        "key": "192.168.95.128",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 80,
+              "key": "192.168.95.1"
+            },
+            {
+              "doc_count": 21,
+              "key": "192.168.95.254"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 90,
+        "key": "10.10.30.33",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 89,
+              "key": "10.10.30.5"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 69,
+        "key": "192.168.95.133",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 67,
+              "key": "192.168.95.1"
+            },
+            {
+              "doc_count": 2,
+              "key": "192.168.95.254"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 59,
+        "key": "10.0.0.133",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 59,
+              "key": "10.0.0.1"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 56,
+        "key": "192.168.0.129",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 55,
+              "key": "192.168.0.128"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 46,
+        "key": "192.168.95.134",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 44,
+              "key": "192.168.95.1"
+            },
+            {
+              "doc_count": 2,
+              "key": "192.168.95.254"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 45,
+        "key": "10.10.10.55",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 17,
+              "key": "10.10.10.3"
+            },
+            {
+              "doc_count": 16,
+              "key": "10.10.10.5"
+            },
+            {
+              "doc_count": 4,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 3,
+              "key": "10.10.10.255"
+            },
+            {
+              "doc_count": 1,
+              "key": "255.255.255.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 37,
+        "key": "192.168.95.135",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 35,
+              "key": "192.168.95.1"
+            },
+            {
+              "doc_count": 2,
+              "key": "192.168.95.254"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 34,
+        "key": "10.10.20.11",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 25,
+              "key": "10.10.20.8"
+            },
+            {
+              "doc_count": 8,
+              "key": "10.10.20.5"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 32,
+        "key": "10.0.0.131",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 30,
+              "key": "10.0.0.128"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.0.0.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 24,
+        "key": "10.0.0.40",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 16,
+              "key": "10.0.0.1"
+            },
+            {
+              "doc_count": 5,
+              "key": "10.0.0.120"
+            },
+            {
+              "doc_count": 2,
+              "key": "224.0.0.252"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 22,
+        "key": "192.168.95.132",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 20,
+              "key": "192.168.95.1"
+            },
+            {
+              "doc_count": 2,
+              "key": "192.168.95.254"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 20,
+        "key": "10.10.30.129",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 18,
+              "key": "10.10.30.131"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 19,
+        "key": "10.10.100.50",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 12,
+              "key": "224.0.0.252"
+            },
+            {
+              "doc_count": 4,
+              "key": "10.10.100.121"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.100.100"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.10.100.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 19,
+        "key": "192.168.95.1",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 15,
+              "key": "192.168.95.254"
+            },
+            {
+              "doc_count": 3,
+              "key": "224.0.0.251"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 15,
+        "key": "10.0.0.120",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 6,
+              "key": "10.0.0.40"
+            },
+            {
+              "doc_count": 5,
+              "key": "10.0.0.1"
+            },
+            {
+              "doc_count": 2,
+              "key": "224.0.0.252"
+            },
+            {
+              "doc_count": 1,
+              "key": "10.0.0.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 13,
+        "key": "fe80::21de:6a5d:c2fa:e4ac",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 10,
+              "key": "fe80::31c6:f934:59d4:3744"
+            },
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::1:2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 11,
+        "key": "10.0.0.5",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 10,
+              "key": "10.0.0.1"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 11,
+        "key": "192.168.0.128",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 10,
+              "key": "192.168.0.129"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 10,
+        "key": "10.0.0.1",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 3,
+              "key": "239.255.255.250"
+            },
+            {
+              "doc_count": 2,
+              "key": "10.0.0.40"
+            },
+            {
+              "doc_count": 2,
+              "key": "10.0.0.120"
+            },
+            {
+              "doc_count": 2,
+              "key": "255.255.255.255"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 10,
+        "key": "10.0.0.134",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 10,
+              "key": "10.0.0.1"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 9,
+        "key": "10.0.0.130",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 7,
+              "key": "10.0.0.1"
+            },
+            {
+              "doc_count": 2,
+              "key": "10.0.0.254"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 9,
+        "key": "10.10.10.10",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 8,
+              "key": "10.10.10.5"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 9,
+        "key": "fe80::166:8730:f79f:e4c1",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 6,
+              "key": "ff02::1:3"
+            },
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::16"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 6,
+        "key": "fe80::2cf2:f3d:b0d6:6c21",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 3,
+              "key": "fe80::806b:8e56:5bb3:1ad9"
+            },
+            {
+              "doc_count": 2,
+              "key": "ff02::1:3"
+            },
+            {
+              "doc_count": 1,
+              "key": "fe80::d0c1:8550:8ba9:3d76"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 5,
+        "key": "fe80::806b:8e56:5bb3:1ad9",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 3,
+              "key": "fe80::2cf2:f3d:b0d6:6c21"
+            },
+            {
+              "doc_count": 2,
+              "key": "ff02::1:3"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 4,
+        "key": "fe80::c17a:b794:2299:da9c",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 3,
+              "key": "ff02::fb"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::16"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 4,
+        "key": "fe80::dc98:23c:afc5:b198",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 3,
+              "key": "ff02::fb"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::16"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "10.10.30.131",
+        "values": {
+          "buckets": [],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "10.10.100.121",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "10.10.100.50"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "192.168.1.2",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 3,
+              "key": "224.0.0.251"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "fe80::95e:e70e:a1ac:c4cc",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::1:2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "fe80::317b:81bc:808e:bbd",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::1:2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "fe80::4de2:5638:38ad:df4f",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::1:2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "fe80::606f:6bdd:4f3f:219d",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::1:2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "fe80::753b:8bbb:1f74:54f7",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::1:2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "fe80::84e6:6909:17d9:1d6e",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::1:2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 3,
+        "key": "fe80::a1c3:301e:931d:eebf",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            },
+            {
+              "doc_count": 1,
+              "key": "ff02::1:2"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "::",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "ff02::1:ffd4:3744"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "10.0.0.129",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "10.0.0.128"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "10.10.20.10",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "10.10.20.8"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "10.10.30.128",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 1,
+              "key": "10.10.30.130"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      },
+      {
+        "doc_count": 2,
+        "key": "fe80::bca4:a139:486c:2f95",
+        "values": {
+          "buckets": [
+            {
+              "doc_count": 2,
+              "key": "ff02::c"
+            }
+          ],
+          "doc_count_error_upper_bound": 0,
+          "sum_other_doc_count": 0
+        }
+      }
+    ],
+    "doc_count_error_upper_bound": 0,
+    "sum_other_doc_count": 0
+  }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TmpNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TmpNode.cs
new file mode 100644
index 0000000000..5dbefb21bf
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TmpNode.cs
@@ -0,0 +1,28 @@
+using Microsoft.EntityFrameworkCore.Metadata.Conventions;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CSETWebCore.Model.Malcolm
+{
+    public class TmpNode
+    {
+        public List<TmpNode> Children {  get; set; }
+        public string Key {  get; set; }
+        public TmpNode(string key) {
+            this.Key = key;
+            this.Children = new List<TmpNode>();
+        }
+
+        public string PrintChildrenList()
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach(var tmpNode in Children)
+            {
+                sb.Append(tmpNode.Key);
+                sb.Append(",");
+            }
+            return sb.ToString();
+        }
+    }
+}
\ No newline at end of file

From b843ffcb49fa629af09141fffe4f1b48d04002b7 Mon Sep 17 00:00:00 2001
From: Matthew Winston <Matthew.Winston@inl.gov>
Date: Tue, 9 Jan 2024 10:26:10 -0500
Subject: [PATCH 10/19] small change to test file

---
 .../Malcolm/MalcolmBusinessTests.cs                        | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
index b386eea8ca..997a75cc2c 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
@@ -31,17 +31,18 @@ public void GetMalcolmJsonDataTest()
             Dictionary<string,TmpNode> nodesList= tst.RunTest(datalist);
             foreach(TmpNode node in nodesList.Values)
             {
+                Trace.WriteLine("");
                 Trace.WriteLine("node");
                 Trace.WriteLine(node.Key);
                 Trace.WriteLine(node.PrintChildrenList());
                 
-                foreach(var n in node.Children)
-                    PrintChildren(n);
+                //foreach(var n in node.Children)
+                //    PrintChildren(n);
             }
         }
         private void PrintChildren(TmpNode node)
         {
-            Trace.Write(node.Key);
+            Trace.WriteLine(node.Key);
             foreach (TmpNode c in node.Children)
             {
                 Trace.WriteLine("->" + c.Key);

From 91472aa212f7db06508127015d7e3991a0bafe1c Mon Sep 17 00:00:00 2001
From: Barry Hansen <5023364+inlguy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 11:39:14 -0700
Subject: [PATCH 11/19] sort of working node tree

---
 .../Malcolm/MalcolmBusiness.cs                | 108 ++++----
 .../Malcolm/MalcolmTree.cs                    |  54 ++++
 .../CSETWebCore.BusinessTests.csproj          |   3 +
 .../Malcolm/MalcolmBusinessTests.cs           |  78 +++++-
 .../MalcolmJson/TestHarness.txt               | 250 ++++++++++++++++++
 .../Malcolm/IMalcolmBusiness.cs               |   2 +-
 .../CSETWebCore.Model/Malcolm/MalcolmData.cs  |   4 +-
 .../CSETWebCore.Model/Malcolm/TempNode.cs     |  43 +++
 .../CSETWebCore.Model/Malcolm/TmpNode.cs      |  28 --
 9 files changed, 472 insertions(+), 98 deletions(-)
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/TestHarness.txt
 create mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs
 delete mode 100644 CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TmpNode.cs

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
index 78bfc5aab7..a150a4b29d 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
@@ -11,59 +11,76 @@ public class MalcolmBusiness : IMalcolmBusiness
     {
         private CSETContext _context;
 
-        private Dictionary<string, Node> treeDictionary = new Dictionary<string, Node>();
-        private Dictionary<string, TmpNode> networkOfNodes = new Dictionary<string, TmpNode>();
-        private HashSet<string> alreadySeenList = new HashSet<string>();
 
+        private Dictionary<string, TempNode> networkOfNodes = new Dictionary<string, TempNode>();
 
-        public MalcolmBusiness(CSETContext context) 
+
+
+        public MalcolmBusiness(CSETContext context)
         {
             _context = context;
         }
 
-        public Dictionary<string,TmpNode> RunTest(List<MalcolmData> datalist)
-        {
-            GetMalcolmJsonData(datalist);
-            return networkOfNodes;
-        }
+        public List<MalcolmData> GetMalcolmJsonData(List<MalcolmData> datalist)
+        {   
+            foreach (MalcolmData malcolmData in datalist)
+            {
+                if (malcolmData != null)
+                {
+                    foreach (var bucket in malcolmData.Values.Buckets)
+                    {
+                        if (!networkOfNodes.ContainsKey(bucket.Key))
+                        {
+                            var buckets = new List<Buckets>() { bucket };
+                            BuildNetwork(null, buckets);
+                        }
+                    }
+                    malcolmData.Graphs = networkOfNodes;
+                    networkOfNodes = new Dictionary<string, TempNode>();                    
+                }
+            }
+            return datalist;
 
-        public IEnumerable<MalcolmData> GetMalcolmJsonData(List<MalcolmData> datalist)
-        { 
-            var malcolmDataList = new List<MalcolmData>();
-            var tmp = new TmpNode("this is the root");
+        }
+        public List<MalcolmData> GetTreesFromMalcolmData(List<MalcolmData> datalist)
+        {
+            var malcolmDataList = new List<MalcolmData>();            
             foreach (MalcolmData malcolmData in datalist)
             {
                 if (malcolmData != null)
                 {   
-                    BuildNetwork(tmp, malcolmData.Values.Buckets) ;
-                }             
+                    MalcolmTree trees = new MalcolmTree();
+                    trees.StartTheTreeWalk(malcolmData.Graphs);
+                    malcolmData.Trees = trees.RootNodes;
+                    malcolmDataList.Add(malcolmData);
+                }
             }
-
             return malcolmDataList;
-            
+
         }
 
-        private void BuildNetwork(TmpNode parent, List<Buckets>buckets)
-        {   
+        private void BuildNetwork(TempNode parent, List<Buckets> buckets)
+        {
             foreach (var bucket in buckets)
             {
-                TmpNode tnode;
+                TempNode tnode;
                 if (String.IsNullOrEmpty(bucket.Key))
                 {
                     continue;
                 }
-                if(networkOfNodes.TryGetValue(bucket.Key, out tnode))
-                {   
-                    parent.Children.Add(tnode);
+                if (networkOfNodes.TryGetValue(bucket.Key, out tnode))
+                {
+                    parent.AddChildGraphOnly(tnode);                    
                 }
                 else
                 {
-                    tnode = new TmpNode(bucket.Key);
+                    tnode = new TempNode(bucket.Key);
+                    if (parent == null)
+                        parent = tnode;
                     networkOfNodes.Add(bucket.Key, tnode);
-                    parent.Children.Add(tnode);
-
+                    parent.AddChildGraphOnly(tnode);
                 }
-                if(bucket.Values != null)
+                if (bucket.Values != null)
                 {
                     BuildNetwork(tnode, bucket.Values.Buckets);
                 }
@@ -72,7 +89,7 @@ private void BuildNetwork(TmpNode parent, List<Buckets>buckets)
 
 
 
-        public Dictionary<string, int> CreateDictionary (List<Buckets> buckets, Dictionary<string, int> childrenDict)
+        public Dictionary<string, int> CreateDictionary(List<Buckets> buckets, Dictionary<string, int> childrenDict)
         {
             foreach (Buckets bucket in buckets)
             {
@@ -133,37 +150,8 @@ public Node GoThroughEdges(List<Buckets> buckets, string parentKey)
         }
 
 
-        public void StartTheTreeWalk(Dictionary<string, int> childrenDict, Node topLevelNodeHolder)
-        {
-            //get the root node
-            //var tree = new Dictionary<string, Node>(); //this is the empty tree
-            WalkTree(topLevelNodeHolder);
-        }
 
 
-        public void WalkTree(Node node)
-        {
-            if (alreadySeenList.Contains(node.key))
-            {
-                return;
-            }
-            alreadySeenList.Add(node.key);
-
-            var children = node.GetChildren();
-            //var organizedChildren = ;
-            foreach (var child in children)
-            {
-                treeDictionary.TryAdd(child.key, child);
-                WalkTree(child);
-
-            }
-
-            //treeDictionary.TryAdd(child.key, child);
-
-
-            //return tree;
-        }
-
 
         // a modified version of BFS that 
         // stores predecessor of each vertex 
@@ -255,7 +243,7 @@ public void AddChildren(List<Node> childrenToAdd)
                 children.AddRange(childrenToAdd);
             }
 
-            public void AddEdge(string src,string dest)
+            public void AddEdge(string src, string dest)
             {
                 Edge edge = new Edge();
                 edge.dest = dest;
@@ -306,7 +294,7 @@ public List<Edge> GetEdges()
 
 
     public class Graph
-    { 
+    {
         public int V, E;
         public Edge[] edge;
 
@@ -335,7 +323,7 @@ class Subset
         // path compression technique)
         int find(Subset[] subsets, int i)
         {
-            if(i > subsets.Length)
+            if (i > subsets.Length)
             {
                 if (subsets[i].parent != i)
                     subsets[i].parent
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
new file mode 100644
index 0000000000..0628f907f8
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
@@ -0,0 +1,54 @@
+using CSETWebCore.Model.Malcolm;
+using NPOI.POIFS.Properties;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CSETWebCore.Business.Malcolm
+{
+    public class MalcolmTree
+    {
+        
+        private HashSet<string> alreadySeenList = new HashSet<string>();
+
+        public List<TempNode> RootNodes { get; set; }
+
+        public MalcolmTree()
+        {
+            RootNodes = new List<TempNode>();
+        }
+
+        public void StartTheTreeWalk(Dictionary<string, TempNode> childrenDict)
+        {   
+            foreach (TempNode t in childrenDict.Values)
+            {  
+                TempNode root = new TempNode(t.Key);
+                if (!alreadySeenList.Contains(root.Key))
+                {   
+                    WalkTree(null,root,t);
+                    RootNodes.Add(root);
+                }
+            }
+
+        }
+
+
+        public void WalkTree(TempNode parent, TempNode treeNode, TempNode graph)
+        {
+            if (alreadySeenList.Contains(treeNode.Key))
+            {
+                return;
+            }
+            alreadySeenList.Add(treeNode.Key);
+            if(parent!=null)
+                parent.Children.Add(treeNode);
+            foreach (var child in graph.Children)
+            {   
+                WalkTree(treeNode,new TempNode(child.Key),child);
+                
+            }
+        }
+    }
+}
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj
index d56ec9253b..46b3375e65 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/CSETWebCore.BusinessTests.csproj
@@ -61,6 +61,9 @@
     <None Update="MalcolmJson\source_to_destination_ip.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Update="MalcolmJson\TestHarness.txt">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
 
 </Project>
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
index 997a75cc2c..c05d798bc0 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
@@ -9,6 +9,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;
 using System.Diagnostics;
+using NPOI.HSSF.Record.Chart;
 
 namespace CSETWebCore.Business.Malcolm.Tests
 {
@@ -20,6 +21,7 @@ public void GetMalcolmJsonDataTest()
         {
             string dir = Directory.GetCurrentDirectory();
             string[] files = Directory.GetFiles(Path.Combine(dir,"MalcolmJson"), "source_to_destination_ip.json");
+            string[] assertFile = File.ReadAllLines(Path.Combine(dir, "MalcolmJson", "TestHarness.txt"));
             List<MalcolmData> datalist = new List<MalcolmData>();
             foreach (string file in files)
             {
@@ -28,26 +30,86 @@ public void GetMalcolmJsonDataTest()
                 datalist.Add(malcolmData);
             }
             MalcolmBusiness tst = new MalcolmBusiness(new DataLayer.Model.CSETContext());
-            Dictionary<string,TmpNode> nodesList= tst.RunTest(datalist);
-            foreach(TmpNode node in nodesList.Values)
+            List<MalcolmData> list = tst.GetMalcolmJsonData(datalist);
+            Dictionary<string, TempNode> nodesList = list[0].Graphs;
+            foreach(TempNode node in nodesList.Values)
             {
                 Trace.WriteLine("");
                 Trace.WriteLine("node");
                 Trace.WriteLine(node.Key);
                 Trace.WriteLine(node.PrintChildrenList());
-                
-                //foreach(var n in node.Children)
-                //    PrintChildren(n);
             }
+
+            Dictionary<string, bool> AllNodes = new Dictionary<string, bool>();
+            foreach(String line in assertFile)
+            {
+                AllNodes.TryAdd(line.Trim(), false);
+            }
+            foreach(var ip in AllNodes.Keys)
+            {
+                if (!nodesList.ContainsKey(ip))
+                {
+                    Trace.WriteLine("Missing key: " + ip);
+                }
+            }
+            Assert.IsTrue(AllNodes.Count == nodesList.Count);
+            TempNode parent = null;
+            foreach (String item  in assertFile)
+            {
+                /**
+                 * look to see that the node list contains the parent. 
+                 * then look to see that each node was represented (we didn't accidentally miss one)
+                 * then look to see that each child is in the list
+                 * then look to see that we didn't miss any children
+                 * look to at the child list for each parent does it contain the children. 
+                 */
+                if (item.StartsWith("            "))
+                {
+                    Assert.IsTrue(parent.ChildrenKeys.Contains(item.Trim()));
+                    Assert.IsTrue(nodesList.ContainsKey(item.Trim()));
+                }
+                else
+                {
+                    Assert.IsTrue(nodesList.ContainsKey(item.Trim()),"couldn't find"+item);
+                    parent = nodesList[item.Trim()];
+                }
+            }
+
         }
-        private void PrintChildren(TmpNode node)
+        [TestMethod()]
+        public void TestMalcomTreeWalk()
+        {
+            string dir = Directory.GetCurrentDirectory();
+            string[] files = Directory.GetFiles(Path.Combine(dir, "MalcolmJson"), "source_to_destination_ip.json");
+            string[] assertFile = File.ReadAllLines(Path.Combine(dir, "MalcolmJson", "TestHarness.txt"));
+            List<MalcolmData> datalist = new List<MalcolmData>();
+            foreach (string file in files)
+            {
+                string jsonString = File.ReadAllText(file);
+                var malcolmData = JsonConvert.DeserializeObject<MalcolmData>(jsonString);
+                datalist.Add(malcolmData);
+            }
+            MalcolmBusiness tst = new MalcolmBusiness(new DataLayer.Model.CSETContext());
+            
+            List<MalcolmData> data =  tst.GetMalcolmJsonData(datalist);
+            MalcolmTree tree = new MalcolmTree();
+            var root = new TempNode("10.10.30.1");
+            tree.WalkTree(null, root, data[0].Graphs["10.10.30.1"]);
+
+            printTree(root);
+
+        }
+        private void printTree(TempNode node)
         {
             Trace.WriteLine(node.Key);
-            foreach (TmpNode c in node.Children)
+            foreach(var c in node.Children)
             {
-                Trace.WriteLine("->" + c.Key);
+                Trace.Write("->");
+                printTree(c);
             }
         }
+
+        
     }
 
    
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/TestHarness.txt b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/TestHarness.txt
new file mode 100644
index 0000000000..322f1a45cc
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/MalcolmJson/TestHarness.txt
@@ -0,0 +1,250 @@
+10.10.20.3
+            10.10.20.8
+            10.10.20.6
+10.10.10.3
+            10.10.10.68
+            10.10.10.64
+            10.10.10.69
+            10.10.10.63
+            10.10.10.65
+            10.10.10.66
+            10.10.10.67
+            10.10.10.255
+            224.0.0.252
+            10.10.10.11
+            10.10.10.55
+            239.255.255.250
+            255.255.255.255
+10.10.20.8
+            10.10.20.3
+            10.10.20.11
+            10.10.20.10
+            10.10.20.5
+            255.255.255.255
+            10.10.20.255
+  10.10.10.12
+            10.10.10.14
+  10.10.20.5
+            10.10.20.11
+            10.10.20.10
+            10.10.20.8
+            10.10.10.10
+            192.168.0.11
+  10.10.10.14
+            10.10.10.12
+  10.10.20.6
+            10.10.20.3
+            10.10.20.255
+            239.255.255.250
+            224.0.0.252
+            255.255.255.255
+  10.10.10.68
+            10.10.10.3
+            10.10.10.5
+            239.255.255.250
+            10.10.10.255
+  192.168.0.11
+            192.168.0.1
+            192.168.0.255
+            224.0.0.252
+            239.255.255.250
+            192.168.0.5
+            255.255.255.255
+  10.10.10.11
+            10.10.10.3
+            10.10.10.5
+            10.10.10.55
+  10.10.10.64
+            10.10.10.3
+            239.255.255.250
+            10.10.10.255
+  10.10.10.5
+            10.10.10.10
+            10.10.10.11
+            10.10.20.8
+            10.10.20.11
+            192.168.0.11
+            10.10.20.10
+  10.10.10.69
+            10.10.10.3
+            10.10.10.5
+            239.255.255.250
+            10.10.10.255
+  10.10.10.67
+            10.10.10.3
+            10.10.10.5
+            239.255.255.250
+            10.10.10.255
+  10.10.10.63
+            10.10.10.3
+            239.255.255.250
+            10.10.10.255
+  10.10.10.65
+            10.10.10.3
+            239.255.255.250
+            10.10.10.255
+  10.10.10.66
+            10.10.10.3
+            239.255.255.250
+            10.10.10.255
+  192.168.0.5
+            192.168.0.11
+            10.10.20.11
+  192.168.0.1
+            192.168.0.11
+            239.255.255.250
+            255.255.255.255
+  10.10.30.5
+            10.10.30.33
+  10.10.30.1
+            224.0.0.251
+            224.0.0.252
+            10.10.255.255
+            239.255.255.250
+  fe80::b528:b15f:1681:3e2
+            ff02::1:3
+            ff02::c
+            ff02::1:2
+  fe80::31c6:f934:59d4:3744
+            ff02::1:3
+            fe80::21de:6a5d:c2fa:e4ac
+            ff02::1:2
+            ff02::c
+            ff02::16
+            ff02::2
+  fe80::4956:29e0:d069:b432
+            ff02::fb
+            ff02::1:3
+            ff02::c
+  10.0.0.128
+            10.0.0.131
+            10.0.0.129
+  10.10.30.130
+            10.10.30.128
+            10.10.30.1
+            10.10.30.129
+  192.168.95.128
+            192.168.95.1
+            192.168.95.254
+  10.10.30.33
+            10.10.30.5
+  192.168.95.133
+            192.168.95.1
+            192.168.95.254
+  10.0.0.133
+            10.0.0.1
+  192.168.0.129
+            192.168.0.128
+  192.168.95.134
+            192.168.95.1
+            192.168.95.254
+  10.10.10.55
+            10.10.10.3
+            10.10.10.5
+            239.255.255.250
+            10.10.10.255
+            255.255.255.255
+  192.168.95.135
+            192.168.95.1
+            192.168.95.254
+  10.10.20.11
+            10.10.20.8
+            10.10.20.5
+  10.0.0.131
+            10.0.0.128
+            10.0.0.255
+  10.0.0.40
+            10.0.0.1
+            10.0.0.120
+            224.0.0.252
+  192.168.95.132
+            192.168.95.1
+            192.168.95.254
+  10.10.30.129
+            10.10.30.131
+  10.10.100.50
+            224.0.0.252
+            10.10.100.121
+            10.10.100.100
+            10.10.100.255
+  192.168.95.1
+            192.168.95.254
+            224.0.0.251
+  10.0.0.120
+            10.0.0.40
+            10.0.0.1
+            224.0.0.252
+            10.0.0.255
+  fe80::21de:6a5d:c2fa:e4ac
+            fe80::31c6:f934:59d4:3744
+            ff02::c
+            ff02::1:2
+  10.0.0.5
+            10.0.0.1
+  192.168.0.128
+            192.168.0.129
+  10.0.0.1
+            239.255.255.250
+            10.0.0.40
+            10.0.0.120
+            255.255.255.255
+  10.0.0.134
+            10.0.0.1
+  10.0.0.130
+            10.0.0.1
+            10.0.0.254
+  10.10.10.10
+            10.10.10.5
+  fe80::166:8730:f79f:e4c1
+            ff02::1:3
+            ff02::c
+            ff02::16
+  fe80::2cf2:f3d:b0d6:6c21
+            fe80::806b:8e56:5bb3:1ad9
+            ff02::1:3
+            fe80::d0c1:8550:8ba9:3d76
+  fe80::806b:8e56:5bb3:1ad9
+            fe80::2cf2:f3d:b0d6:6c21
+            ff02::1:3
+  fe80::c17a:b794:2299:da9c
+            ff02::fb
+            ff02::16
+  fe80::dc98:23c:afc5:b198
+            ff02::fb
+            ff02::16
+  10.10.30.131
+  10.10.100.121
+            10.10.100.50
+  192.168.1.2
+            224.0.0.251
+  fe80::95e:e70e:a1ac:c4cc
+            ff02::c
+            ff02::1:2
+  fe80::317b:81bc:808e:bbd
+            ff02::c
+            ff02::1:2
+  fe80::4de2:5638:38ad:df4f
+            ff02::c
+            ff02::1:2
+  fe80::606f:6bdd:4f3f:219d
+            ff02::c
+            ff02::1:2
+  fe80::753b:8bbb:1f74:54f7
+            ff02::c
+            ff02::1:2
+  fe80::84e6:6909:17d9:1d6e
+            ff02::c
+            ff02::1:2
+  fe80::a1c3:301e:931d:eebf
+            ff02::c
+            ff02::1:2
+::
+            ff02::1:ffd4:3744
+  10.0.0.129
+            10.0.0.128
+  10.10.20.10
+            10.10.20.8
+  10.10.30.128
+            10.10.30.130
+  fe80::bca4:a139:486c:2f95
+            ff02::c
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
index d685a00b2d..d2b227d85b 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Interfaces/Malcolm/IMalcolmBusiness.cs
@@ -15,6 +15,6 @@ namespace CSETWebCore.Interfaces.Malcolm
 {
     public interface IMalcolmBusiness
     {
-        public IEnumerable<MalcolmData> GetMalcolmJsonData(List<MalcolmData> list);
+        public List<MalcolmData> GetMalcolmJsonData(List<MalcolmData> list);
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs
index cf9bf5b01f..2aae6b3993 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/MalcolmData.cs
@@ -16,6 +16,8 @@ public class MalcolmData
         public List<string> Urls { get; set; } = new List<string>();
         //public JArray Buckets { get; set; }
         public Values Values { get; set; }
-        public TmpNode netNode { get; set; }
+        public Dictionary<string, TempNode> Graphs { get; set; }
+        public List<TempNode> Trees { get; set; }
+        
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs
new file mode 100644
index 0000000000..7b0e54d062
--- /dev/null
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs
@@ -0,0 +1,43 @@
+using Microsoft.EntityFrameworkCore.Metadata.Conventions;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CSETWebCore.Model.Malcolm
+{
+    public class TempNode
+    {
+        public List<TempNode> Children {  get; set; }
+        public string Key {  get; set; }
+        public TempNode(string key) {
+            this.Key = key;
+            this.Children = new List<TempNode>();
+        }
+        
+        public void AddChildGraphOnly(TempNode child)
+        {
+            if (child.Key == this.Key)
+                return;
+            if (!ChildrenKeys.Contains(child.Key))
+            {
+                ChildrenKeys.Add(child.Key);
+                Children.Add(child);                
+                child.AddChildGraphOnly(this);
+                
+            }
+        }
+
+        public HashSet<string> ChildrenKeys = new HashSet<string>();
+        
+        public string PrintChildrenList()
+        {
+            StringBuilder sb = new StringBuilder();
+            foreach(var tmpNode in Children)
+            {   
+                sb.Append(tmpNode.Key);
+                sb.Append(",");
+            }
+            return sb.ToString();
+        }
+    }
+}
\ No newline at end of file
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TmpNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TmpNode.cs
deleted file mode 100644
index 5dbefb21bf..0000000000
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TmpNode.cs
+++ /dev/null
@@ -1,28 +0,0 @@
-using Microsoft.EntityFrameworkCore.Metadata.Conventions;
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CSETWebCore.Model.Malcolm
-{
-    public class TmpNode
-    {
-        public List<TmpNode> Children {  get; set; }
-        public string Key {  get; set; }
-        public TmpNode(string key) {
-            this.Key = key;
-            this.Children = new List<TmpNode>();
-        }
-
-        public string PrintChildrenList()
-        {
-            StringBuilder sb = new StringBuilder();
-            foreach(var tmpNode in Children)
-            {
-                sb.Append(tmpNode.Key);
-                sb.Append(",");
-            }
-            return sb.ToString();
-        }
-    }
-}
\ No newline at end of file

From a1151e3f4e9e6bab4d1b952d379138fb5ea5dc27 Mon Sep 17 00:00:00 2001
From: Barry Hansen <5023364+inlguy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 13:00:07 -0700
Subject: [PATCH 12/19] added print message

---
 .../Malcolm/MalcolmTree.cs                    | 11 ++---
 .../Malcolm/MalcolmBusinessTests.cs           | 42 ++++++++++++++++---
 2 files changed, 42 insertions(+), 11 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
index 0628f907f8..1bc3ec43dd 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
@@ -1,4 +1,5 @@
 using CSETWebCore.Model.Malcolm;
+using Lucene.Net.Util;
 using NPOI.POIFS.Properties;
 using System;
 using System.Collections.Generic;
@@ -42,12 +43,12 @@ public void WalkTree(TempNode parent, TempNode treeNode, TempNode graph)
                 return;
             }
             alreadySeenList.Add(treeNode.Key);
-            if(parent!=null)
-                parent.Children.Add(treeNode);
+            
             foreach (var child in graph.Children)
-            {   
-                WalkTree(treeNode,new TempNode(child.Key),child);
-                
+            {
+                if (parent != null)
+                    parent.Children.Add(treeNode);
+                WalkTree(treeNode, new TempNode(child.Key), child);
             }
         }
     }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
index c05d798bc0..cbe570a1ae 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
@@ -96,16 +96,46 @@ public void TestMalcomTreeWalk()
             var root = new TempNode("10.10.30.1");
             tree.WalkTree(null, root, data[0].Graphs["10.10.30.1"]);
 
-            printTree(root);
+            printTree(root,0);
 
         }
-        private void printTree(TempNode node)
+
+        [TestMethod()]
+        public void TestPreconstructedGraph()
         {
-            Trace.WriteLine(node.Key);
-            foreach(var c in node.Children)
+            TempNode node3 = new TempNode("3");
+            TempNode node6 = new TempNode("6");
+            TempNode node8 = new TempNode("8");
+            TempNode node255 = new TempNode("255");
+            node3.Children.Add(node6);
+            node3.Children.Add(node8);
+            node6.Children.Add(node3);
+            node8.Children.Add(node3);
+            node6.Children.Add(node255);
+            node255.Children.Add(node6);
+            node8.Children.Add(node255);
+            node255.Children.Add(node8);
+
+
+            MalcolmTree tree = new MalcolmTree();
+            TempNode root = new TempNode("3");
+            tree.WalkTree(null, root, node3);
+
+            printTree(root,0);
+
+        }
+
+        private void printTree(TempNode node, int indent)
+        {
+            string tkey = node.Key; 
+            if(indent > 0)
             {
-                Trace.Write("->");
-                printTree(c);
+                tkey = "->" + tkey;
+            }
+            Trace.WriteLine(tkey.PadLeft(tkey.Length+ (2*indent)));
+            foreach(var c in node.Children)
+            {                
+                printTree(c,(++indent));                
             }
         }
 

From af621dda6337879904b98bcd9cf731eb4324c502 Mon Sep 17 00:00:00 2001
From: Barry Hansen <5023364+inlguy@users.noreply.github.com>
Date: Tue, 9 Jan 2024 13:01:54 -0700
Subject: [PATCH 13/19] added print message

---
 .../CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs  | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
index 1bc3ec43dd..85eb261bef 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
@@ -43,11 +43,10 @@ public void WalkTree(TempNode parent, TempNode treeNode, TempNode graph)
                 return;
             }
             alreadySeenList.Add(treeNode.Key);
-            
+            if(parent!=null)
+                parent.Children.Add(treeNode);
             foreach (var child in graph.Children)
             {
-                if (parent != null)
-                    parent.Children.Add(treeNode);
                 WalkTree(treeNode, new TempNode(child.Key), child);
             }
         }

From 6299f96adc9f3cc8527cccb4d8ba840d2ee1bd0e Mon Sep 17 00:00:00 2001
From: Barry Hansen <5023364+inlguy@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:05:49 -0700
Subject: [PATCH 14/19] debugging tree walk

---
 .../Malcolm/MalcolmBusiness.cs                | 400 +-----------------
 .../Malcolm/MalcolmTree.cs                    | 118 +++++-
 .../Malcolm/MalcolmBusinessTests.cs           |  29 +-
 .../CSETWebCore.Model/Malcolm/TempNode.cs     |  33 +-
 .../Controllers/MalcolmController.cs          |   7 +-
 5 files changed, 151 insertions(+), 436 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
index a150a4b29d..9f4e321a44 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmBusiness.cs
@@ -3,7 +3,6 @@
 using CSETWebCore.Model.Malcolm;
 using System;
 using System.Collections.Generic;
-using static CSETWebCore.Business.Malcolm.Graph;
 
 namespace CSETWebCore.Business.Malcolm
 {
@@ -29,11 +28,11 @@ public List<MalcolmData> GetMalcolmJsonData(List<MalcolmData> datalist)
                 {
                     foreach (var bucket in malcolmData.Values.Buckets)
                     {
-                        if (!networkOfNodes.ContainsKey(bucket.Key))
-                        {
+                        //if (!networkOfNodes.ContainsKey(bucket.Key))
+                        //{
                             var buckets = new List<Buckets>() { bucket };
                             BuildNetwork(null, buckets);
-                        }
+                        //}
                     }
                     malcolmData.Graphs = networkOfNodes;
                     networkOfNodes = new Dictionary<string, TempNode>();                    
@@ -50,8 +49,7 @@ public List<MalcolmData> GetTreesFromMalcolmData(List<MalcolmData> datalist)
                 if (malcolmData != null)
                 {   
                     MalcolmTree trees = new MalcolmTree();
-                    trees.StartTheTreeWalk(malcolmData.Graphs);
-                    malcolmData.Trees = trees.RootNodes;
+                    malcolmData.Trees  =trees.StartTheTreeWalk(malcolmData.Graphs);
                     malcolmDataList.Add(malcolmData);
                 }
             }
@@ -70,15 +68,15 @@ private void BuildNetwork(TempNode parent, List<Buckets> buckets)
                 }
                 if (networkOfNodes.TryGetValue(bucket.Key, out tnode))
                 {
-                    parent.AddChildGraphOnly(tnode);                    
+                    if (parent != null)
+                        parent.AddChildGraphOnly(tnode);                    
                 }
                 else
                 {
                     tnode = new TempNode(bucket.Key);
-                    if (parent == null)
-                        parent = tnode;
-                    networkOfNodes.Add(bucket.Key, tnode);
-                    parent.AddChildGraphOnly(tnode);
+                    networkOfNodes.TryAdd(bucket.Key, tnode);
+                    if (parent != null)
+                        parent.AddChildGraphOnly(tnode);
                 }
                 if (bucket.Values != null)
                 {
@@ -86,385 +84,5 @@ private void BuildNetwork(TempNode parent, List<Buckets> buckets)
                 }
             }
         }
-
-
-
-        public Dictionary<string, int> CreateDictionary(List<Buckets> buckets, Dictionary<string, int> childrenDict)
-        {
-            foreach (Buckets bucket in buckets)
-            {
-                if (bucket.Values != null)
-                {
-                    childrenDict.TryAdd(bucket.Key, bucket.Values.Buckets.Count);
-                    childrenDict = CreateDictionary(bucket.Values.Buckets, childrenDict);
-                }
-                else
-                {
-                    childrenDict.TryAdd(bucket.Key, 0);
-                }
-            }
-
-            return childrenDict;
-        }
-
-
-        public Node GoThroughEdges(List<Buckets> buckets, string parentKey)
-        {
-            // this keeps track of all the nodes going to be read from the bucket list
-            Node parentNode = new Node();
-            parentNode.key = parentKey;
-
-            // iterating through the buckets
-            foreach (Buckets bucket in buckets)
-            {
-                // setting up the node info for this bucket
-                Node currentNode = new Node();
-                currentNode.key = bucket.Key;
-                currentNode.parentKey = parentKey;
-
-                // establishing the link between this node's parent (passed into this function) and itself
-                Edge edge = new Edge();
-                edge.src = parentKey;
-                edge.dest = bucket.Key;
-
-                currentNode.AddEdge(edge);
-
-                // if this bucket has values (i.e. if this node has children),
-                // pass this bucket as the parent and recurse through its values
-                Node childrenNodes = new Node();
-                if (bucket.Values != null)
-                {
-                    childrenNodes = GoThroughEdges(bucket.Values.Buckets, bucket.Key);
-                }
-
-                currentNode.AddChildren(childrenNodes.GetChildren());
-                currentNode.AddEdges(childrenNodes.GetEdges());
-
-                // add this currentNode to the lists of its parent's children and edges
-                parentNode.AddChild(currentNode);
-                parentNode.AddEdge(edge);
-            }
-
-            // return list of children
-            return parentNode;
-        }
-
-
-
-
-
-        // a modified version of BFS that 
-        // stores predecessor of each vertex 
-        // in array pred and its distance 
-        // from source in array dist
-        private static bool BFS(List<List<int>> adj, int src, int dest, int v, int[] pred, int[] dist)
-        {
-            // a queue to maintain queue of 
-            // vertices whose adjacency list 
-            // is to be scanned as per normal
-            // BFS algorithm using List of int type
-            List<int> queue = new List<int>();
-
-            // bool array visited[] which 
-            // stores the information whether 
-            // ith vertex is reached at least 
-            // once in the Breadth first search
-            bool[] visited = new bool[v];
-
-            // initially all vertices are 
-            // unvisited so v[i] for all i 
-            // is false and as no path is 
-            // yet constructed dist[i] for 
-            // all i set to infinity
-            for (int i = 0; i < v; i++)
-            {
-                visited[i] = false;
-                dist[i] = int.MaxValue;
-                pred[i] = -1;
-            }
-
-            // now source is first to be 
-            // visited and distance from 
-            // source to itself should be 0
-            visited[src] = true;
-            dist[src] = 0;
-            queue.Add(src);
-
-            // bfs Algorithm
-            while (queue.Count != 0)
-            {
-                int u = queue[0];
-                queue.RemoveAt(0);
-
-                for (int i = 0;
-                         i < adj[u].Count; i++)
-                {
-                    if (visited[adj[u][i]] == false)
-                    {
-                        visited[adj[u][i]] = true;
-                        dist[adj[u][i]] = dist[u] + 1;
-                        pred[adj[u][i]] = u;
-                        queue.Add(adj[u][i]);
-
-                        // stopping condition (when we 
-                        // find our destination)
-                        if (adj[u][i] == dest)
-                            return true;
-                    }
-                }
-            }
-            return false;
-        }
-
-
-        public void AddEdgeMinimalSpanningTree(List<List<int>> adj, int src, int dest)
-        {
-            adj[src].Add(dest);
-            adj[dest].Add(src);
-        }
-
-
-        public class Node
-        {
-            public string key;
-            public string parentKey;
-            List<Edge> edges = new List<Edge>();
-            List<Node> children = new List<Node>();
-
-            public void AddChild(Node node)
-            {
-                //alreadySeenList.Add(node);
-                //fullListOfNodes[node] = true;
-                children.Add(node);
-            }
-
-            public void AddChildren(List<Node> childrenToAdd)
-            {
-                children.AddRange(childrenToAdd);
-            }
-
-            public void AddEdge(string src, string dest)
-            {
-                Edge edge = new Edge();
-                edge.dest = dest;
-                edge.src = src;
-                edges.Add(edge);
-            }
-
-            public void AddEdge(Edge edge)
-            {
-                edges.Add(edge);
-            }
-
-            public void AddEdges(List<Edge> edgesToAdd)
-            {
-                edges.AddRange(edgesToAdd);
-            }
-
-            public List<Node> GetChildren()
-            {
-                return children;
-            }
-
-            public List<Edge> GetEdges()
-            {
-                return edges;
-            }
-
-        }
-
-        //public Dictionary<string, int> AssignIndexKeyPairs(Dictionary<string, int> childrenDict)
-        //{
-        //    int i = 0;
-        //    var keyIndexPairs = new Dictionary<string, int>();
-
-        //    foreach (string key in childrenDict.Keys)
-        //    {
-        //        keyIndexPairs.TryAdd(key, i);
-        //        i++;
-        //    }
-
-        //    return keyIndexPairs;
-        //}
-
-        //
-
-
-    }
-
-
-    public class Graph
-    {
-        public int V, E;
-        public Edge[] edge;
-
-        public Graph(int nV, int nE, Edge[] edgeArray)
-        {
-            V = nV;
-            E = nE;
-            edge = edgeArray;
-        }
-
-        // class to represent edge
-        public class Edge
-        {
-            public string src, dest;
-        }
-
-        // class to represent Subset
-        class Subset
-        {
-            public int parent;
-            public int rank;
-        }
-
-        // A utility function to find
-        // set of an element i (uses
-        // path compression technique)
-        int find(Subset[] subsets, int i)
-        {
-            if (i > subsets.Length)
-            {
-                if (subsets[i].parent != i)
-                    subsets[i].parent
-                        = find(subsets, subsets[i].parent);
-                return subsets[i].parent;
-            }
-            if (subsets[i].parent != i)
-                subsets[i].parent
-                    = find(subsets, subsets[i].parent);
-            return subsets[i].parent;
-        }
-
-        // A function that does union
-        // of two sets of x and y
-        // (uses union by rank)
-        Subset[] Union(Subset[] subsets, int x, int y)
-        {
-            int xroot = find(subsets, x);
-            int yroot = find(subsets, y);
-
-            if (xroot > subsets.Length || yroot > subsets.Length)
-                subsets[xroot].parent = yroot;
-
-            if (subsets[xroot].rank < subsets[yroot].rank)
-                subsets[xroot].parent = yroot;
-            else if (subsets[yroot].rank < subsets[xroot].rank)
-                subsets[yroot].parent = xroot;
-            else
-            {
-                subsets[xroot].parent = yroot;
-                subsets[yroot].rank++;
-            }
-
-            return subsets;
-        }
-
-        //// The main function to construct MST 
-        //// using Kruskal's algorithm 
-        //public void KruskalMST()
-        //{
-        //    // This will store the 
-        //    // resultant MST 
-        //    Edge[] result = new Edge[V];
-
-        //    // An index variable, used for result[] 
-        //    int e = 0;
-
-        //    // An index variable, used for sorted edges 
-        //    int i = 0;
-        //    for (i = 0; i < V; ++i)
-        //        result[i] = new Edge();
-
-        //    // Sort all the edges in non-decreasing 
-        //    // order of their weight. If we are not allowed 
-        //    // to change the given graph, we can create 
-        //    // a copy of array of edges 
-        //    Array.Sort(edge);
-
-        //    // Allocate memory for creating V subsets 
-        //    Subset[] subsets = new Subset[V];
-        //    for (i = 0; i < V; ++i)
-        //        subsets[i] = new Subset();
-
-        //    // Create V subsets with single elements 
-        //    for (int v = 0; v < V; ++v)
-        //    {
-        //        subsets[v].parent = v;
-        //        subsets[v].rank = 0;
-        //    }
-        //    i = 0;
-
-        //    // Number of edges to be taken is equal to V-1 
-        //    while (e < V - 1)
-        //    {
-        //        if (e == V - 2)
-        //            Console.WriteLine("");
-        //        // Pick the smallest edge. And increment 
-        //        // the index for next iteration 
-        //        Edge next_edge = new Edge();
-
-        //        if (i == edge.Length)
-        //            next_edge = edge[i++];
-
-        //        next_edge = edge[i++];
-
-        //        int x = find(subsets, next_edge.src);
-        //        int y = find(subsets, next_edge.dest);
-
-        //        // If including this edge doesn't cause cycle, 
-        //        // include it in result and increment the index 
-        //        // of result for next edge 
-        //        if (x != y)
-        //        {
-        //            result[e++] = next_edge;
-        //            Union(subsets, x, y);
-        //            //subsets = Union(subsets, x, y);
-        //        }
-        //    }
-
-        //    // Print the contents of result[] to display 
-        //    // the built MST 
-        //    Console.WriteLine("Following are the edges in "
-        //                      + "the constructed MST");
-
-        //    int minimumCost = 0;
-        //    for (i = 0; i < e; ++i)
-        //    {
-        //        Console.WriteLine(result[i].src + " -- "
-        //                          + result[i].dest
-        //                          + " == " + result[i].weight);
-        //        minimumCost += result[i].weight;
-        //    }
-
-        //    Console.WriteLine("Minimum Cost Spanning Tree: "
-        //                      + minimumCost);
-        //}
-
-        //// The main function to check whether
-        //// a given graph contains cycle or not
-        //int isCycle(Graph graph)
-        //{
-        //    int V = graph.V;
-        //    int E = graph.E;
-
-        //    Subset[] subsets = new Subset[V];
-        //    for (int v = 0; v < V; v++)
-        //    {
-        //        subsets[v] = new Subset();
-        //        subsets[v].parent = v;
-        //        subsets[v].rank = 0;
-        //    }
-
-        //    for (int e = 0; e < E; e++)
-        //    {
-        //        int x = find(subsets, graph.edge[e].src);
-        //        int y = find(subsets, graph.edge[e].dest);
-        //        if (x == y)
-        //            return 1;
-        //        Union(subsets, x, y);
-        //    }
-        //    return 0;
-        //}
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
index 85eb261bef..8588ece559 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
@@ -1,11 +1,8 @@
 using CSETWebCore.Model.Malcolm;
-using Lucene.Net.Util;
-using NPOI.POIFS.Properties;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace CSETWebCore.Business.Malcolm
 {
@@ -14,41 +11,116 @@ public class MalcolmTree
         
         private HashSet<string> alreadySeenList = new HashSet<string>();
 
-        public List<TempNode> RootNodes { get; set; }
+        
 
         public MalcolmTree()
         {
-            RootNodes = new List<TempNode>();
+            
         }
 
-        public void StartTheTreeWalk(Dictionary<string, TempNode> childrenDict)
-        {   
+        private Dictionary<string, TempNode> listOfAll = new Dictionary<string, TempNode>();
+
+        public List<TempNode> StartTheTreeWalk(Dictionary<string, TempNode> childrenDict) 
+        { 
+            List<TempNode> RootNodes = new List<TempNode>();
             foreach (TempNode t in childrenDict.Values)
-            {  
-                TempNode root = new TempNode(t.Key);
-                if (!alreadySeenList.Contains(root.Key))
-                {   
-                    WalkTree(null,root,t);
+            {
+                if (!alreadySeenList.Contains(t.Key))
+                {
+                    TempNode root = new TempNode(t.Key);
+                    listOfAll.Add(root.Key, root);
                     RootNodes.Add(root);
+                    HashSet<string> seen = new HashSet<string>() { root.Key };
+                    WalkTree(root,t,seen);
+                    break;
                 }
+                    
             }
+            return RootNodes;
+        }
 
+        private void WalkTree(TempNode parent, TempNode graphNode, HashSet<string> alreadySeen)
+        {   
+            //trying to do breadth first
+            //add all the children to the parent
+            //then recurse down the children
+            HashSet<string> visited = new HashSet<string>(alreadySeen);
+            visited.Add(parent.Key);
+            visited.Add(graphNode.Key);
+            Trace.WriteLine("W: "+parent.Key+ "G: "+graphNode.Key);
+            foreach (var c in graphNode.Children)
+            {
+                TempNode cnode;
+                if (listOfAll.TryGetValue(c.Key, out cnode))
+                {
+                    if (graphNode.AlreadyWalked(cnode,visited))
+                    {
+                        c.NeedsProcessed = false;
+                    }
+                    else
+                    {
+                        visited.Add(cnode.Key);
+                        AddNode(parent, cnode);
+                        c.NeedsProcessed = true;
+                    }
+                    
+                }
+                else
+                {
+                    var newT = new TempNode(c.Key);
+                    if (graphNode.AlreadyWalked(newT, visited))
+                    {
+                        c.NeedsProcessed=false;
+                    }
+                    else
+                    {
+                        visited.Add(newT.Key);
+                        listOfAll.TryAdd(newT.Key, newT);
+                        AddNode(parent, newT);
+                        c.NeedsProcessed = true;
+                    }
+                }
+            }
+            foreach (var c in graphNode.Children.Where(x=> x.NeedsProcessed))
+            {
+                TempNode cnode;
+                if (listOfAll.TryGetValue(c.Key, out cnode))
+                {
+                    WalkTree(cnode,  c,visited);
+                    Trace.WriteLine("rf:" + parent.Key + "-" + graphNode.Key);
+                }
+                else
+                {
+                    var newT= new TempNode(c.Key);
+                    listOfAll.Add(c.Key, newT);
+                    WalkTree(newT, c, visited);
+                    Trace.WriteLine("rn:" + parent.Key + "-" + graphNode.Key);
+                }
+            }
+            
         }
 
 
-        public void WalkTree(TempNode parent, TempNode treeNode, TempNode graph)
-        {
-            if (alreadySeenList.Contains(treeNode.Key))
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="parent"></param>
+        /// <param name="treeNode"></param>
+        /// <param name="graph"></param>
+        /// <returns>true if needs processed false if not</returns>
+        private bool AddNode(TempNode parent, TempNode treeNode)
+        {   
+            if(alreadySeenList.Contains(treeNode.Key) && alreadySeenList.Contains(parent.Key))
             {
-                return;
+                return true;
             }
+            Trace.WriteLine("Adding: " + parent.Key+" ->" +treeNode.Key);
+            parent.Children.Add(treeNode);
             alreadySeenList.Add(treeNode.Key);
-            if(parent!=null)
-                parent.Children.Add(treeNode);
-            foreach (var child in graph.Children)
-            {
-                WalkTree(treeNode, new TempNode(child.Key), child);
-            }
+            alreadySeenList.Add(parent.Key);
+            return true;
+            
+
         }
     }
 }
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
index cbe570a1ae..48e8f6ee5d 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.BusinessTests/Malcolm/MalcolmBusinessTests.cs
@@ -91,13 +91,11 @@ public void TestMalcomTreeWalk()
             }
             MalcolmBusiness tst = new MalcolmBusiness(new DataLayer.Model.CSETContext());
             
-            List<MalcolmData> data =  tst.GetMalcolmJsonData(datalist);
+            tst.GetMalcolmJsonData(datalist);
             MalcolmTree tree = new MalcolmTree();
-            var root = new TempNode("10.10.30.1");
-            tree.WalkTree(null, root, data[0].Graphs["10.10.30.1"]);
-
-            printTree(root,0);
-
+            Assert.IsTrue(datalist[0].Graphs.ContainsKey("10.10.10.10"));
+            foreach (TempNode node in tree.StartTheTreeWalk(datalist[0].Graphs))
+                printTree(node, 0);
         }
 
         [TestMethod()]
@@ -107,6 +105,7 @@ public void TestPreconstructedGraph()
             TempNode node6 = new TempNode("6");
             TempNode node8 = new TempNode("8");
             TempNode node255 = new TempNode("255");
+            TempNode nodeLeaf = new TempNode("Leaf");
             node3.Children.Add(node6);
             node3.Children.Add(node8);
             node6.Children.Add(node3);
@@ -115,13 +114,19 @@ public void TestPreconstructedGraph()
             node255.Children.Add(node6);
             node8.Children.Add(node255);
             node255.Children.Add(node8);
+            node255.Children.Add(nodeLeaf);
 
 
             MalcolmTree tree = new MalcolmTree();
-            TempNode root = new TempNode("3");
-            tree.WalkTree(null, root, node3);
+            
+            Dictionary<string,TempNode> graph = new Dictionary<string, TempNode>();
+            graph.Add(node3.Key, node3);
+            graph.Add(node6.Key, node6);
+            graph.Add(node8.Key, node8);
+            graph.Add(node255.Key, node255);
 
-            printTree(root,0);
+            foreach(TempNode node in tree.StartTheTreeWalk(graph))
+                printTree(node,0);
 
         }
 
@@ -132,10 +137,12 @@ private void printTree(TempNode node, int indent)
             {
                 tkey = "->" + tkey;
             }
+            
             Trace.WriteLine(tkey.PadLeft(tkey.Length+ (2*indent)));
-            foreach(var c in node.Children)
+            indent = ++indent;
+            foreach (var c in node.Children)
             {                
-                printTree(c,(++indent));                
+                printTree(c,indent);                
             }
         }
 
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs
index 7b0e54d062..0883311ecd 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs
@@ -1,30 +1,36 @@
 using Microsoft.EntityFrameworkCore.Metadata.Conventions;
+using Microsoft.Identity.Client;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
 
 namespace CSETWebCore.Model.Malcolm
 {
     public class TempNode
     {
-        public List<TempNode> Children {  get; set; }
+        public HashSet<TempNode> Children {  get; set; }
         public string Key {  get; set; }
+        public bool NeedsProcessed { get; set; }
+        private HashSet<string> alreadySeenList = new HashSet<string>();
+
         public TempNode(string key) {
             this.Key = key;
-            this.Children = new List<TempNode>();
+            this.Children = new HashSet<TempNode>();
+            NeedsProcessed = true;
         }
         
         public void AddChildGraphOnly(TempNode child)
         {
             if (child.Key == this.Key)
-                return;
+                return;            
             if (!ChildrenKeys.Contains(child.Key))
             {
                 ChildrenKeys.Add(child.Key);
-                Children.Add(child);                
-                child.AddChildGraphOnly(this);
-                
+                Children.Add(child);
             }
+            if (!child.ChildrenKeys.Contains(this.Key))
+                child.AddChildGraphOnly(this);
         }
 
         public HashSet<string> ChildrenKeys = new HashSet<string>();
@@ -39,5 +45,20 @@ public string PrintChildrenList()
             }
             return sb.ToString();
         }
+
+        public bool AlreadyWalked(TempNode treeNode, HashSet<string> previous)
+        {
+            if (previous.Contains(treeNode.Key)) return true;
+            if(this.Key == treeNode.Key) return true;
+            if (this.Children.Count == 0) return true;
+
+            if (!alreadySeenList.Contains(treeNode.Key))
+            {
+                alreadySeenList.Add(treeNode.Key);
+                return false;
+            }
+            return true;
+            
+        }
     }
 }
\ No newline at end of file
diff --git a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
index 3b2911d443..c0bb0b4732 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWeb_ApiCore/Controllers/MalcolmController.cs
@@ -27,9 +27,7 @@ public class MalcolmController : ControllerBase
     {
         private ITokenManager _token;
         private CSETContext _context;
-        private IHttpContextAccessor _http;
-        private IJSONFileExport _json;
-        private TextWriter jsonWriter;
+        private IHttpContextAccessor _http;                
         private IMalcolmBusiness _malcolm;
 
 
@@ -52,8 +50,7 @@ public IActionResult MapSourceToDestinationData()
         {
             var formFiles = HttpContext.Request.Form.Files;
             string fileName = "";
-            string fileExtension = "";
-            string output = "";
+            string fileExtension = "";            
             List<MalcolmUploadError> errors = new List<MalcolmUploadError>();
             List<MalcolmData> dataList = new List<MalcolmData>();
 

From 4e688a3d3731e3bf4c682ffd4e4b66366b2799c7 Mon Sep 17 00:00:00 2001
From: Barry Hansen <5023364+inlguy@users.noreply.github.com>
Date: Wed, 10 Jan 2024 14:47:59 -0700
Subject: [PATCH 15/19] Testing

---
 CSETWebNg/.vscode/settings.json           | 5 ++++-
 CSETWebNg/src/assets/settings/config.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CSETWebNg/.vscode/settings.json b/CSETWebNg/.vscode/settings.json
index 177d528a88..f1833738b9 100644
--- a/CSETWebNg/.vscode/settings.json
+++ b/CSETWebNg/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
     "git.ignoreLimitWarning": true,
-    "angular.enable-strict-mode-prompt": false
+    "angular.enable-strict-mode-prompt": false, 
+    "github.copilot.advanced": {
+        "debug.useNodeFetcher": true
+      }
 }
\ No newline at end of file
diff --git a/CSETWebNg/src/assets/settings/config.json b/CSETWebNg/src/assets/settings/config.json
index 538a975744..c40746233e 100644
--- a/CSETWebNg/src/assets/settings/config.json
+++ b/CSETWebNg/src/assets/settings/config.json
@@ -1,7 +1,7 @@
 {
     "NOTENODE": "Casing on config chain matters, the only item that should be changed here is the current ConfigChain value.  Once that is changed everything else should be set",
     "currentConfigChain": [
-        "CSET"
+        "RENEW"
     ],
     "appCode": "CSET",
     "defaultLang": "en",

From 917840fe3ba038eb8a7b07c7326c93dcaaa971e4 Mon Sep 17 00:00:00 2001
From: Barry Hansen <5023364+inlguy@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:48:28 -0700
Subject: [PATCH 16/19] Fixed a local status

---
 .../CSETWebCore.Business/Malcolm/MalcolmTree.cs    | 14 +++++++++-----
 .../CSETWebCore.Model/Malcolm/TempNode.cs          | 14 ++++++++++++--
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
index 8588ece559..d162ec857e 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
@@ -48,20 +48,23 @@ private void WalkTree(TempNode parent, TempNode graphNode, HashSet<string> alrea
             visited.Add(parent.Key);
             visited.Add(graphNode.Key);
             Trace.WriteLine("W: "+parent.Key+ "G: "+graphNode.Key);
+
+            Dictionary<TempNode, bool> children = new Dictionary<TempNode, bool>();
             foreach (var c in graphNode.Children)
             {
+
                 TempNode cnode;
                 if (listOfAll.TryGetValue(c.Key, out cnode))
                 {
                     if (graphNode.AlreadyWalked(cnode,visited))
                     {
-                        c.NeedsProcessed = false;
+                        children.TryAdd(c, false);
                     }
                     else
                     {
                         visited.Add(cnode.Key);
                         AddNode(parent, cnode);
-                        c.NeedsProcessed = true;
+                        children.TryAdd(c, true);
                     }
                     
                 }
@@ -70,18 +73,19 @@ private void WalkTree(TempNode parent, TempNode graphNode, HashSet<string> alrea
                     var newT = new TempNode(c.Key);
                     if (graphNode.AlreadyWalked(newT, visited))
                     {
-                        c.NeedsProcessed=false;
+                        children.TryAdd(c, false);
                     }
                     else
                     {
                         visited.Add(newT.Key);
                         listOfAll.TryAdd(newT.Key, newT);
                         AddNode(parent, newT);
-                        c.NeedsProcessed = true;
+                        children.TryAdd(c, true);
                     }
                 }
             }
-            foreach (var c in graphNode.Children.Where(x=> x.NeedsProcessed))
+            List<TempNode> childrenToWalk = children.Where(x => x.Value).Select(x=> x.Key).ToList();
+            foreach (var c in childrenToWalk)
             {
                 TempNode cnode;
                 if (listOfAll.TryGetValue(c.Key, out cnode))
diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs
index 0883311ecd..4ef56fb429 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Model/Malcolm/TempNode.cs
@@ -7,17 +7,27 @@
 
 namespace CSETWebCore.Model.Malcolm
 {
+
+    public class StatusTempNode { 
+        public StatusTempNode() {
+            NeedsProcessed = true;
+        }
+        public TempNode Node {  get; set; }
+        public bool NeedsProcessed { get; set; }
+    }
+
+
     public class TempNode
     {
         public HashSet<TempNode> Children {  get; set; }
         public string Key {  get; set; }
-        public bool NeedsProcessed { get; set; }
+        
         private HashSet<string> alreadySeenList = new HashSet<string>();
 
         public TempNode(string key) {
             this.Key = key;
             this.Children = new HashSet<TempNode>();
-            NeedsProcessed = true;
+        
         }
         
         public void AddChildGraphOnly(TempNode child)

From 538c9ec5c430fe1a57a7dcb2a8fde3b9615cfc30 Mon Sep 17 00:00:00 2001
From: Barry Hansen <5023364+inlguy@users.noreply.github.com>
Date: Wed, 10 Jan 2024 16:11:52 -0700
Subject: [PATCH 17/19] final working tree extractor

---
 .../CSETWebCore.Business/Malcolm/MalcolmTree.cs       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
index d162ec857e..8ac11babd2 100644
--- a/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
+++ b/CSETWebApi/CSETWeb_Api/CSETWebCore.Business/Malcolm/MalcolmTree.cs
@@ -31,8 +31,7 @@ public List<TempNode> StartTheTreeWalk(Dictionary<string, TempNode> childrenDict
                     listOfAll.Add(root.Key, root);
                     RootNodes.Add(root);
                     HashSet<string> seen = new HashSet<string>() { root.Key };
-                    WalkTree(root,t,seen);
-                    break;
+                    WalkTree(root,t,seen);                    
                 }
                     
             }
@@ -47,7 +46,7 @@ private void WalkTree(TempNode parent, TempNode graphNode, HashSet<string> alrea
             HashSet<string> visited = new HashSet<string>(alreadySeen);
             visited.Add(parent.Key);
             visited.Add(graphNode.Key);
-            Trace.WriteLine("W: "+parent.Key+ "G: "+graphNode.Key);
+            //Trace.WriteLine("W: "+parent.Key+ "G: "+graphNode.Key);
 
             Dictionary<TempNode, bool> children = new Dictionary<TempNode, bool>();
             foreach (var c in graphNode.Children)
@@ -91,14 +90,14 @@ private void WalkTree(TempNode parent, TempNode graphNode, HashSet<string> alrea
                 if (listOfAll.TryGetValue(c.Key, out cnode))
                 {
                     WalkTree(cnode,  c,visited);
-                    Trace.WriteLine("rf:" + parent.Key + "-" + graphNode.Key);
+                    //Trace.WriteLine("rf:" + parent.Key + "-" + graphNode.Key);
                 }
                 else
                 {
                     var newT= new TempNode(c.Key);
                     listOfAll.Add(c.Key, newT);
                     WalkTree(newT, c, visited);
-                    Trace.WriteLine("rn:" + parent.Key + "-" + graphNode.Key);
+                    //Trace.WriteLine("rn:" + parent.Key + "-" + graphNode.Key);
                 }
             }
             
@@ -118,7 +117,7 @@ private bool AddNode(TempNode parent, TempNode treeNode)
             {
                 return true;
             }
-            Trace.WriteLine("Adding: " + parent.Key+" ->" +treeNode.Key);
+            //Trace.WriteLine("Adding: " + parent.Key+" ->" +treeNode.Key);
             parent.Children.Add(treeNode);
             alreadySeenList.Add(treeNode.Key);
             alreadySeenList.Add(parent.Key);

From 3ff630f0a012d8bdde6f26e37ae27c21f0a8dc9e Mon Sep 17 00:00:00 2001
From: Matthew Winston <Matthew.Winston@inl.gov>
Date: Wed, 10 Jan 2024 19:10:23 -0500
Subject: [PATCH 18/19] Hiding Malcolm import button when not in RENEW mode

---
 .../diagram/diagram-info/diagram-info.component.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html
index c607745db8..1ee904dce7 100644
--- a/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html
+++ b/CSETWebNg/src/app/assessment/diagram/diagram-info/diagram-info.component.html
@@ -45,11 +45,13 @@ <h4>Network Diagram</h4>
             <button class="btn btn-primary" (click)="navToDiagram('')"><i
                 class="fas fa-project-diagram mr-2"></i>{{buttonText}}</button>
                 
-            <label for="importFile" class="btn btn-primary cset-icons-import">
-                Import Malcolm
-            </label>
-            <input type="file" class="display-none" id="importFile" multiple
-                accept=".json" (change)="uploadMalcolmData($event)">
+            <span *ngIf="configSvc.installationMode == 'RENEW'">
+                <label for="importFile" class="btn btn-primary cset-icons-import">
+                    Import Malcolm
+                </label>
+                <input type="file" class="display-none" id="importFile" multiple
+                    accept=".json" (change)="uploadMalcolmData($event)">
+            </span>
     </div>
 
     <app-nav-back-next [page]="'diagram'"></app-nav-back-next>

From 63968b3dfcaa58e33b6ecdd8e85fb54352c27328 Mon Sep 17 00:00:00 2001
From: Matthew Winston <Matthew.Winston@inl.gov>
Date: Thu, 11 Jan 2024 12:03:47 -0500
Subject: [PATCH 19/19] Switching skin to CSET

---
 CSETWebNg/src/assets/settings/config.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CSETWebNg/src/assets/settings/config.json b/CSETWebNg/src/assets/settings/config.json
index c40746233e..538a975744 100644
--- a/CSETWebNg/src/assets/settings/config.json
+++ b/CSETWebNg/src/assets/settings/config.json
@@ -1,7 +1,7 @@
 {
     "NOTENODE": "Casing on config chain matters, the only item that should be changed here is the current ConfigChain value.  Once that is changed everything else should be set",
     "currentConfigChain": [
-        "RENEW"
+        "CSET"
     ],
     "appCode": "CSET",
     "defaultLang": "en",