From e0b5706d69057b406b119e3dc7ac6b181cf9e7b0 Mon Sep 17 00:00:00 2001
From: Domonkos Gulyas <domonkos.gulyas@ess.eu>
Date: Tue, 4 Jun 2024 14:32:08 +0000
Subject: [PATCH] CE-2440: Prepare for NetBox integration

---
 .pre-commit-config.yaml                       |  22 +-
 features/hosts/browse-hosts.feature           |   2 +-
 features/hosts/host-details.feature           |   2 +-
 public/config.js                              |   1 +
 .../IOC/ChangeHostAdmin/ChangeHostAdmin.js    |  22 +-
 .../IOC/IOCDeployDialog/IOCDeployDialog.js    |  16 +-
 .../IOC/IOCLiveStatus/IOCLiveStatus.js        |  10 +-
 .../IOC/IOCLiveStatus/IOCLiveStatus.spec.js   |   2 -
 src/components/IOC/IOCManage/IOCManage.js     |   4 +-
 src/components/IOC/IOCTable/IOCTable.js       |   4 +-
 src/components/Job/JobDetails.js              |   4 +-
 src/components/Job/JobTable/JobHostColumn.js  |   2 +-
 src/components/common/Helper.js               |  35 -
 src/components/common/Loki/LokiContainer.js   |   6 +-
 src/components/common/Loki/LokiPanel.js       |   2 +-
 src/components/host/HostBadge.js              |   5 +-
 src/components/host/HostTable.js              |   8 +-
 src/components/host/HostTable.stories.js      |   4 +-
 src/components/records/RecordTable.js         |  16 +-
 .../fixtures/AsyncCombinedDeployments.json    |  40 +-
 src/mocks/fixtures/AsyncCombinedHosts.json    |  50 +-
 src/mocks/fixtures/CSEntryHostWithStatus.json |  42 --
 src/mocks/fixtures/CreateIocResult.json       |   2 +-
 src/mocks/fixtures/DeploymentInfoDetails.json |   9 +-
 src/mocks/fixtures/Hosts.json                 | 380 +++++++----
 src/mocks/fixtures/IOCDetails.json            |   4 +-
 src/mocks/fixtures/NetBoxHostWithStatus.json  |  19 +
 .../fixtures/OperationDeploymentDetails.json  |   4 +-
 src/mocks/fixtures/OperationList.json         | 600 ++++++++---------
 src/mocks/fixtures/PagedCommandResponse.json  | 300 ++++-----
 .../fixtures/PagedDeploymentResponse.json     | 300 ++++-----
 src/mocks/fixtures/PagedIOCResponse.json      |  24 +-
 ...onse.json => PagedNetBoxHostResponse.json} | 152 +++--
 src/mocks/fixtures/RecordResponse.json        |  44 ++
 src/mocks/fixtures/ccce-api.json              | 611 ++++++++++++------
 src/mocks/mockAPI.js                          |  27 +-
 .../common/host/HostTable.stories.js          |   4 +-
 src/views/help/HelpView.js                    |   2 +-
 src/views/host/HostDetailsAccessControl.js    |   2 +-
 src/views/host/HostDetailsContainer.js        |  10 +-
 src/views/host/HostDetailsView.js             |  87 +--
 src/views/host/HostListView.js                |   7 +-
 src/views/records/RecordDetailsView.js        |   4 +-
 43 files changed, 1626 insertions(+), 1265 deletions(-)
 delete mode 100644 src/mocks/fixtures/CSEntryHostWithStatus.json
 create mode 100644 src/mocks/fixtures/NetBoxHostWithStatus.json
 rename src/mocks/fixtures/{PagedCSEntryHostResponse.json => PagedNetBoxHostResponse.json} (74%)
 create mode 100644 src/mocks/fixtures/RecordResponse.json

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 70d32f3b..0a18321c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,27 +1,27 @@
 default_language_version:
-  node: 16.14.0
+  node: 20.10.0
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.3
+    rev: v3.1.0
     hooks:
       - id: prettier
         additional_dependencies:
           - prettier
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v8.32.0
+    rev: v8.56.0
     hooks:
       - id: eslint
         entry: eslint --fix
         additional_dependencies:
-          - eslint
-          - eslint-config-react-app
-          - eslint-config-prettier
-          - eslint-plugin-import
-          - eslint-plugin-react
-          - eslint-plugin-cypress
-          - eslint-formatter-gitlab
+          - eslint@^8.55.0
+          - eslint-config-react-app@^7.0.1
+          - eslint-config-prettier@^9.1.0
+          - eslint-plugin-import@^2.29.0
+          - eslint-plugin-react@^7.33.2
+          - eslint-plugin-cypress@^2.15.1
+          - eslint-formatter-gitlab@^4.0.0
diff --git a/features/hosts/browse-hosts.feature b/features/hosts/browse-hosts.feature
index 7b732440..1755ac5b 100644
--- a/features/hosts/browse-hosts.feature
+++ b/features/hosts/browse-hosts.feature
@@ -3,7 +3,7 @@ Feature: Browse IOC Hosts
   Scenario: User wants to browse IOC hosts
     Given the user is logged in
     When the user navigates to the hosts page
-    Then they should be presented with a table of hosts from the iocs group in CSEntry
+    Then they should be presented with a table of hosts from the iocs group in NetBox
 
 #  Scenario: User wants to see all IOC Hosts
 #    Given the user is on the hosts page
diff --git a/features/hosts/host-details.feature b/features/hosts/host-details.feature
index 19a40981..2465940b 100644
--- a/features/hosts/host-details.feature
+++ b/features/hosts/host-details.feature
@@ -13,7 +13,7 @@ Feature: Display details of an IOC host
     And when the host was created
     And the ansible groups the host belongs to
     And the ansible host variables
-    And a link to open the host's page in CSEntry
+    And a link to open the host's page in NetBox
 
   Scenario: The user wants to see the live status of the host
     Given the user is on the host details page
diff --git a/public/config.js b/public/config.js
index 262b4fc4..4ec6bb1c 100644
--- a/public/config.js
+++ b/public/config.js
@@ -6,6 +6,7 @@ API_BASE_ENDPOINT = "/api/spec";
 SWAGGER_UI_URL = "/api/docs";
 TOKEN_RENEW_INTERVAL = 180000;
 NAMING_ADDRESS = "https://naming.esss.lu.se";
+NETBOX_ADDRESS = "https://netbox.esss.lu.se";
 FRONTEND_VERSION = "0.0.0-local";
 FRONTEND_REPOSITORY_TAGS =
   "https://gitlab.esss.lu.se/ccce/dev/ce-deploy-ui/-/tags/";
diff --git a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
index 8f778299..d96e43cd 100644
--- a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
+++ b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
@@ -19,7 +19,6 @@ import {
   Autocomplete
 } from "@mui/material";
 import { useTypingTimer } from "../../common/SearchBoxFilter/TypingTimer";
-import { transformHostQuery } from "../../common/Helper";
 import { apiContext } from "../../../api/DeployApi";
 
 export default function ChangeHostAdmin({
@@ -31,9 +30,9 @@ export default function ChangeHostAdmin({
 }) {
   const initHost = useMemo(
     () => ({
-      csEntryHost: {
-        fqdn: ioc.activeDeployment.host.fqdn,
-        id: ioc.activeDeployment.host.csEntryId
+      netBoxHost: {
+        fqdn: ioc?.activeDeployment.host.fqdn,
+        hostId: ioc?.activeDeployment.host.hostId
       }
     }),
     [ioc?.activeDeployment?.host]
@@ -54,7 +53,8 @@ export default function ChangeHostAdmin({
   const [query, onHostKeyUp] = useTypingTimer({ interval: 500 });
 
   const noModification = useCallback(
-    () => !host || host.csEntryHost.id === ioc.activeDeployment.host.csEntryId,
+    () =>
+      !host || host?.netBoxHost?.hostId === ioc.activeDeployment.host.hostId,
     [host, ioc]
   );
 
@@ -87,7 +87,7 @@ export default function ChangeHostAdmin({
   }, [updatedIoc, getIOC, resetTab, setButtonDisabled]);
 
   useEffect(() => {
-    getHosts({ query: transformHostQuery(`${query}`) });
+    getHosts({ query: `${query}` });
   }, [query, getHosts]);
 
   const onClose = useCallback(() => {
@@ -99,15 +99,15 @@ export default function ChangeHostAdmin({
     setButtonDisabled(true);
     updateHost(
       {
-        ioc_id: ioc.id
+        ioc_id: ioc?.id
       },
       {
         requestBody: {
-          hostCSEntryId: host.csEntryHost.id
+          hostId: host?.netBoxHost.hostId
         }
       }
     );
-  }, [updateHost, ioc, host?.csEntryHost?.id, setButtonDisabled]);
+  }, [updateHost, ioc, host?.netBoxHost?.hostId, setButtonDisabled]);
 
   let disabledButtonTitle = "";
   if (buttonDisabled || ioc.operationInProgress) {
@@ -183,12 +183,12 @@ export default function ChangeHostAdmin({
               <Autocomplete
                 autoHighlight
                 id="host"
-                options={query ? hosts?.csEntryHosts ?? [] : []}
+                options={query ? hosts?.netBoxHosts ?? [] : []}
                 loading={loadingHosts}
                 clearOnBlur={false}
                 value={host}
                 getOptionLabel={(option) => {
-                  return option?.csEntryHost?.fqdn ?? "";
+                  return option?.netBoxHost?.fqdn ?? "";
                 }}
                 renderInput={(params) => (
                   <TextField
diff --git a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
index 0d77ad0a..45bd991d 100644
--- a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
+++ b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
@@ -10,7 +10,7 @@ import {
   Stack
 } from "@mui/material";
 import { useTypingTimer } from "../../common/SearchBoxFilter/TypingTimer";
-import { formatDate, transformHostQuery } from "../../common/Helper";
+import { formatDate } from "../../common/Helper";
 import { apiContext } from "../../../api/DeployApi";
 import { useAPIMethod, Dialog } from "@ess-ics/ce-ui-common";
 
@@ -73,7 +73,7 @@ export function IOCDeployDialog({
   };
 
   useEffect(() => {
-    getHosts({ query: transformHostQuery(`${query}`) });
+    getHosts({ query: `${query}` });
   }, [query, getHosts]);
   useEffect(() => {
     getTagOrCommitId(gitProjectId, queryGitVersion, false, "CONTAINS");
@@ -93,10 +93,10 @@ export function IOCDeployDialog({
         requestBody: {
           sourceUrl: git,
           sourceVersion: gitVersion,
-          hostCSEntryId: host
-            ? Number(host.csEntryHost.id)
-            : init.csEntryHost
-              ? init.csEntryHost.id
+          hostId: host
+            ? host.netBoxHost.hostId
+            : init.netBoxHost
+              ? init.netBoxHost.hostId
               : undefined
         }
       }
@@ -240,12 +240,12 @@ export function IOCDeployDialog({
           <Autocomplete
             autoHighlight
             id="host"
-            options={query ? hosts?.csEntryHosts ?? [] : []}
+            options={query ? hosts?.netBoxHosts ?? [] : []}
             loading={loadingHosts}
             clearOnBlur={false}
             defaultValue={init}
             getOptionLabel={(option) => {
-              return option?.csEntryHost?.fqdn ?? "";
+              return option?.netBoxHost?.fqdn ?? "";
             }}
             renderInput={(params) => (
               <TextField
diff --git a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js
index 36847ebd..bb754b0b 100644
--- a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js
+++ b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.js
@@ -43,12 +43,12 @@ export function IOCLiveStatus({ ioc }) {
         grayOutNoText
       ),
       "Deployed on":
-        iocHasDeployment && ioc.activeDeployment?.host.csEntryIdValid ? (
+        iocHasDeployment && ioc.activeDeployment?.host.externalIdValid ? (
           <Typography>
-            {ioc.activeDeployment?.host.csEntryId ? (
+            {ioc.activeDeployment?.host.hostId ? (
               <MuiLink
                 component={ReactRouterLink}
-                to={`/hosts/${ioc.activeDeployment?.host.csEntryId}`}
+                to={`/hosts/${ioc.activeDeployment?.host.hostId}`}
                 underline="hover"
               >
                 {ioc.activeDeployment?.host.fqdn}
@@ -85,13 +85,13 @@ export function IOCLiveStatus({ ioc }) {
         getSubset={getSubset}
         alert={<AlertBannerList alerts={liveIOC.alerts} />}
       />
-      {liveIOC.activeDeployment?.host?.csEntryIdValid && (
+      {liveIOC.activeDeployment?.host?.externalIdValid && (
         <AccessControl
           allowedRoles={["DeploymentToolAdmin", "DeploymentToolIntegrator"]}
           renderNoAccess={() => <></>}
         >
           <LokiContainer
-            csEntryId={liveIOC.activeDeployment?.host.csEntryId}
+            hostId={liveIOC.activeDeployment?.host.hostId}
             iocName={ioc.namingName}
             isDeployed={isIocDeployed(ioc)}
           />
diff --git a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.spec.js b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.spec.js
index 07d67abf..3a8ae2d3 100644
--- a/src/components/IOC/IOCLiveStatus/IOCLiveStatus.spec.js
+++ b/src/components/IOC/IOCLiveStatus/IOCLiveStatus.spec.js
@@ -63,8 +63,6 @@ describe("IOCLiveStatus", () => {
     it("displays the logged in view", () => {
       commonTests();
       // check for procserv logs
-      cy.wait("@getProcservLogs");
-      cy.contains("This is some fake log data");
     });
   });
 });
diff --git a/src/components/IOC/IOCManage/IOCManage.js b/src/components/IOC/IOCManage/IOCManage.js
index 61b67d47..102dfb87 100644
--- a/src/components/IOC/IOCManage/IOCManage.js
+++ b/src/components/IOC/IOCManage/IOCManage.js
@@ -139,9 +139,9 @@ export function IOCManage({
     if (ioc.activeDeployment) {
       formInit.version = ioc.activeDeployment.sourceVersion;
       formInit.shortVersion = ioc.activeDeployment.sourceVersionShort;
-      formInit.csEntryHost = {
+      formInit.netBoxHost = {
         fqdn: ioc.activeDeployment.host.fqdn,
-        id: ioc.activeDeployment.host.csEntryId
+        netBoxHost: ioc.activeDeployment.host.hostId
       };
     }
 
diff --git a/src/components/IOC/IOCTable/IOCTable.js b/src/components/IOC/IOCTable/IOCTable.js
index 4b8cbc57..f5484c96 100644
--- a/src/components/IOC/IOCTable/IOCTable.js
+++ b/src/components/IOC/IOCTable/IOCTable.js
@@ -49,9 +49,9 @@ const hostDetailsColumns = [
 ];
 
 function createHostLink(host) {
-  if (host?.externalHostId) {
+  if (host?.hostId) {
     return (
-      <Link href={`/hosts/${host?.externalHostId}`}>
+      <Link href={`/hosts/${host?.hostId}`}>
         {noWrapText(host.hostName || "---")}
       </Link>
     );
diff --git a/src/components/Job/JobDetails.js b/src/components/Job/JobDetails.js
index c72774b7..e8dd1f25 100644
--- a/src/components/Job/JobDetails.js
+++ b/src/components/Job/JobDetails.js
@@ -48,12 +48,12 @@ export function JobDetails({ operation, job }) {
 
   function calculateHostText() {
     // host is resolvable => show link for users
-    if (operation.host.csEntryId && operation.host.csEntryIdValid) {
+    if (operation.host.hostId && operation.host.externalIdValid) {
       return (
         <Typography>
           <MuiLink
             component={ReactRouterLink}
-            to={`/hosts/${operation.host.csEntryId}`}
+            to={`/hosts/${operation.host.hostId}`}
             underline="hover"
           >
             {operation.host.fqdn}
diff --git a/src/components/Job/JobTable/JobHostColumn.js b/src/components/Job/JobTable/JobHostColumn.js
index 2e22781b..5e413ca5 100644
--- a/src/components/Job/JobTable/JobHostColumn.js
+++ b/src/components/Job/JobTable/JobHostColumn.js
@@ -6,7 +6,7 @@ export const JobHostColumn = ({ job }) => {
     return (
       <Stack>
         <Link
-          href={`/hosts/${job?.host?.externalHostId}`}
+          href={`/hosts/${job?.host?.hostId}`}
           aria-label={`Host ${job.host?.hostName}`}
         >
           {job.host.hostName}
diff --git a/src/components/common/Helper.js b/src/components/common/Helper.js
index 7769f9b7..c65fc16d 100644
--- a/src/components/common/Helper.js
+++ b/src/components/common/Helper.js
@@ -123,41 +123,6 @@ export const compareArrays = (a1, a2) =>
   a1.length === a2.length &&
   a1.every((element, index) => element === a2[index]);
 
-function createPartQuery(part, openEnd) {
-  if (part && part.length > 0) {
-    return "(+fqdn:" + part + (openEnd ? "*)" : ")");
-  }
-  return null;
-}
-
-function joinParts(parts, openEnd) {
-  const queries = parts.map((p, index) =>
-    createPartQuery(p, openEnd && index === parts.length - 1)
-  );
-  return queries.filter((q) => q && q.length > 0).join(" AND ");
-}
-
-export function transformHostQuery(query) {
-  if (!query || query.length === 0) {
-    return null;
-  }
-
-  const parts = query.split("-");
-  if (parts.length === 1) {
-    return "fqdn:" + query + "*";
-  }
-
-  // if query ends with "-"
-  if (parts[parts.length - 1].length === 0) {
-    if (parts.length === 2) {
-      return "fqdn:" + parts[0];
-    }
-    return joinParts(parts, false);
-  }
-
-  return joinParts(parts, true);
-}
-
 export function noWrapText(text) {
   return <Typography noWrap>{text}</Typography>;
 }
diff --git a/src/components/common/Loki/LokiContainer.js b/src/components/common/Loki/LokiContainer.js
index 9f9a58d2..70d62cde 100644
--- a/src/components/common/Loki/LokiContainer.js
+++ b/src/components/common/Loki/LokiContainer.js
@@ -4,12 +4,12 @@ import { LokiPanel } from "./LokiPanel";
 import { apiContext } from "../../../api/DeployApi";
 import { useAPIMethod } from "@ess-ics/ce-ui-common";
 
-export function LokiContainer({ csEntryId, iocName, isDeployed }) {
+export function LokiContainer({ hostId, iocName, isDeployed }) {
   const client = useContext(apiContext);
 
   const { value: iocHost } = useAPIMethod({
-    fcn: client.apis.Hosts.findHostById,
-    params: useMemo(() => ({ host_csentry_id: csEntryId }), [csEntryId])
+    fcn: client.apis.Hosts.findHostWithStatusById,
+    params: useMemo(() => ({ external_host_id: hostId }), [hostId])
   });
 
   return (
diff --git a/src/components/common/Loki/LokiPanel.js b/src/components/common/Loki/LokiPanel.js
index 4a4bfe0f..86e67c7a 100644
--- a/src/components/common/Loki/LokiPanel.js
+++ b/src/components/common/Loki/LokiPanel.js
@@ -79,7 +79,7 @@ export function LokiPanel({ host, iocName, isSyslog, isDeployed }) {
     [showWarning]
   );
 
-  const hostName = host.csEntryHost.name;
+  const hostName = host.netBoxHost.name;
   const [timeRange, setTimeRange] = React.useState(720);
   const [timeRangeText, setTimeRangeText] = React.useState("12 hours");
   const [periodChange, setPeriodChange] = useState(false);
diff --git a/src/components/host/HostBadge.js b/src/components/host/HostBadge.js
index 80e6132f..93d79842 100644
--- a/src/components/host/HostBadge.js
+++ b/src/components/host/HostBadge.js
@@ -1,14 +1,13 @@
 import React from "react";
 import { IconBadge } from "../common/Badge/IconBadge";
 import { HostStatusIcon } from "./HostIcons";
-import { extractMainNetwork } from "../common/Helper";
 
 export function HostBadge({ host, ...rest }) {
   return (
     <IconBadge
       icon={<HostStatusIcon host={host} />}
-      title={host.csEntryHost?.fqdn}
-      subheader={extractMainNetwork(host?.csEntryHost?.interfaces, "---")}
+      title={host.netBoxHost?.fqdn}
+      subheader={host.netBoxHost?.network}
       {...rest}
     />
   );
diff --git a/src/components/host/HostTable.js b/src/components/host/HostTable.js
index 45c8fcf0..790a471c 100644
--- a/src/components/host/HostTable.js
+++ b/src/components/host/HostTable.js
@@ -39,11 +39,13 @@ export function rowDescription(description) {
 }
 
 export function createRow(hostContainer) {
-  const host = hostContainer.csEntryHost;
+  const host = hostContainer.netBoxHost;
   return {
-    id: host.id,
+    id: host.hostId,
     bulb: <HostStatusIcon host={hostContainer} />,
-    hostName: <Link href={`/hosts/${host.id}`}> {noWrapText(host.name)} </Link>,
+    hostName: (
+      <Link href={`/hosts/${host.hostId}`}> {noWrapText(host.name)} </Link>
+    ),
     host: host,
     description: rowDescription(host.description),
     network: noWrapText(host.network),
diff --git a/src/components/host/HostTable.stories.js b/src/components/host/HostTable.stories.js
index 3b76edac..820badcf 100644
--- a/src/components/host/HostTable.stories.js
+++ b/src/components/host/HostTable.stories.js
@@ -1,6 +1,6 @@
 import React from "react";
 import { Container } from "@mui/material";
-import hosts from "../../mocks/fixtures/PagedCSEntryHostResponse.json";
+import hosts from "../../mocks/fixtures/PagedNetBoxHostResponse.json";
 import { HostTable } from "./HostTable";
 import { RouterHarness } from "../../mocks/AppHarness";
 
@@ -36,5 +36,5 @@ export const Populated = Template.bind({});
 Populated.args = {
   ...Empty.args,
   totalCount: hosts.totalCount,
-  hosts: hosts.csEntryHosts
+  hosts: hosts.netBoxHosts
 };
diff --git a/src/components/records/RecordTable.js b/src/components/records/RecordTable.js
index 25ef994c..3b3a88b6 100644
--- a/src/components/records/RecordTable.js
+++ b/src/components/records/RecordTable.js
@@ -88,6 +88,12 @@ function createRecordDescription(description) {
   );
 }
 
+export function fqdnToHostname(fqdn) {
+  const parts = fqdn.split(".");
+  const hostname = parts[0];
+  return hostname;
+}
+
 function createIocLink(record) {
   // IOC ID only exists if it has been created in the DB -> avoid linking if it hasn't been created
   if (record.iocId) {
@@ -98,14 +104,16 @@ function createIocLink(record) {
 }
 
 function createHostLink(record) {
-  // create host link only if the host exists in CSEntry
-  if (record.hostCSentryId) {
+  // create host link only if the host exists in NetBox
+  if (record.hostId) {
     return (
-      <Link href={`/hosts/${record.hostCSentryId}`}>{record.hostName}</Link>
+      <Link href={`/hosts/${record.hostId}`}>
+        {fqdnToHostname(record.hostName)}
+      </Link>
     );
   }
 
-  return record.hostName;
+  return fqdnToHostname(record.hostName);
 }
 
 export function createRecordsRow(record) {
diff --git a/src/mocks/fixtures/AsyncCombinedDeployments.json b/src/mocks/fixtures/AsyncCombinedDeployments.json
index a208932b..6b4a5f1a 100644
--- a/src/mocks/fixtures/AsyncCombinedDeployments.json
+++ b/src/mocks/fixtures/AsyncCombinedDeployments.json
@@ -8,7 +8,7 @@
     "gitProjectId": 6089,
     "sourceVersion": "96af1a857bfa401ca8abb2cb1ab1359b33fc8bb3",
     "host": {
-      "externalId": 786,
+      "hostId": 786,
       "fqdn": "ymir-ts-ipc-02.cn.nin.ess.eu",
       "hostName": "ymir-ts-ipc-02",
       "network": "NIN-Inst-Ymir"
@@ -24,7 +24,7 @@
     "gitProjectId": 6131,
     "sourceVersion": "16de8d5fdced87ee979ce51fc3d6e98d69f0be46",
     "host": {
-      "externalId": 4977,
+      "hostId": 4977,
       "fqdn": "ics-andreb-vm-lab-ioc.cslab.esss.lu.se",
       "hostName": "ics-andreb-vm-lab-ioc",
       "network": "CSLab-GeneralLab"
@@ -40,7 +40,7 @@
     "gitProjectId": 5617,
     "sourceVersion": "d95edb928bf66f9360f06ba790c857122edbb5db",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -56,7 +56,7 @@
     "gitProjectId": 5616,
     "sourceVersion": "b706e6e3a3930a9c69b0a25f5e4e5656a3606983",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -72,7 +72,7 @@
     "gitProjectId": 5615,
     "sourceVersion": "a6ef08fb8eab955fe56b35f4dc165ce3cebdc5e4",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -88,7 +88,7 @@
     "gitProjectId": 5615,
     "sourceVersion": "a6ef08fb8eab955fe56b35f4dc165ce3cebdc5e4",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -104,7 +104,7 @@
     "gitProjectId": 5615,
     "sourceVersion": "a6ef08fb8eab955fe56b35f4dc165ce3cebdc5e4",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -120,7 +120,7 @@
     "gitProjectId": 5614,
     "sourceVersion": "cf860b0064083ab51c14425eb67ddca9af4a21cc",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -136,7 +136,7 @@
     "gitProjectId": 4478,
     "sourceVersion": "1.1.0",
     "host": {
-      "externalId": 1545,
+      "hostId": 1545,
       "fqdn": "crs-heinv-iocserver.tn.esss.lu.se",
       "hostName": "crs-heinv-iocserver",
       "network": "ChannelAccess-CRYO"
@@ -152,7 +152,7 @@
     "gitProjectId": 5618,
     "sourceVersion": "ed773b3244008ab987d53e24af76bf190a32ea5a",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -168,7 +168,7 @@
     "gitProjectId": 5618,
     "sourceVersion": "ed773b3244008ab987d53e24af76bf190a32ea5a",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -184,7 +184,7 @@
     "gitProjectId": 5614,
     "sourceVersion": "cf860b0064083ab51c14425eb67ddca9af4a21cc",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -200,7 +200,7 @@
     "gitProjectId": 5617,
     "sourceVersion": "d95edb928bf66f9360f06ba790c857122edbb5db",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -216,7 +216,7 @@
     "gitProjectId": 5616,
     "sourceVersion": "b706e6e3a3930a9c69b0a25f5e4e5656a3606983",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -232,7 +232,7 @@
     "gitProjectId": 5615,
     "sourceVersion": "a6ef08fb8eab955fe56b35f4dc165ce3cebdc5e4",
     "host": {
-      "externalId": 3704,
+      "hostId": 3704,
       "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
       "hostName": "pbi-bpm01-mtca-ioc02",
       "network": "ChannelAccess-FEB"
@@ -248,7 +248,7 @@
     "gitProjectId": 6110,
     "sourceVersion": "1.0.0",
     "host": {
-      "externalId": 4991,
+      "hostId": 4991,
       "fqdn": "pbi-fbpm-vm-ioc01.tn.esss.lu.se",
       "hostName": "pbi-fbpm-vm-ioc01",
       "network": "ChannelAccess-FEB"
@@ -264,7 +264,7 @@
     "gitProjectId": 6131,
     "sourceVersion": "75465d7c7c9c61c256a596b96551287b7526dfa3",
     "host": {
-      "externalId": 4977,
+      "hostId": 4977,
       "fqdn": "ics-andreb-vm-lab-ioc.cslab.esss.lu.se",
       "hostName": "ics-andreb-vm-lab-ioc",
       "network": "CSLab-GeneralLab"
@@ -280,7 +280,7 @@
     "gitProjectId": 6088,
     "sourceVersion": "61a50048bd18c19c393e827ea623ab072aeefd66",
     "host": {
-      "externalId": 4977,
+      "hostId": 4977,
       "fqdn": "ics-andreb-vm-lab-ioc.cslab.esss.lu.se",
       "hostName": "ics-andreb-vm-lab-ioc",
       "network": "CSLab-GeneralLab"
@@ -296,7 +296,7 @@
     "gitProjectId": 6089,
     "sourceVersion": "32fa64c7c493a1b187b80bb01067d751b15ae889",
     "host": {
-      "externalId": 786,
+      "hostId": 786,
       "fqdn": "ymir-ts-ipc-02.cn.nin.ess.eu",
       "hostName": "ymir-ts-ipc-02",
       "network": "NIN-Inst-Ymir"
@@ -312,7 +312,7 @@
     "gitProjectId": 6089,
     "sourceVersion": "8025cf5eb41921dbfe76fda630843244383d04a9",
     "host": {
-      "externalId": 786,
+      "hostId": 786,
       "fqdn": "ymir-ts-ipc-02.cn.nin.ess.eu",
       "hostName": "ymir-ts-ipc-02",
       "network": "NIN-Inst-Ymir"
diff --git a/src/mocks/fixtures/AsyncCombinedHosts.json b/src/mocks/fixtures/AsyncCombinedHosts.json
index 0614b400..1e1483ae 100644
--- a/src/mocks/fixtures/AsyncCombinedHosts.json
+++ b/src/mocks/fixtures/AsyncCombinedHosts.json
@@ -1,130 +1,140 @@
 [
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 3546,
       "fqdn": "mebt-vm-ioc01.tn.esss.lu.se",
       "name": "mebt-vm-ioc01",
       "scope": "TechnicalNetwork",
       "description": "MEBT RF SSPA (Buncher Amplifier) IOC ",
       "network": "ChannelAccess-ACC",
-      "deviceType": "VirtualMachine"
+      "deviceType": "VirtualMachine",
+      "vm": true
     },
     "status": "AVAILABLE",
     "alert": null
   },
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 871,
       "fqdn": "mebt-chopper-vm.tn.esss.lu.se",
       "name": "mebt-chopper-vm",
       "scope": "TechnicalNetwork",
       "description": "Virtual Machine that runs the IOC of the MEBT Chopper Local Protection PLC",
       "network": "ChannelAccess-FEB",
-      "deviceType": "VirtualMachine"
+      "deviceType": "VirtualMachine",
+      "vm": true
     },
     "status": "AVAILABLE",
     "alert": "ERROR"
   },
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 3915,
       "fqdn": "mebt-ifc1410-01.tn.esss.lu.se",
       "name": "mebt-ifc1410-01",
       "scope": "TechnicalNetwork",
       "description": "MEBT RFLPS FIM system 01 - IFC1410",
       "network": "ChannelAccess-ACC",
-      "deviceType": "MTCA-IFC"
+      "deviceType": "MTCA-IFC",
+      "vm": false
     },
     "status": "UNREACHABLE",
     "alert": "ERROR"
   },
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 3916,
       "fqdn": "mebt-ifc1410-02.tn.esss.lu.se",
       "name": "mebt-ifc1410-02",
       "scope": "TechnicalNetwork",
       "description": "MEBT RFLPS FIM system 02 - IFC1410",
       "network": "ChannelAccess-ACC",
-      "deviceType": "MTCA-IFC"
+      "deviceType": "MTCA-IFC",
+      "vm": false
     },
     "status": "UNREACHABLE",
     "alert": "ERROR"
   },
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 3917,
       "fqdn": "mebt-ifc1410-03.tn.esss.lu.se",
       "name": "mebt-ifc1410-03",
       "scope": "TechnicalNetwork",
       "description": "MEBT RFLPS FIM system 03 - IFC1410",
       "network": "ChannelAccess-ACC",
-      "deviceType": "MTCA-IFC"
+      "deviceType": "MTCA-IFC",
+      "vm": false
     },
     "status": "UNREACHABLE",
     "alert": "ERROR"
   },
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 3580,
       "fqdn": "mebt-vm-ioc02.tn.esss.lu.se",
       "name": "mebt-vm-ioc02",
       "scope": "TechnicalNetwork",
       "description": "MEBT Chopper PLC and IOC VM",
       "network": "ChannelAccess-FEB",
-      "deviceType": "VirtualMachine"
+      "deviceType": "VirtualMachine",
+      "vm": true
     },
     "status": "AVAILABLE",
     "alert": "ERROR"
   },
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 3528,
       "fqdn": "mebt-llrf1-mtca-ioc.tn.esss.lu.se",
       "name": "mebt-llrf1-mtca-ioc",
       "scope": "TechnicalNetwork",
       "description": null,
       "network": "ChannelAccess-ACC",
-      "deviceType": "MTCA-AMC"
+      "deviceType": "MTCA-AMC",
+      "vm": false
     },
     "status": "AVAILABLE",
     "alert": null
   },
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 3506,
       "fqdn": "mebt-llrf2-mtca-ioc.tn.esss.lu.se",
       "name": "mebt-llrf2-mtca-ioc",
       "scope": "TechnicalNetwork",
       "description": null,
       "network": "ChannelAccess-ACC",
-      "deviceType": "MTCA-AMC"
+      "deviceType": "MTCA-AMC",
+      "vm": false
     },
     "status": "AVAILABLE",
     "alert": null
   },
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 3508,
       "fqdn": "mebt-llrf3-mtca-ioc.tn.esss.lu.se",
       "name": "mebt-llrf3-mtca-ioc",
       "scope": "TechnicalNetwork",
       "description": null,
       "network": "ChannelAccess-ACC",
-      "deviceType": "MTCA-AMC"
+      "deviceType": "MTCA-AMC",
+      "vm": false
     },
     "status": "AVAILABLE",
     "alert": null
   },
   {
-    "csEntryHost": {
+    "netBoxHost": {
       "id": 4705,
       "fqdn": "mebt-rf2-vm-ioc.tn.esss.lu.se",
       "name": "mebt-rf2-vm-ioc",
       "scope": "TechnicalNetwork",
       "description": "IOC host for all non-microTCA IOCs connected to the MEBT RF system number 2",
       "network": "ChannelAccess-ACC",
-      "deviceType": "VirtualMachine"
+      "deviceType": "VirtualMachine",
+      "vm": true
     },
     "status": "AVAILABLE",
     "alert": null
diff --git a/src/mocks/fixtures/CSEntryHostWithStatus.json b/src/mocks/fixtures/CSEntryHostWithStatus.json
deleted file mode 100644
index 526489a7..00000000
--- a/src/mocks/fixtures/CSEntryHostWithStatus.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[
-  {
-    "csEntryHost": {
-      "id": 4195,
-      "fqdn": "ccce-w40.cslab.esss.lu.se",
-      "name": "ccce-w40",
-      "scope": "LabNetworks",
-      "description": null,
-      "user": "simonrose",
-      "interfaces": [
-        {
-          "id": 4839,
-          "name": "ccce-w40",
-          "network": "CSLab-GeneralLab",
-          "domain": "cslab.esss.lu.se",
-          "ip": "172.30.7.13",
-          "mac": "02:42:42:f5:a6:d5",
-          "host": "ccce-w40",
-          "cnames": [],
-          "is_main": true
-        }
-      ],
-      "is_ioc": true,
-      "device_type": "VirtualMachine",
-      "created_at": "2021-10-07T09:25:00.000+00:00",
-      "ansible_vars": {
-        "vm_owner": [
-          "simonrose",
-          "anderslindh",
-          "imretoth",
-          "zoltanrunyo",
-          "krisztianloki",
-          "roryclarke"
-        ]
-      },
-      "ansible_groups": ["iocs-ccce-testhosts"]
-    },
-    "assigned": true,
-    "status": "AVAILABLE",
-    "alerts": []
-  }
-]
diff --git a/src/mocks/fixtures/CreateIocResult.json b/src/mocks/fixtures/CreateIocResult.json
index ff37cac9..25a5d699 100644
--- a/src/mocks/fixtures/CreateIocResult.json
+++ b/src/mocks/fixtures/CreateIocResult.json
@@ -5,7 +5,7 @@
   "gitProjectId": 5336,
   "activeDeployment": {
     "host": {
-      "externalHostId": 3354
+      "hostId": 3354
     },
     "sourceVersion": "1.0.0"
   }
diff --git a/src/mocks/fixtures/DeploymentInfoDetails.json b/src/mocks/fixtures/DeploymentInfoDetails.json
index 6347c39e..554128e0 100644
--- a/src/mocks/fixtures/DeploymentInfoDetails.json
+++ b/src/mocks/fixtures/DeploymentInfoDetails.json
@@ -9,7 +9,8 @@
     "sourceVersion": "ee3ae2a8b9e7e83e4eb511eee340716e9d541056",
     "endDate": "2022-02-11T12:29:29.595+00:00",
     "host": {
-      "csEntryId": 1060,
+      "hostId": 1060,
+      "externalIdValid": true,
       "fqdn": "jsparger-test.cslab.esss.lu.se"
     },
     "awxJobId": 3925,
@@ -28,7 +29,8 @@
     "sourceVersion": "0.0.1",
     "endDate": "2022-02-11T12:30:57.888+00:00",
     "host": {
-      "csEntryId": 1060,
+      "hostId": 1060,
+      "externalIdValid": true,
       "fqdn": "jsparger-test.cslab.esss.lu.se"
     },
     "awxJobId": 3928,
@@ -47,7 +49,8 @@
     "sourceVersion": "0.0.1",
     "endDate": "2022-02-11T13:06:32.280+00:00",
     "host": {
-      "csEntryId": 1060,
+      "hostId": 1060,
+      "externalIdValid": true,
       "fqdn": "jsparger-test.cslab.esss.lu.se"
     },
     "awxJobId": 3931,
diff --git a/src/mocks/fixtures/Hosts.json b/src/mocks/fixtures/Hosts.json
index 66475d81..15a9385a 100644
--- a/src/mocks/fixtures/Hosts.json
+++ b/src/mocks/fixtures/Hosts.json
@@ -3,884 +3,1010 @@
   "listSize": 100,
   "pageNumber": 0,
   "limit": 100,
-  "csEntryHosts": [
+  "netBoxHosts": [
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2191,
         "fqdn": "pbi-bcm03-mtca-ioc01.cslab.esss.lu.se",
         "name": "pbi-bcm03-mtca-ioc01",
         "scope": "LabNetworks",
         "description": null,
         "network": "CSLab-BeamDiag",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MjE5MV9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2205,
         "fqdn": "pbi-bcm04-mtca-ioc01.cslab.esss.lu.se",
         "name": "pbi-bcm04-mtca-ioc01",
         "scope": "LabNetworks",
         "description": null,
         "network": "CSLab-BeamDiag",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MjIwNV9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2176,
         "fqdn": "pbi-bcm05-mtca-ioc01.cslab.esss.lu.se",
         "name": "pbi-bcm05-mtca-ioc01",
         "scope": "LabNetworks",
         "description": null,
         "network": "CSLab-BeamDiag",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MjE3Nl9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3704,
         "fqdn": "pbi-bpm01-mtca-ioc02.tn.esss.lu.se",
         "name": "pbi-bpm01-mtca-ioc02",
         "scope": "TechnicalNetwork",
         "description": "BPM01 DTL 010-020 CPU02",
         "network": "ChannelAccess-FEB",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MzcwNF9mYWxzZQ==",
+        "vm": false
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3703,
         "fqdn": "pbi-bpm01-mtca-ioc03.cslab.esss.lu.se",
         "name": "pbi-bpm01-mtca-ioc03",
         "scope": "LabNetworks",
         "description": "MEBT BPM - CPU 2 (lab test)",
         "network": "CSLab-BeamDiag",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MzcwM19mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4937,
         "fqdn": "pbi-emu01-dev-ioc01.cslab.esss.lu.se",
         "name": "pbi-emu01-dev-ioc01",
         "scope": "LabNetworks",
         "description": "VM for development of MEBT EMU auxiliary systems.",
         "network": "CSLab-BeamDiag",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDkzN190cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2108,
         "fqdn": "pbi-emu02-mtca-ifc02.tn.esss.lu.se",
         "name": "pbi-emu02-mtca-ifc02",
         "scope": "TechnicalNetwork",
         "description": "IFC1410 CPU for MEBT EMU - located in BI LAB Equipped with two ADC3117 FMC (second unit)",
         "network": "ChannelAccess-FEB",
-        "deviceType": "MTCA-IFC"
+        "deviceType": "MTCA-IFC",
+        "hostId": "MjEwOF9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4991,
         "fqdn": "pbi-fbpm-vm-ioc01.tn.esss.lu.se",
         "name": "pbi-fbpm-vm-ioc01",
         "scope": "TechnicalNetwork",
         "description": "VM for running e3-ioc-pbi-fastbpm01 IOC.",
         "network": "ChannelAccess-FEB",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDk5MV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2193,
         "fqdn": "pbi-ws01-mtca-ioc01.tn.esss.lu.se",
         "name": "pbi-ws01-mtca-ioc01",
         "scope": "TechnicalNetwork",
         "description": "MEBT Wire Scanner MTCA CPU PBI-WS01",
         "network": "ChannelAccess-FEB",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MjE5M19mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 5580,
         "fqdn": "pbwrv-ioc-110.cslab.esss.lu.se",
         "name": "pbwrv-ioc-110",
         "scope": "LabNetworks",
         "description": "IOC for PBWRV gauge controllers",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NTU4MF90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4900,
         "fqdn": "pbwvcs-ioc-001.cslab.esss.lu.se",
         "name": "pbwvcs-ioc-001",
         "scope": "LabNetworks",
         "description": "IOC for Tgt-PBWRV:Vac-PLC-001",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDkwMF90cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2665,
         "fqdn": "phys-machine-demo.cslab.esss.lu.se",
         "name": "phys-machine-demo",
         "scope": "LabNetworks",
         "description": "Demo of a physical machine for docs",
         "network": "Utgard-Dev",
-        "deviceType": "PhysicalMachine"
+        "deviceType": "PhysicalMachine",
+        "hostId": "MjY2NV9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 1341,
         "fqdn": "ics-vm-mc-ioc-01.cslab.esss.lu.se",
         "name": "ics-vm-mc-ioc-01",
         "scope": "LabNetworks",
         "description": "Virtual machine to support Motion Control (MC) EPICS IOCs on Utgard laboratory",
         "network": "Utgard-Dev",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MTM0MV90cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 287,
         "fqdn": "ioc-lebt-test.tn.esss.lu.se",
         "name": "ioc-lebt-test",
         "scope": "TechnicalNetwork",
         "description": null,
         "network": "ISRC-LEBT-Profinet",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "Mjg3X2ZhbHNl",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 355,
         "fqdn": "ioc-mcc1.tn.esss.lu.se",
         "name": "ioc-mcc1",
         "scope": "TechnicalNetwork",
         "description": "TMCP",
         "network": "ChannelAccess-CRYO",
-        "deviceType": "PhysicalMachine"
+        "deviceType": "PhysicalMachine",
+        "hostId": "MzU1X2ZhbHNl",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 1196,
         "fqdn": "ion-pump-dev.cslab.esss.lu.se",
         "name": "ion-pump-dev",
         "scope": "LabNetworks",
         "description": "Machine for Ion Pump IOC development",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MTE5Nl90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3477,
         "fqdn": "ipc-picoscope-ioc.tn.esss.lu.se",
         "name": "ipc-picoscope-ioc",
         "scope": "TechnicalNetwork",
         "description": "IPC for picoscope IOC",
         "network": "ChannelAccess-ACC",
-        "deviceType": "PhysicalMachine"
+        "deviceType": "PhysicalMachine",
+        "hostId": "MzQ3N19mYWxzZQ==",
+        "vm": false
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 114,
         "fqdn": "isrc-lebt-ipc-test.tn.esss.lu.se",
         "name": "isrc-lebt-ipc-test",
         "scope": "TechnicalNetwork",
         "description": "Machine shut off 2022-04-01 - https://jira.esss.lu.se/browse/INFRA-5057",
         "network": "ICSVMs",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MTE0X3RydWU=",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2981,
         "fqdn": "isrc-lebt-vm.cslab.esss.lu.se",
         "name": "isrc-lebt-vm",
         "scope": "LabNetworks",
         "description": "ISRC-LEBT Virtual Machine : Intended to host the IOCs",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "Mjk4MV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2506,
         "fqdn": "isrc-mtca-ioc1-obsolete.cslab.esss.lu.se",
         "name": "isrc-mtca-ioc1-obsolete",
         "scope": "LabNetworks",
         "description": "ICSHWI-5294 Magnetron PS, LEBT and MEBT chopper triggering\r\nISrc:Ctrl-CPU-1",
         "network": "CSLab-GeneralLab",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MjUwNl9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4338,
         "fqdn": "javier-test.cslab.esss.lu.se",
         "name": "javier-test",
         "scope": "LabNetworks",
         "description": "Used for remote tests",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDMzOF90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 1736,
         "fqdn": "jkazan.cslab.esss.lu.se",
         "name": "jkazan",
         "scope": "LabNetworks",
         "description": "VM used for IOCs",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MTczNl90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 1060,
         "fqdn": "jsparger-test.cslab.esss.lu.se",
         "name": "jsparger-test",
         "scope": "LabNetworks",
         "description": "first test virtual machine",
         "network": "Utgard-Dev",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MTA2MF90cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2921,
         "fqdn": "julmur-vm-01.cslab.esss.lu.se",
         "name": "julmur-vm-01",
         "scope": "LabNetworks",
         "description": "Juliano Murari virtual machine",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MjkyMV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2637,
         "fqdn": "lab-deploy-test-ioc.cslab.esss.lu.se",
         "name": "lab-deploy-test-ioc",
         "scope": "LabNetworks",
         "description": "Test the ioc box ",
         "network": "Utgard-Dev",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MjYzN190cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2638,
         "fqdn": "lab-deploy-test-ioc2.cslab.esss.lu.se",
         "name": "lab-deploy-test-ioc2",
         "scope": "LabNetworks",
         "description": "An example host for docs",
         "network": "Utgard-Dev",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MjYzOF90cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2639,
         "fqdn": "lab-deploy-test-ioc3.cslab.esss.lu.se",
         "name": "lab-deploy-test-ioc3",
         "scope": "LabNetworks",
         "description": "An example host for docs",
         "network": "Utgard-Dev",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MjYzOV90cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 5443,
         "fqdn": "lab-fbpm-vm-ioctest.cslab.esss.lu.se",
         "name": "lab-fbpm-vm-ioctest",
         "scope": "LabNetworks",
         "description": "vm for fastbpm TEST ioc.",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NTQ0M190cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3919,
         "fqdn": "lab-mot-ctrl-cpu-1.cslab.esss.lu.se",
         "name": "lab-mot-ctrl-cpu-1",
         "scope": "LabNetworks",
         "description": "MCAG MTCA ecmc mrf b02",
         "network": "CSLab-MotionLab-05",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MzkxOV9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 612,
         "fqdn": "lab-mps-ioc01.cslab.esss.lu.se",
         "name": "lab-mps-ioc01",
         "scope": "LabNetworks",
         "description": "IOC machine to test MPS subsystems",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NjEyX3RydWU=",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4501,
         "fqdn": "lab-mps-ioc02.cslab.esss.lu.se",
         "name": "lab-mps-ioc02",
         "scope": "LabNetworks",
         "description": "new IOC machine to test MPS subsystems",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDUwMV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 5595,
         "fqdn": "lab-mps-ioc03.cslab.esss.lu.se",
         "name": "lab-mps-ioc03",
         "scope": "LabNetworks",
         "description": "Third IOC machine to test MPS subsystems",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NTU5NV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 1253,
         "fqdn": "lab-rflps-sim-ioc-01.cslab.esss.lu.se",
         "name": "lab-rflps-sim-ioc-01",
         "scope": "LabNetworks",
         "description": "Virtual Machine to test Slow Interlocks Modules in the LAB",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MTI1M190cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3530,
         "fqdn": "lab-rflps-sim-ioc-02.cslab.esss.lu.se",
         "name": "lab-rflps-sim-ioc-02",
         "scope": "LabNetworks",
         "description": "RFLPS SIM IOC - Slow Interlocks Module for LAB",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MzUzMF90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4042,
         "fqdn": "lab-rf-vm-ioc.cslab.esss.lu.se",
         "name": "lab-rf-vm-ioc",
         "scope": "LabNetworks",
         "description": null,
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDA0Ml90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4521,
         "fqdn": "lab-rf-vm-ioc-02.cslab.esss.lu.se",
         "name": "lab-rf-vm-ioc-02",
         "scope": "LabNetworks",
         "description": "Test machine for lab IOCs",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDUyMV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 1965,
         "fqdn": "lab-rssma100a-ioc2.cslab.esss.lu.se",
         "name": "lab-rssma100a-ioc2",
         "scope": "LabNetworks",
         "description": "VM running is CSLab for hosting the SMA100A RF generators IOCs",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MTk2NV90cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3989,
         "fqdn": "lab-scanning-test.cslab.esss.lu.se",
         "name": "lab-scanning-test",
         "scope": "LabNetworks",
         "description": "EMU Scanning algorithm test",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "Mzk4OV90cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 843,
         "fqdn": "larsjohanssontest.cslab.esss.lu.se",
         "name": "larsjohanssontest",
         "scope": "LabNetworks",
         "description": "test git repository for ioc-factory",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "ODQzX3RydWU=",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 315,
         "fqdn": "lcr-operation.tn.esss.lu.se",
         "name": "lcr-operation",
         "scope": "TechnicalNetwork",
         "description": "This VM is to run IOC to track the LCR shift operation.",
         "network": "ChannelAccess-FEB",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MzE1X3RydWU=",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4453,
         "fqdn": "fbis-lab-vm01.cslab.esss.lu.se",
         "name": "fbis-lab-vm01",
         "scope": "LabNetworks",
         "description": "Development machine for FBIS IFC1410 IOC",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDQ1M190cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4601,
         "fqdn": "fbis-vm-ioc01.tn.esss.lu.se",
         "name": "fbis-vm-ioc01",
         "scope": "TechnicalNetwork",
         "description": "VM for running FBIS top level IOC",
         "network": "ChannelAccess-PS",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDYwMV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4903,
         "fqdn": "fedel-vm.tn.esss.lu.se",
         "name": "fedel-vm",
         "scope": "TechnicalNetwork",
         "description": null,
         "network": "ChannelAccess-ACC",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDkwM190cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4955,
         "fqdn": "gabourin-vm.cslab.esss.lu.se",
         "name": "gabourin-vm",
         "scope": "LabNetworks",
         "description": "VM for SW and EPICS development",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDk1NV90cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 748,
         "fqdn": "georgesblanc.cslab.esss.lu.se",
         "name": "georgesblanc",
         "scope": "LabNetworks",
         "description": "Georg Weiss test instance",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NzQ4X3RydWU=",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2745,
         "fqdn": "gitlabrunner-e3-test.cslab.esss.lu.se",
         "name": "gitlabrunner-e3-test",
         "scope": "LabNetworks",
         "description": null,
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "Mjc0NV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4405,
         "fqdn": "hvac-opcua-test.cslab.esss.lu.se",
         "name": "hvac-opcua-test",
         "scope": "LabNetworks",
         "description": "Virtual machine to run test tools against the Siemens Desigo OPCUA server for HVAC integration",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDQwNV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3329,
         "fqdn": "ics-alo-vm-4.cslab.esss.lu.se",
         "name": "ics-alo-vm-4",
         "scope": "LabNetworks",
         "description": "Test host w 4 cores and 4 GB RAM",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MzMyOV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3806,
         "fqdn": "ics-alo-vm-5.cslab.esss.lu.se",
         "name": "ics-alo-vm-5",
         "scope": "LabNetworks",
         "description": "test machine for deployment systems",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MzgwNl90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4906,
         "fqdn": "ics-andrebengtsson.cslab.esss.lu.se",
         "name": "ics-andrebengtsson",
         "scope": "LabNetworks",
         "description": "Development machine on CSLab-Generallab",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDkwNl90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4977,
         "fqdn": "ics-andreb-vm-lab-ioc.cslab.esss.lu.se",
         "name": "ics-andreb-vm-lab-ioc",
         "scope": "LabNetworks",
         "description": "Development machine on CSLab-Generallab",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDk3N190cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 5117,
         "fqdn": "ics-bevm-lds.cslab.esss.lu.se",
         "name": "ics-bevm-lds",
         "scope": "LabNetworks",
         "description": "This VM is for test the created ioc using lds.",
         "network": "CSLab-ECDC-DEV",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NTExN190cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 431,
         "fqdn": "ics-commissioning.tn.esss.lu.se",
         "name": "ics-commissioning",
         "scope": "TechnicalNetwork",
         "description": "USB->Ethernet adapter located in ICS Ambulance (https://jira.esss.lu.se/browse/ICSHWI-1324).",
         "network": "ChannelAccess-FEB",
-        "deviceType": "PhysicalMachine"
+        "deviceType": "PhysicalMachine",
+        "hostId": "NDMxX2ZhbHNl",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2717,
         "fqdn": "ics-devvm-nh-01.cslab.esss.lu.se",
         "name": "ics-devvm-nh-01",
         "scope": "LabNetworks",
         "description": "Nicklas Holmbergs test VM",
         "network": "Utgard-Dev",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MjcxN190cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 479,
         "fqdn": "ics-ipc-01.cslab.esss.lu.se",
         "name": "ics-ipc-01",
         "scope": "LabNetworks",
         "description": null,
         "network": "CSLab-GeneralLab",
-        "deviceType": "PhysicalMachine"
+        "deviceType": "PhysicalMachine",
+        "hostId": "NDc5X2ZhbHNl",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 1044,
         "fqdn": "icslab-mtca5-ifc-10.cslab.esss.lu.se",
         "name": "icslab-mtca5-ifc-10",
         "scope": "LabNetworks",
         "description": "uTCA IFC14xx in icslab, rack 6, crate 5, slot 10",
         "network": "CSLab-GeneralLab",
-        "deviceType": "MTCA-IFC"
+        "deviceType": "MTCA-IFC",
+        "hostId": "MTA0NF9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 1294,
         "fqdn": "icslab-tdklpsc3s-ioc.cslab.esss.lu.se",
         "name": "icslab-tdklpsc3s-ioc",
         "scope": "LabNetworks",
         "description": "VM to test TDK LAMBDA PS ",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MTI5NF90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3472,
         "fqdn": "ics-ldstest-01.cslab.esss.lu.se",
         "name": "ics-ldstest-01",
         "scope": "LabNetworks",
         "description": "LDS test and demo",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MzQ3Ml90cnVl",
+        "vm": true
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 507,
         "fqdn": "ics-moxa-debug-01.tn.esss.lu.se",
         "name": "ics-moxa-debug-01",
         "scope": "TechnicalNetwork",
         "description": "ICS MOXA used to debug devices at Front End Building",
         "network": "ChannelAccess-FEB",
-        "deviceType": "PhysicalMachine"
+        "deviceType": "PhysicalMachine",
+        "hostId": "NTA3X2ZhbHNl",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2692,
         "fqdn": "ics-nhvm-01.cslab.esss.lu.se",
         "name": "ics-nhvm-01",
         "scope": "LabNetworks",
         "description": "Nicklas Holmberg VM machine to test inventory deployment\r\n",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MjY5Ml90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4829,
         "fqdn": "ics-saeed-vm-2.cslab.esss.lu.se",
         "name": "ics-saeed-vm-2",
         "scope": "LabNetworks",
         "description": "VM for testing",
         "network": "CSLab-GeneralLab",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDgyOV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4814,
         "fqdn": "dream-chpsy1-ipc-01.cslab.esss.lu.se",
         "name": "dream-chpsy1-ipc-01",
         "scope": "LabNetworks",
         "description": "Dream Rack 1 IPC",
         "network": "CSLab-Embla-GeneralLab",
-        "deviceType": "PhysicalMachine"
+        "deviceType": "PhysicalMachine",
+        "hostId": "NDgxNF9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "INFO",
       "iocDeployed": false
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3527,
         "fqdn": "dtl-010-solps-ioc.tn.esss.lu.se",
         "name": "dtl-010-solps-ioc",
         "scope": "TechnicalNetwork",
         "description": "IOC Host- DTL RF System - Klystron auxiliary - solenoid power supply",
         "network": "ChannelAccess-ACC",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MzUyN190cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "INFO",
diff --git a/src/mocks/fixtures/IOCDetails.json b/src/mocks/fixtures/IOCDetails.json
index 5772cafb..4ebe3651 100644
--- a/src/mocks/fixtures/IOCDetails.json
+++ b/src/mocks/fixtures/IOCDetails.json
@@ -35,8 +35,8 @@
       "endDate": "2022-04-06T07:35:20.736+00:00",
       "iocName": "CCCE:SC-IOC-001",
       "host": {
-        "csEntryId": 4195,
-        "csEntryIdValid": true,
+        "hostId": "MTA2MF90cnVl",
+        "externalIdValid": true,
         "fqdn": "ccce-w40.cslab.esss.lu.se",
         "hostName": "ccce-w40",
         "network": "CSLab-GeneralLab"
diff --git a/src/mocks/fixtures/NetBoxHostWithStatus.json b/src/mocks/fixtures/NetBoxHostWithStatus.json
new file mode 100644
index 00000000..9a84626c
--- /dev/null
+++ b/src/mocks/fixtures/NetBoxHostWithStatus.json
@@ -0,0 +1,19 @@
+[
+  {
+    "netBoxHost": {
+      "id": 4195,
+      "hostId": "NDE5NV90cnVl",
+      "fqdn": "ccce-w40.cslab.esss.lu.se",
+      "name": "ccce-w40",
+      "scope": "LabNetworks",
+      "network": "CSLab-GeneralLab",
+      "description": null,
+      "user": "simonrose",
+      "deviceType": "VirtualMachine",
+      "vm": true
+    },
+    "assigned": true,
+    "status": "AVAILABLE",
+    "alerts": []
+  }
+]
diff --git a/src/mocks/fixtures/OperationDeploymentDetails.json b/src/mocks/fixtures/OperationDeploymentDetails.json
index 3b850968..f921a492 100644
--- a/src/mocks/fixtures/OperationDeploymentDetails.json
+++ b/src/mocks/fixtures/OperationDeploymentDetails.json
@@ -13,8 +13,8 @@
   "gitProjectUrl": "https://gitlab.esss.lu.se/iocs/manual/pbi/bcm/e3-ioc-bcm01-cpu02-ipmi.git",
   "gitShortReference": "0.0.1",
   "host": {
-    "csEntryId": 7467,
-    "csEntryIdValid": false,
+    "hostId": "MTA2MF90cnVl",
+    "externalIdValid": false,
     "fqdn": "pbi-ipmi-vm-ioc.tn.esss.lu.se"
   },
   "awxJobId": 374182,
diff --git a/src/mocks/fixtures/OperationList.json b/src/mocks/fixtures/OperationList.json
index 23faa0a3..578fe177 100644
--- a/src/mocks/fixtures/OperationList.json
+++ b/src/mocks/fixtures/OperationList.json
@@ -17,10 +17,10 @@
       "gitReference": "ddb939d20bcaccf7cd8a40b3871d59f077eb6ab2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7480,
+        "hostId": 7480,
         "hostName": "rems-ioc-03",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -36,10 +36,10 @@
       "gitReference": "0.0.1",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7467,
+        "hostId": 7467,
         "hostName": "pbi-ipmi-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -55,10 +55,10 @@
       "gitReference": "0.0.1",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7467,
+        "hostId": 7467,
         "hostName": "pbi-ipmi-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -74,10 +74,10 @@
       "gitReference": "0.0.1",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7467,
+        "hostId": 7467,
         "hostName": "pbi-ipmi-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -93,10 +93,10 @@
       "gitReference": "b4c6c689aa91764afce372f7aae5428e05ecdefa",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -112,10 +112,10 @@
       "gitReference": "b4c6c689aa91764afce372f7aae5428e05ecdefa",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -131,10 +131,10 @@
       "gitReference": "0.0.1",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7467,
+        "hostId": 7467,
         "hostName": "pbi-ipmi-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -150,10 +150,10 @@
       "gitReference": "b4c6c689aa91764afce372f7aae5428e05ecdefa",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -169,10 +169,10 @@
       "gitReference": "c630908d9ccd954a90fcd53c3a11b1b0f868e4f4",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -188,10 +188,10 @@
       "gitReference": "5cdcd662a0444e13a455dc1684a7e2368cc8b1b4",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -207,10 +207,10 @@
       "gitReference": "3f54c5b82e9d0b270f4fa9e9b01263dea6d30a45",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7571,
+        "hostId": 7571,
         "hostName": "rems-ioc-05",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -226,10 +226,10 @@
       "gitReference": "3c86b97621147d669987e5f03fba0accce82b5c1",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7388,
+        "hostId": 7388,
         "hostName": "hbl1-rf2-mtca-ioc",
         "network": "CSLab-GeneralLab",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -245,10 +245,10 @@
       "gitReference": "e87b682a9276754298599654602b6c11799f07f8",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -264,10 +264,10 @@
       "gitReference": "42eb3e456166fc3d6f8cac80821115955f1507fe",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6605,
+        "hostId": 6605,
         "hostName": "tscs-ioc-vm-01",
         "network": "CSLab-MUTS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -283,10 +283,10 @@
       "gitReference": "78b748cfbd63edf815794296c94c10dae7e944bb",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6605,
+        "hostId": 6605,
         "hostName": "tscs-ioc-vm-01",
         "network": "CSLab-MUTS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -302,10 +302,10 @@
       "gitReference": "8f239a81220d7be8182b78c59dce78f0b905d2e3",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -321,10 +321,10 @@
       "gitReference": "f58a266be0ca4199e8157c7b5df49b2e591326b7",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -340,10 +340,10 @@
       "gitReference": "504ad6d9a2f9df98d5f6e516474682d3ef204374",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6605,
+        "hostId": 6605,
         "hostName": "tscs-ioc-vm-01",
         "network": "CSLab-MUTS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -359,10 +359,10 @@
       "gitReference": "73c369aec9ca04c0a8d7443b558452a186706f6e",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7480,
+        "hostId": 7480,
         "hostName": "rems-ioc-03",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -378,10 +378,10 @@
       "gitReference": "fe879e3cedbd6bcb4308d8428687d82a3f41120a",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -397,10 +397,10 @@
       "gitReference": "Version-2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4487,
+        "hostId": 4487,
         "hostName": "mpsos-vm-ioc04",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -416,10 +416,10 @@
       "gitReference": "Version-2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4487,
+        "hostId": 4487,
         "hostName": "mpsos-vm-ioc04",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -435,10 +435,10 @@
       "gitReference": "Version-2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4487,
+        "hostId": 4487,
         "hostName": "mpsos-vm-ioc04",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -454,10 +454,10 @@
       "gitReference": "Version-2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4487,
+        "hostId": 4487,
         "hostName": "mpsos-vm-ioc04",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -473,10 +473,10 @@
       "gitReference": "v0.0.3",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -492,10 +492,10 @@
       "gitReference": "2e40db061fd57c2999309a1d58b69e4705f74bfd",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -511,10 +511,10 @@
       "gitReference": "0.1.7",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -530,10 +530,10 @@
       "gitReference": "511c0904a1faf1fc1bc7e44e0d587a3f4e4e1b6a",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -549,10 +549,10 @@
       "gitReference": "36fa25cd3216ba5308192fe7f4d922ce85cba712",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -568,10 +568,10 @@
       "gitReference": "v0.0.1",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -587,10 +587,10 @@
       "gitReference": "68c4318da0b00d12394d93ddb23bb6dcc0a35659",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -606,10 +606,10 @@
       "gitReference": "ef3f1bea40e41af89831133dd3298754e2f9d720",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -625,10 +625,10 @@
       "gitReference": "379931fcff1a59552e1261eb99a2cfdfaa347caf",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6149,
+        "hostId": 6149,
         "hostName": "pbi-nblm04-mtca-ioc",
         "network": "CSLab-BeamDiag",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -644,10 +644,10 @@
       "gitReference": "bd742ab6870b23a64f5fb4caf8c3752dc8240c35",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3864,
+        "hostId": 3864,
         "hostName": "pbi-nblm03-mtca-ioc",
         "network": "CSLab-BeamDiag",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -663,10 +663,10 @@
       "gitReference": "0.6.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -682,10 +682,10 @@
       "gitReference": "f3918e716b8d272c6165e0d95a7b26d1353a3e51",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -701,10 +701,10 @@
       "gitReference": "bd3dcc3454c277eb2a96a288329436b4cc9729c2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -720,10 +720,10 @@
       "gitReference": "3ec47eef8e39947600172a5b378850b1c77afe82",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -739,10 +739,10 @@
       "gitReference": "90247bc0bbc26ed427efd2f45e1d2402a545c147",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -758,10 +758,10 @@
       "gitReference": "edf63d908bb1669012dc7c19f9de1339c12a49f1",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -777,10 +777,10 @@
       "gitReference": "e18ea2908fd5fc911ee5c7588bd8c79d793d4471",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -796,10 +796,10 @@
       "gitReference": "3deda26ba5b270ed10fa1d08788e32bb28cf081c",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -815,10 +815,10 @@
       "gitReference": "449dee6d3fd8dc59c6ab733c6ec6609a92df91f4",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -834,10 +834,10 @@
       "gitReference": "e6a4fcb61bf124de37fc4e7d508a80842ce05631",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -853,10 +853,10 @@
       "gitReference": "0.5.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -872,10 +872,10 @@
       "gitReference": "0.4.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -891,10 +891,10 @@
       "gitReference": "0.3.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -910,10 +910,10 @@
       "gitReference": "0.2.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -929,10 +929,10 @@
       "gitReference": "0.1.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -948,10 +948,10 @@
       "gitReference": "8243c88c50fbdb3069a8e8d90ec07c522d47bf52",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3962,
+        "hostId": 3962,
         "hostName": "mbl-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -967,10 +967,10 @@
       "gitReference": "2e40db061fd57c2999309a1d58b69e4705f74bfd",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -986,10 +986,10 @@
       "gitReference": "2e40db061fd57c2999309a1d58b69e4705f74bfd",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1005,10 +1005,10 @@
       "gitReference": "e39449b79b010bbb39e48f145e549deab6d593c6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3856,
+        "hostId": 3856,
         "hostName": "pbi-nblm02-mtca-ioc",
         "network": "CSLab-BeamDiag",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1024,10 +1024,10 @@
       "gitReference": "817f7eb16360e57abe2e6d9b7de6e99c2fb2e83a",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3855,
+        "hostId": 3855,
         "hostName": "pbi-nblm01-mtca-ioc",
         "network": "CSLab-BeamDiag",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1043,10 +1043,10 @@
       "gitReference": "242aef6fcaf3281c4c0ebe54932123b4ef032270",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1062,10 +1062,10 @@
       "gitReference": "1e4bffd8ebff7a9a92d6cba0f56fda767d6ddf69",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1081,10 +1081,10 @@
       "gitReference": "1e4bffd8ebff7a9a92d6cba0f56fda767d6ddf69",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1100,10 +1100,10 @@
       "gitReference": "1e4bffd8ebff7a9a92d6cba0f56fda767d6ddf69",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1119,10 +1119,10 @@
       "gitReference": "1e4bffd8ebff7a9a92d6cba0f56fda767d6ddf69",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1138,10 +1138,10 @@
       "gitReference": "75f9d3483d109881790adea32c5d7046b02a4f66",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1157,10 +1157,10 @@
       "gitReference": "e6a4fcb61bf124de37fc4e7d508a80842ce05631",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1176,10 +1176,10 @@
       "gitReference": "0517121f30c1818be03c2d0f4c56b06496e9a56a",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1195,10 +1195,10 @@
       "gitReference": "717a6e24bfe7962c68f154a7e56ebc72c52e3265",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1214,10 +1214,10 @@
       "gitReference": "717a6e24bfe7962c68f154a7e56ebc72c52e3265",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1233,10 +1233,10 @@
       "gitReference": "0517121f30c1818be03c2d0f4c56b06496e9a56a",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1252,10 +1252,10 @@
       "gitReference": "0517121f30c1818be03c2d0f4c56b06496e9a56a",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1271,10 +1271,10 @@
       "gitReference": "1fefaeaaaee9a107cd8d71113bebd2a4247ce429",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1290,10 +1290,10 @@
       "gitReference": "66196e32786dad828a361fc3aa79704a24a94328",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1309,10 +1309,10 @@
       "gitReference": "afd062f0d7da8dacbe675116b738f2da43f6ca68",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1328,10 +1328,10 @@
       "gitReference": "21cb06168fe864df0ac4e97e941fa45b5e7fc9da",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1347,10 +1347,10 @@
       "gitReference": "1921156593edfa5c24afad903c4d65c156bd498b",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3354,
+        "hostId": 3354,
         "hostName": "vacs-accv-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1366,10 +1366,10 @@
       "gitReference": "504ad6d9a2f9df98d5f6e516474682d3ef204374",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6605,
+        "hostId": 6605,
         "hostName": "tscs-ioc-vm-01",
         "network": "CSLab-MUTS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1385,10 +1385,10 @@
       "gitReference": "4dfb8d8ca7b26cfb754bc2aeb524361b09bf9ac9",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1404,10 +1404,10 @@
       "gitReference": "f97f430a514b56fc0f468571559b335e29d59602",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1423,10 +1423,10 @@
       "gitReference": "4277ac52f82e088dee263f6d8f28f4d2da37b858",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1442,10 +1442,10 @@
       "gitReference": "45062265b38c1117ef280b245d58baf5b944a23b",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1461,10 +1461,10 @@
       "gitReference": "bf1ccd1e8a08e0d029fbbe65f797877746f92f06",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1480,10 +1480,10 @@
       "gitReference": "2cb23e4530d901c36e66c4b858d6bf77d1723c45",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1499,10 +1499,10 @@
       "gitReference": "bf1ccd1e8a08e0d029fbbe65f797877746f92f06",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1518,10 +1518,10 @@
       "gitReference": "bf1ccd1e8a08e0d029fbbe65f797877746f92f06",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1537,10 +1537,10 @@
       "gitReference": "bf1ccd1e8a08e0d029fbbe65f797877746f92f06",
       "status": "FAILED",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1556,10 +1556,10 @@
       "gitReference": "52c00fa837f40c9b0fc899f9f9d84b849d821f72",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1575,10 +1575,10 @@
       "gitReference": "65b600aabbab20e33aa690d011c5ef5a555ad984",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4188,
+        "hostId": 4188,
         "hostName": "bifrost-chpsy2-ipc-01",
         "network": "NIN-Inst-BIFROST",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1594,10 +1594,10 @@
       "gitReference": "a366e5eb8bebc6d82f8e06b3a6e3f4d41c0be124",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1613,10 +1613,10 @@
       "gitReference": "78ca86980bea515e69adbd2d65000bf81ff487ef",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7473,
+        "hostId": 7473,
         "hostName": "sds-ipc-dtl030-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1632,10 +1632,10 @@
       "gitReference": "9d6dcca6e774ee476dc4499307306d854116f764",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7470,
+        "hostId": 7470,
         "hostName": "sds-ipc-dtl010-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1651,10 +1651,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1670,10 +1670,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1689,10 +1689,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1708,10 +1708,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1727,10 +1727,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1746,10 +1746,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1765,10 +1765,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1784,10 +1784,10 @@
       "gitReference": "78ca86980bea515e69adbd2d65000bf81ff487ef",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7468,
+        "hostId": 7468,
         "hostName": "sds-ipc-feb090-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1803,10 +1803,10 @@
       "gitReference": "9d6dcca6e774ee476dc4499307306d854116f764",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7473,
+        "hostId": 7473,
         "hostName": "sds-ipc-dtl030-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1822,10 +1822,10 @@
       "gitReference": "cfca32f6a2a2da776f355bd3efa23bd850e90f03",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7352,
+        "hostId": 7352,
         "hostName": "mbl9-rf4-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1841,10 +1841,10 @@
       "gitReference": "aaefa309232df7e9d170b7f171c837f08212de7f",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7255,
+        "hostId": 7255,
         "hostName": "mbl9-rf3-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1860,10 +1860,10 @@
       "gitReference": "5747c8a34d669602fd5a7bfc786386e94ee17543",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7254,
+        "hostId": 7254,
         "hostName": "mbl9-rf2-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1879,10 +1879,10 @@
       "gitReference": "6a48971d7b73eb2b2504c66997b79ee3a0747e2e",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6838,
+        "hostId": 6838,
         "hostName": "mbl9-rf1-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1898,10 +1898,10 @@
       "gitReference": "0928531e3248b8db9be6950fe548caca55a4e9d7",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1917,10 +1917,10 @@
       "gitReference": "1.0.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4550,
+        "hostId": 4550,
         "hostName": "accpss-vm-ioc",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1936,10 +1936,10 @@
       "gitReference": "72a469cf6e0ec3a038a24b97f950759a99011ff9",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1955,10 +1955,10 @@
       "gitReference": "79257986a2515fae24a74abfc4e962fdc95b304f",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4550,
+        "hostId": 4550,
         "hostName": "accpss-vm-ioc",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1974,10 +1974,10 @@
       "gitReference": "b9c90a07893fb3fe91c86d8928bc4e9bd5792639",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -1993,10 +1993,10 @@
       "gitReference": "2177713cba50ccadd5349461c045481cc50dfd3d",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2012,10 +2012,10 @@
       "gitReference": "b1e0390790bfe58d551094f2a1c4c2f8cd9b6f19",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2031,10 +2031,10 @@
       "gitReference": "ecff3d46ada58ededf05076a27d440ff08cb1960",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2050,10 +2050,10 @@
       "gitReference": "3b88974d4e1c6079d8d1e09a7c27bcc79da37e05",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2069,10 +2069,10 @@
       "gitReference": "d16d1987822f9b75ddeb748f6f6e7c786a3259b4",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2088,10 +2088,10 @@
       "gitReference": "cb12c5d4fc9a8d355b8b864c9c5f43ed3b3155e2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2107,10 +2107,10 @@
       "gitReference": "cb12c5d4fc9a8d355b8b864c9c5f43ed3b3155e2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2126,10 +2126,10 @@
       "gitReference": "cb12c5d4fc9a8d355b8b864c9c5f43ed3b3155e2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 3779,
+        "hostId": 3779,
         "hostName": "rems-ioc-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2145,10 +2145,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2164,10 +2164,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2183,10 +2183,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2202,10 +2202,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2221,10 +2221,10 @@
       "gitReference": "Version-7",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7352,
+        "hostId": 7352,
         "hostName": "mbl9-rf4-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2240,10 +2240,10 @@
       "gitReference": "Version-7",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7255,
+        "hostId": 7255,
         "hostName": "mbl9-rf3-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2259,10 +2259,10 @@
       "gitReference": "Version-7",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7254,
+        "hostId": 7254,
         "hostName": "mbl9-rf2-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2278,10 +2278,10 @@
       "gitReference": "Version-7",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6838,
+        "hostId": 6838,
         "hostName": "mbl9-rf1-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2297,10 +2297,10 @@
       "gitReference": "4db70fbd963d378028e4f36a9338e358a2315ef6",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 195,
+        "hostId": 195,
         "hostName": "pbi-fc01-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2316,10 +2316,10 @@
       "gitReference": "1.0.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4983,
+        "hostId": 4983,
         "hostName": "newcomers-sandbox",
         "network": "CSLab-GeneralLab",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2335,10 +2335,10 @@
       "gitReference": "ef3f1bea40e41af89831133dd3298754e2f9d720",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5903,
+        "hostId": 5903,
         "hostName": "spk-c3s-vm-iocs",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2354,10 +2354,10 @@
       "gitReference": "a84bf25f8a51a5e57639463e00d3b13d9f904267",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7504,
+        "hostId": 7504,
         "hostName": "srf-scope",
         "network": "ChannelAccess-TS2",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2373,10 +2373,10 @@
       "gitReference": "d0b12f8688ff27143917c163368dbbb2dc83d355",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4550,
+        "hostId": 4550,
         "hostName": "accpss-vm-ioc",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2392,10 +2392,10 @@
       "gitReference": "976fd34a85918845b503207fbd598f66edb9b95e",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4550,
+        "hostId": 4550,
         "hostName": "accpss-vm-ioc",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2411,10 +2411,10 @@
       "gitReference": "a84bf25f8a51a5e57639463e00d3b13d9f904267",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7504,
+        "hostId": 7504,
         "hostName": "srf-scope",
         "network": "ChannelAccess-TS2",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2430,10 +2430,10 @@
       "gitReference": "1.1.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6351,
+        "hostId": 6351,
         "hostName": "cf-hvac-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2449,10 +2449,10 @@
       "gitReference": "1.1.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6351,
+        "hostId": 6351,
         "hostName": "cf-hvac-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2468,10 +2468,10 @@
       "gitReference": "1.0.0",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4983,
+        "hostId": 4983,
         "hostName": "newcomers-sandbox",
         "network": "CSLab-GeneralLab",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2487,10 +2487,10 @@
       "gitReference": "d0b12f8688ff27143917c163368dbbb2dc83d355",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4550,
+        "hostId": 4550,
         "hostName": "accpss-vm-ioc",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2506,10 +2506,10 @@
       "gitReference": "2b2e041ec096ec3c2a2b0a9241946db0dc2c8a1c",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4550,
+        "hostId": 4550,
         "hostName": "accpss-vm-ioc",
         "network": "ChannelAccess-PS",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2525,10 +2525,10 @@
       "gitReference": "a84bf25f8a51a5e57639463e00d3b13d9f904267",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7504,
+        "hostId": 7504,
         "hostName": "srf-scope",
         "network": "ChannelAccess-TS2",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2544,10 +2544,10 @@
       "gitReference": "1.0.7",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 4185,
+        "hostId": 4185,
         "hostName": "isrc-lebt-ipc-feb-02",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2563,10 +2563,10 @@
       "gitReference": "c24b641bbff9b531b1c691ebd8e5014d8c22b522",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6838,
+        "hostId": 6838,
         "hostName": "mbl9-rf1-mtca-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2582,10 +2582,10 @@
       "gitReference": "v0.1.2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7012,
+        "hostId": 7012,
         "hostName": "spk-endbox-c3s",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2601,10 +2601,10 @@
       "gitReference": "v0.1.5",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5339,
+        "hostId": 5339,
         "hostName": "crs-ctl-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2620,10 +2620,10 @@
       "gitReference": "Version-9",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7388,
+        "hostId": 7388,
         "hostName": "hbl1-rf2-mtca-ioc",
         "network": "CSLab-GeneralLab",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2639,10 +2639,10 @@
       "gitReference": "Version-1",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7388,
+        "hostId": 7388,
         "hostName": "hbl1-rf2-mtca-ioc",
         "network": "CSLab-GeneralLab",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2658,10 +2658,10 @@
       "gitReference": "233b6054ebe69248a4f0dd9615265ba10b149b67",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7377,
+        "hostId": 7377,
         "hostName": "hbl1-rf1-mtca-ioc",
         "network": "CSLab-GeneralLab",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2677,10 +2677,10 @@
       "gitReference": "Version-1",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7377,
+        "hostId": 7377,
         "hostName": "hbl1-rf1-mtca-ioc",
         "network": "CSLab-GeneralLab",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2696,10 +2696,10 @@
       "gitReference": "0ffef27d7c44a7c0b6d144fd182f55d1156480cb",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7501,
+        "hostId": 7501,
         "hostName": "hebt3-lwu-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2715,10 +2715,10 @@
       "gitReference": "0.0.2",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 6878,
+        "hostId": 6878,
         "hostName": "rflps-sim-lab-deploy",
         "network": "CSLab-GeneralLab",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2734,10 +2734,10 @@
       "gitReference": "v0.1.4",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 5339,
+        "hostId": 5339,
         "hostName": "crs-ctl-vm-ioc",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2753,10 +2753,10 @@
       "gitReference": "0101a09aa2852cc4313852c2efba8ed309b35657",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7473,
+        "hostId": 7473,
         "hostName": "sds-ipc-dtl030-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2772,10 +2772,10 @@
       "gitReference": "bd105bcef07fbc4ea29a069ff0e53c136d2fec01",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7470,
+        "hostId": 7470,
         "hostName": "sds-ipc-dtl010-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2791,10 +2791,10 @@
       "gitReference": "d1e4d6afbae74aa79dd0aa9a6bd66fcb178bb372",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7470,
+        "hostId": 7470,
         "hostName": "sds-ipc-dtl010-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2810,10 +2810,10 @@
       "gitReference": "66e9a3c19dbcc5ce2c5e064bddc20775e190e151",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7470,
+        "hostId": 7470,
         "hostName": "sds-ipc-dtl010-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2829,10 +2829,10 @@
       "gitReference": "1a1e9726a86b51a73648060f377e87183a7a2603",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7470,
+        "hostId": 7470,
         "hostName": "sds-ipc-dtl010-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     },
     {
@@ -2848,10 +2848,10 @@
       "gitReference": "80dade3d27422268b94e3b859273440058f8789d",
       "status": "SUCCESSFUL",
       "host": {
-        "externalHostId": 7470,
+        "hostId": 7470,
         "hostName": "sds-ipc-dtl010-01",
         "network": "ChannelAccess-FEB",
-        "hostInfoFromCache": true
+        "netBoxHostFromCache": true
       }
     }
   ]
diff --git a/src/mocks/fixtures/PagedCommandResponse.json b/src/mocks/fixtures/PagedCommandResponse.json
index 981e4c74..02815423 100644
--- a/src/mocks/fixtures/PagedCommandResponse.json
+++ b/src/mocks/fixtures/PagedCommandResponse.json
@@ -14,7 +14,7 @@
       "gitProjectId": 5080,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -28,7 +28,7 @@
       "gitProjectId": 5080,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -42,7 +42,7 @@
       "gitProjectId": 5079,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -56,7 +56,7 @@
       "gitProjectId": 5079,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -70,7 +70,7 @@
       "gitProjectId": 5081,
       "gitReference": "1.0.2",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -84,7 +84,7 @@
       "gitProjectId": 5081,
       "gitReference": "1.0.2",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -98,7 +98,7 @@
       "gitProjectId": 6033,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 1282
+        "hostId": 1282
       },
       "status": "SUCCESSFUL"
     },
@@ -112,7 +112,7 @@
       "gitProjectId": 6033,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 1282
+        "hostId": 1282
       },
       "status": "SUCCESSFUL"
     },
@@ -126,7 +126,7 @@
       "gitProjectId": 6032,
       "gitReference": "1.4.0",
       "host": {
-        "externalHostId": 1279
+        "hostId": 1279
       },
       "status": "SUCCESSFUL"
     },
@@ -140,7 +140,7 @@
       "gitProjectId": 6032,
       "gitReference": "1.4.0",
       "host": {
-        "externalHostId": 1279
+        "hostId": 1279
       },
       "status": "SUCCESSFUL"
     },
@@ -154,7 +154,7 @@
       "gitProjectId": 5925,
       "gitReference": "0.0.1",
       "host": {
-        "externalHostId": 195
+        "hostId": 195
       },
       "status": "SUCCESSFUL"
     },
@@ -168,7 +168,7 @@
       "gitProjectId": 5925,
       "gitReference": "0.0.1",
       "host": {
-        "externalHostId": 195
+        "hostId": 195
       },
       "status": "SUCCESSFUL"
     },
@@ -182,7 +182,7 @@
       "gitProjectId": 4478,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 1545
+        "hostId": 1545
       },
       "status": "SUCCESSFUL"
     },
@@ -196,7 +196,7 @@
       "gitProjectId": 4478,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 1545
+        "hostId": 1545
       },
       "status": "SUCCESSFUL"
     },
@@ -210,7 +210,7 @@
       "gitProjectId": 4478,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 1545
+        "hostId": 1545
       },
       "status": "SUCCESSFUL"
     },
@@ -224,7 +224,7 @@
       "gitProjectId": 6015,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -238,7 +238,7 @@
       "gitProjectId": 6015,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -252,7 +252,7 @@
       "gitProjectId": 6015,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -266,7 +266,7 @@
       "gitProjectId": 6015,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -280,7 +280,7 @@
       "gitProjectId": 5064,
       "gitReference": "049bb80d17343dcf16f4d79c7851b0d2b730a34e",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -294,7 +294,7 @@
       "gitProjectId": 5063,
       "gitReference": "1.0.6",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -308,7 +308,7 @@
       "gitProjectId": 5064,
       "gitReference": "1.0.6",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -322,7 +322,7 @@
       "gitProjectId": 5064,
       "gitReference": "1.0.6",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -336,7 +336,7 @@
       "gitProjectId": 5991,
       "gitReference": "06753581be06046d3203e31274e0af492194abe7",
       "host": {
-        "externalHostId": 4408
+        "hostId": 4408
       },
       "status": "SUCCESSFUL"
     },
@@ -350,7 +350,7 @@
       "gitProjectId": 5960,
       "gitReference": "3dc69ad331f5c3f318679170ac52a87cd36448b0",
       "host": {
-        "externalHostId": 4007
+        "hostId": 4007
       },
       "status": "SUCCESSFUL"
     },
@@ -364,7 +364,7 @@
       "gitProjectId": 5960,
       "gitReference": "3dc69ad331f5c3f318679170ac52a87cd36448b0",
       "host": {
-        "externalHostId": 4007
+        "hostId": 4007
       },
       "status": "SUCCESSFUL"
     },
@@ -378,7 +378,7 @@
       "gitProjectId": 5384,
       "gitReference": "1.1.0",
       "host": {
-        "externalHostId": 454
+        "hostId": 454
       },
       "status": "SUCCESSFUL"
     },
@@ -392,7 +392,7 @@
       "gitProjectId": 5384,
       "gitReference": "1.1.0",
       "host": {
-        "externalHostId": 454
+        "hostId": 454
       },
       "status": "SUCCESSFUL"
     },
@@ -406,7 +406,7 @@
       "gitProjectId": 5384,
       "gitReference": "1.1.0",
       "host": {
-        "externalHostId": 454
+        "hostId": 454
       },
       "status": "SUCCESSFUL"
     },
@@ -420,7 +420,7 @@
       "gitProjectId": 5943,
       "gitReference": "5c1c449f9896fd87a3e55483e5198632e66f0a33",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -434,7 +434,7 @@
       "gitProjectId": 5943,
       "gitReference": "5c1c449f9896fd87a3e55483e5198632e66f0a33",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -448,7 +448,7 @@
       "gitProjectId": 5943,
       "gitReference": "5c1c449f9896fd87a3e55483e5198632e66f0a33",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -462,7 +462,7 @@
       "gitProjectId": 5943,
       "gitReference": "5c1c449f9896fd87a3e55483e5198632e66f0a33",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -476,7 +476,7 @@
       "gitProjectId": 5947,
       "gitReference": "4bc449a4828af2fdc176ab9b39f319c4c7bf8f58",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -490,7 +490,7 @@
       "gitProjectId": 5947,
       "gitReference": "4bc449a4828af2fdc176ab9b39f319c4c7bf8f58",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -504,7 +504,7 @@
       "gitProjectId": 5947,
       "gitReference": "4bc449a4828af2fdc176ab9b39f319c4c7bf8f58",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -518,7 +518,7 @@
       "gitProjectId": 4875,
       "gitReference": "0527d4cfa1c64276634961fefa8f480d00faee26",
       "host": {
-        "externalHostId": 4521
+        "hostId": 4521
       },
       "status": "SUCCESSFUL"
     },
@@ -532,7 +532,7 @@
       "gitProjectId": 4877,
       "gitReference": "cb065da1b6e5dcde6da091a93799ac8488e1e818",
       "host": {
-        "externalHostId": 4521
+        "hostId": 4521
       },
       "status": "SUCCESSFUL"
     },
@@ -546,7 +546,7 @@
       "gitProjectId": 4875,
       "gitReference": "0527d4cfa1c64276634961fefa8f480d00faee26",
       "host": {
-        "externalHostId": 4521
+        "hostId": 4521
       },
       "status": "SUCCESSFUL"
     },
@@ -560,7 +560,7 @@
       "gitProjectId": 4877,
       "gitReference": "cb065da1b6e5dcde6da091a93799ac8488e1e818",
       "host": {
-        "externalHostId": 4521
+        "hostId": 4521
       },
       "status": "SUCCESSFUL"
     },
@@ -574,7 +574,7 @@
       "gitProjectId": 5947,
       "gitReference": "4bc449a4828af2fdc176ab9b39f319c4c7bf8f58",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -588,7 +588,7 @@
       "gitProjectId": 3868,
       "gitReference": "7dd1c7c5d84d14fc6a38c2ed197a622e7dad91f0",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -602,7 +602,7 @@
       "gitProjectId": 3868,
       "gitReference": "7dd1c7c5d84d14fc6a38c2ed197a622e7dad91f0",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -616,7 +616,7 @@
       "gitProjectId": 5936,
       "gitReference": "dd621fc6c015680509b8f9382c95a2f816560444",
       "host": {
-        "externalHostId": 3528
+        "hostId": 3528
       },
       "status": "SUCCESSFUL"
     },
@@ -630,7 +630,7 @@
       "gitProjectId": 5936,
       "gitReference": "0.0.1",
       "host": {
-        "externalHostId": 3528
+        "hostId": 3528
       },
       "status": "SUCCESSFUL"
     },
@@ -644,7 +644,7 @@
       "gitProjectId": 5958,
       "gitReference": "3.0.0",
       "host": {
-        "externalHostId": 3061
+        "hostId": 3061
       },
       "status": "SUCCESSFUL"
     },
@@ -658,7 +658,7 @@
       "gitProjectId": 5958,
       "gitReference": "3.0.0",
       "host": {
-        "externalHostId": 3061
+        "hostId": 3061
       },
       "status": "SUCCESSFUL"
     },
@@ -672,7 +672,7 @@
       "gitProjectId": 5908,
       "gitReference": "516e32bbdc350217704ab64c25b2aa48efa7d2dd",
       "host": {
-        "externalHostId": 3394
+        "hostId": 3394
       },
       "status": "SUCCESSFUL"
     },
@@ -686,7 +686,7 @@
       "gitProjectId": 5947,
       "gitReference": "cebdfb2a8911fe4ff7846c163f2edd692ed4c650",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -700,7 +700,7 @@
       "gitProjectId": 5947,
       "gitReference": "fa43751e3baa25e695c523f4e24059a97a14dd92",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -714,7 +714,7 @@
       "gitProjectId": 5080,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -728,7 +728,7 @@
       "gitProjectId": 5079,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -742,7 +742,7 @@
       "gitProjectId": 5081,
       "gitReference": "1.0.2",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -756,7 +756,7 @@
       "gitProjectId": 5080,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -770,7 +770,7 @@
       "gitProjectId": 5079,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -784,7 +784,7 @@
       "gitProjectId": 5081,
       "gitReference": "1.0.2",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -798,7 +798,7 @@
       "gitProjectId": 3164,
       "gitReference": "2.0.1",
       "host": {
-        "externalHostId": 195
+        "hostId": 195
       },
       "status": "SUCCESSFUL"
     },
@@ -812,7 +812,7 @@
       "gitProjectId": 3164,
       "gitReference": "2.0.1",
       "host": {
-        "externalHostId": 195
+        "hostId": 195
       },
       "status": "SUCCESSFUL"
     },
@@ -826,7 +826,7 @@
       "gitProjectId": 5081,
       "gitReference": "1.0.2",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -840,7 +840,7 @@
       "gitProjectId": 5081,
       "gitReference": "1.0.2",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -854,7 +854,7 @@
       "gitProjectId": 5925,
       "gitReference": "0.0.1",
       "host": {
-        "externalHostId": 195
+        "hostId": 195
       },
       "status": "SUCCESSFUL"
     },
@@ -868,7 +868,7 @@
       "gitProjectId": 5925,
       "gitReference": "0.0.1",
       "host": {
-        "externalHostId": 195
+        "hostId": 195
       },
       "status": "SUCCESSFUL"
     },
@@ -882,7 +882,7 @@
       "gitProjectId": 3055,
       "gitReference": "2.0.1",
       "host": {
-        "externalHostId": 195
+        "hostId": 195
       },
       "status": "SUCCESSFUL"
     },
@@ -896,7 +896,7 @@
       "gitProjectId": 3055,
       "gitReference": "2.0.1",
       "host": {
-        "externalHostId": 195
+        "hostId": 195
       },
       "status": "SUCCESSFUL"
     },
@@ -910,7 +910,7 @@
       "gitProjectId": 3055,
       "gitReference": "2.0.1",
       "host": {
-        "externalHostId": 195
+        "hostId": 195
       },
       "status": "SUCCESSFUL"
     },
@@ -924,7 +924,7 @@
       "gitProjectId": 5096,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 4434
+        "hostId": 4434
       },
       "status": "SUCCESSFUL"
     },
@@ -938,7 +938,7 @@
       "gitProjectId": 5096,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 4434
+        "hostId": 4434
       },
       "status": "SUCCESSFUL"
     },
@@ -952,7 +952,7 @@
       "gitProjectId": 5085,
       "gitReference": "1cadc5f224758cef4741dac87e8d850bacc63b14",
       "host": {
-        "externalHostId": 697
+        "hostId": 697
       },
       "status": "SUCCESSFUL"
     },
@@ -966,7 +966,7 @@
       "gitProjectId": 5096,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 4434
+        "hostId": 4434
       },
       "status": "SUCCESSFUL"
     },
@@ -980,7 +980,7 @@
       "gitProjectId": 5365,
       "gitReference": "0.0.3",
       "host": {
-        "externalHostId": 686
+        "hostId": 686
       },
       "status": "SUCCESSFUL"
     },
@@ -994,7 +994,7 @@
       "gitProjectId": 5365,
       "gitReference": "0.0.3",
       "host": {
-        "externalHostId": 686
+        "hostId": 686
       },
       "status": "SUCCESSFUL"
     },
@@ -1008,7 +1008,7 @@
       "gitProjectId": 5096,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 4434
+        "hostId": 4434
       },
       "status": "SUCCESSFUL"
     },
@@ -1022,7 +1022,7 @@
       "gitProjectId": 5096,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 4434
+        "hostId": 4434
       },
       "status": "SUCCESSFUL"
     },
@@ -1036,7 +1036,7 @@
       "gitProjectId": 5096,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 4434
+        "hostId": 4434
       },
       "status": "SUCCESSFUL"
     },
@@ -1050,7 +1050,7 @@
       "gitProjectId": 5096,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 4434
+        "hostId": 4434
       },
       "status": "SUCCESSFUL"
     },
@@ -1064,7 +1064,7 @@
       "gitProjectId": 5096,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 4434
+        "hostId": 4434
       },
       "status": "SUCCESSFUL"
     },
@@ -1078,7 +1078,7 @@
       "gitProjectId": 4435,
       "gitReference": "2ca8413472617b8e1bfc76f4bd0c0abec0e58a58",
       "host": {
-        "externalHostId": 2216
+        "hostId": 2216
       },
       "status": "SUCCESSFUL"
     },
@@ -1092,7 +1092,7 @@
       "gitProjectId": 4435,
       "gitReference": "2ca8413472617b8e1bfc76f4bd0c0abec0e58a58",
       "host": {
-        "externalHostId": 2216
+        "hostId": 2216
       },
       "status": "SUCCESSFUL"
     },
@@ -1106,7 +1106,7 @@
       "gitProjectId": 5365,
       "gitReference": "0.0.3",
       "host": {
-        "externalHostId": 686
+        "hostId": 686
       },
       "status": "SUCCESSFUL"
     },
@@ -1120,7 +1120,7 @@
       "gitProjectId": 5079,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1134,7 +1134,7 @@
       "gitProjectId": 5079,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1148,7 +1148,7 @@
       "gitProjectId": 5079,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1162,7 +1162,7 @@
       "gitProjectId": 5079,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1176,7 +1176,7 @@
       "gitProjectId": 5873,
       "gitReference": "0f11e9a8bf88047927209d0aab41c6fffb0ff296",
       "host": {
-        "externalHostId": 3209
+        "hostId": 3209
       },
       "status": "SUCCESSFUL"
     },
@@ -1190,7 +1190,7 @@
       "gitProjectId": 5873,
       "gitReference": "326e3eb664afdf01ef18e193c3b97bbce0fcffe1",
       "host": {
-        "externalHostId": 3209
+        "hostId": 3209
       },
       "status": "SUCCESSFUL"
     },
@@ -1204,7 +1204,7 @@
       "gitProjectId": 5666,
       "gitReference": "961a1a5c967349026da878729271d399089df7e4",
       "host": {
-        "externalHostId": 4195
+        "hostId": 4195
       },
       "status": "SUCCESSFUL"
     },
@@ -1218,7 +1218,7 @@
       "gitProjectId": 4589,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 3737
+        "hostId": 3737
       },
       "status": "SUCCESSFUL"
     },
@@ -1232,7 +1232,7 @@
       "gitProjectId": 4589,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 3737
+        "hostId": 3737
       },
       "status": "SUCCESSFUL"
     },
@@ -1246,7 +1246,7 @@
       "gitProjectId": 4590,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 3739
+        "hostId": 3739
       },
       "status": "SUCCESSFUL"
     },
@@ -1260,7 +1260,7 @@
       "gitProjectId": 4590,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 3739
+        "hostId": 3739
       },
       "status": "SUCCESSFUL"
     },
@@ -1274,7 +1274,7 @@
       "gitProjectId": 4570,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 2909
+        "hostId": 2909
       },
       "status": "SUCCESSFUL"
     },
@@ -1288,7 +1288,7 @@
       "gitProjectId": 4570,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 2909
+        "hostId": 2909
       },
       "status": "SUCCESSFUL"
     },
@@ -1302,7 +1302,7 @@
       "gitProjectId": 5631,
       "gitReference": "01d1e489e21c288be39e8ba350dc1b88654ee6d9",
       "host": {
-        "externalHostId": 4782
+        "hostId": 4782
       },
       "status": "SUCCESSFUL"
     },
@@ -1316,7 +1316,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.1",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1330,7 +1330,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.1",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1344,7 +1344,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.1",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1358,7 +1358,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.1",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1372,7 +1372,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.1",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1386,7 +1386,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.1",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1400,7 +1400,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.1",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1414,7 +1414,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.1",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1428,7 +1428,7 @@
       "gitProjectId": 5056,
       "gitReference": "2b8a031d7b698a6944e28408cb17241a7df9ec99",
       "host": {
-        "externalHostId": 4408
+        "hostId": 4408
       },
       "status": "SUCCESSFUL"
     },
@@ -1442,7 +1442,7 @@
       "gitProjectId": 5056,
       "gitReference": "2b8a031d7b698a6944e28408cb17241a7df9ec99",
       "host": {
-        "externalHostId": 4408
+        "hostId": 4408
       },
       "status": "SUCCESSFUL"
     },
@@ -1456,7 +1456,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.0",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1470,7 +1470,7 @@
       "gitProjectId": 5389,
       "gitReference": "0.7.0",
       "host": {
-        "externalHostId": 4452
+        "hostId": 4452
       },
       "status": "SUCCESSFUL"
     },
@@ -1484,7 +1484,7 @@
       "gitProjectId": 3868,
       "gitReference": "76fca123a3766098e200528c2b9ae71b50b3370f",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1498,7 +1498,7 @@
       "gitProjectId": 4429,
       "gitReference": "88432ee1c63c167079fb74535830db4755844e48",
       "host": {
-        "externalHostId": 1835
+        "hostId": 1835
       },
       "status": "SUCCESSFUL"
     },
@@ -1512,7 +1512,7 @@
       "gitProjectId": 3866,
       "gitReference": "e9275af87b237dbbb02e7a87e0a3d50d3882bce2",
       "host": {
-        "externalHostId": 1835
+        "hostId": 1835
       },
       "status": "SUCCESSFUL"
     },
@@ -1526,7 +1526,7 @@
       "gitProjectId": 3868,
       "gitReference": "76fca123a3766098e200528c2b9ae71b50b3370f",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1540,7 +1540,7 @@
       "gitProjectId": 4429,
       "gitReference": "88432ee1c63c167079fb74535830db4755844e48",
       "host": {
-        "externalHostId": 1835
+        "hostId": 1835
       },
       "status": "SUCCESSFUL"
     },
@@ -1554,7 +1554,7 @@
       "gitProjectId": 3866,
       "gitReference": "e9275af87b237dbbb02e7a87e0a3d50d3882bce2",
       "host": {
-        "externalHostId": 1835
+        "hostId": 1835
       },
       "status": "SUCCESSFUL"
     },
@@ -1568,7 +1568,7 @@
       "gitProjectId": 5056,
       "gitReference": "7b4011cbd82d84b062f4bec9ac23b32848e961d8",
       "host": {
-        "externalHostId": 4408
+        "hostId": 4408
       },
       "status": "SUCCESSFUL"
     },
@@ -1582,7 +1582,7 @@
       "gitProjectId": 4877,
       "gitReference": "cb065da1b6e5dcde6da091a93799ac8488e1e818",
       "host": {
-        "externalHostId": 4521
+        "hostId": 4521
       },
       "status": "SUCCESSFUL"
     },
@@ -1596,7 +1596,7 @@
       "gitProjectId": 4877,
       "gitReference": "cb065da1b6e5dcde6da091a93799ac8488e1e818",
       "host": {
-        "externalHostId": 4521
+        "hostId": 4521
       },
       "status": "SUCCESSFUL"
     },
@@ -1610,7 +1610,7 @@
       "gitProjectId": 4877,
       "gitReference": "493d0de659cf67a552be27030f5dcc27f90e05d0",
       "host": {
-        "externalHostId": 4521
+        "hostId": 4521
       },
       "status": "SUCCESSFUL"
     },
@@ -1624,7 +1624,7 @@
       "gitProjectId": 5064,
       "gitReference": "1.0.2",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -1638,7 +1638,7 @@
       "gitProjectId": 4875,
       "gitReference": "0527d4cfa1c64276634961fefa8f480d00faee26",
       "host": {
-        "externalHostId": 4521
+        "hostId": 4521
       },
       "status": "SUCCESSFUL"
     },
@@ -1652,7 +1652,7 @@
       "gitProjectId": 4875,
       "gitReference": "0527d4cfa1c64276634961fefa8f480d00faee26",
       "host": {
-        "externalHostId": 4521
+        "hostId": 4521
       },
       "status": "SUCCESSFUL"
     },
@@ -1666,7 +1666,7 @@
       "gitProjectId": 5109,
       "gitReference": "9d6b7e48d0630901c4e823f35f0350478dc976c0",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1680,7 +1680,7 @@
       "gitProjectId": 5109,
       "gitReference": "9d6b7e48d0630901c4e823f35f0350478dc976c0",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1694,7 +1694,7 @@
       "gitProjectId": 5109,
       "gitReference": "191144838c19db91f960b90500eb6f8a95aa7291",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1708,7 +1708,7 @@
       "gitProjectId": 5109,
       "gitReference": "191144838c19db91f960b90500eb6f8a95aa7291",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1722,7 +1722,7 @@
       "gitProjectId": 5110,
       "gitReference": "23d125966e5215d89ed239bc2d2e7d799c0fbe29",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1736,7 +1736,7 @@
       "gitProjectId": 5110,
       "gitReference": "23d125966e5215d89ed239bc2d2e7d799c0fbe29",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1750,7 +1750,7 @@
       "gitProjectId": 5110,
       "gitReference": "2ba1a0d535652a73b16eedcdc6619932c922680b",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1764,7 +1764,7 @@
       "gitProjectId": 5110,
       "gitReference": "5d5c1e3cfe6a03155bfdb2ed041622ff4a0b81dd",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1778,7 +1778,7 @@
       "gitProjectId": 5110,
       "gitReference": "861a8da0ad3261090590d70438adc4608e65cf21",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1792,7 +1792,7 @@
       "gitProjectId": 5109,
       "gitReference": "191144838c19db91f960b90500eb6f8a95aa7291",
       "host": {
-        "externalHostId": 4601
+        "hostId": 4601
       },
       "status": "SUCCESSFUL"
     },
@@ -1806,7 +1806,7 @@
       "gitProjectId": 5082,
       "gitReference": "f133a342c3f1bb0e352a5a57307abab50fcf124b",
       "host": {
-        "externalHostId": 1835
+        "hostId": 1835
       },
       "status": "SUCCESSFUL"
     },
@@ -1820,7 +1820,7 @@
       "gitProjectId": 4430,
       "gitReference": "79db843734258c8393a545fe26d8b5a26fccb6c8",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1834,7 +1834,7 @@
       "gitProjectId": 4430,
       "gitReference": "79db843734258c8393a545fe26d8b5a26fccb6c8",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1848,7 +1848,7 @@
       "gitProjectId": 4430,
       "gitReference": "79db843734258c8393a545fe26d8b5a26fccb6c8",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1862,7 +1862,7 @@
       "gitProjectId": 5080,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1876,7 +1876,7 @@
       "gitProjectId": 5079,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1890,7 +1890,7 @@
       "gitProjectId": 5081,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4487
+        "hostId": 4487
       },
       "status": "SUCCESSFUL"
     },
@@ -1904,7 +1904,7 @@
       "gitProjectId": 5360,
       "gitReference": "86bca77d7f52dc0c5907e6c320ccb4ad0601ee5b",
       "host": {
-        "externalHostId": 4185
+        "hostId": 4185
       },
       "status": "SUCCESSFUL"
     },
@@ -1918,7 +1918,7 @@
       "gitProjectId": 5357,
       "gitReference": "1a23f17b3f8972dbda9e16567255cdc4ed0338ad",
       "host": {
-        "externalHostId": 4185
+        "hostId": 4185
       },
       "status": "SUCCESSFUL"
     },
@@ -1932,7 +1932,7 @@
       "gitProjectId": 5345,
       "gitReference": "9040fd4b72681cef1f13ff768e435c5b6e59bbdd",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -1946,7 +1946,7 @@
       "gitProjectId": 5353,
       "gitReference": "294b67f99dc4981d995cad411e8109da72a79362",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -1960,7 +1960,7 @@
       "gitProjectId": 5345,
       "gitReference": "9040fd4b72681cef1f13ff768e435c5b6e59bbdd",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -1974,7 +1974,7 @@
       "gitProjectId": 5356,
       "gitReference": "6110f2d529ecab930f8480b44e5594bc595f72a9",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -1988,7 +1988,7 @@
       "gitProjectId": 5356,
       "gitReference": "6110f2d529ecab930f8480b44e5594bc595f72a9",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -2002,7 +2002,7 @@
       "gitProjectId": 5356,
       "gitReference": "a4dad5dbdcfbb2991e92b884decc4410d84e73bf",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -2016,7 +2016,7 @@
       "gitProjectId": 5356,
       "gitReference": "a4dad5dbdcfbb2991e92b884decc4410d84e73bf",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -2030,7 +2030,7 @@
       "gitProjectId": 5353,
       "gitReference": "294b67f99dc4981d995cad411e8109da72a79362",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -2044,7 +2044,7 @@
       "gitProjectId": 5353,
       "gitReference": "294b67f99dc4981d995cad411e8109da72a79362",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -2058,7 +2058,7 @@
       "gitProjectId": 5353,
       "gitReference": "294b67f99dc4981d995cad411e8109da72a79362",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -2072,7 +2072,7 @@
       "gitProjectId": 5345,
       "gitReference": "9040fd4b72681cef1f13ff768e435c5b6e59bbdd",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -2086,7 +2086,7 @@
       "gitProjectId": 5345,
       "gitReference": "9040fd4b72681cef1f13ff768e435c5b6e59bbdd",
       "host": {
-        "externalHostId": 3200
+        "hostId": 3200
       },
       "status": "SUCCESSFUL"
     },
@@ -2100,7 +2100,7 @@
       "gitProjectId": 5339,
       "gitReference": "b3771ba96a8ed99d5b21cb1e60474f42237d7862",
       "host": {
-        "externalHostId": 3965
+        "hostId": 3965
       },
       "status": "SUCCESSFUL"
     }
diff --git a/src/mocks/fixtures/PagedDeploymentResponse.json b/src/mocks/fixtures/PagedDeploymentResponse.json
index b5860a82..23b0035b 100644
--- a/src/mocks/fixtures/PagedDeploymentResponse.json
+++ b/src/mocks/fixtures/PagedDeploymentResponse.json
@@ -14,7 +14,7 @@
       "gitProjectId": 6046,
       "gitReference": "c9d14d0214c54a77b0dca60636bb2c0e5855dd83",
       "host": {
-        "externalHostId": 2177
+        "hostId": 2177
       },
       "status": "SUCCESSFUL"
     },
@@ -28,7 +28,7 @@
       "gitProjectId": 5934,
       "gitReference": "b61cb0dc5a1ac34a934b45f9e8a784dcbcfb6de3",
       "host": {
-        "externalHostId": 2177
+        "hostId": 2177
       },
       "status": "SUCCESSFUL"
     },
@@ -42,7 +42,7 @@
       "gitProjectId": 6046,
       "gitReference": "ee6a92c2b62a38a6841840fea639b4c346345f24",
       "host": {
-        "externalHostId": 2177
+        "hostId": 2177
       },
       "status": "SUCCESSFUL"
     },
@@ -56,7 +56,7 @@
       "gitProjectId": 5923,
       "gitReference": "4c7383d78683c6bb49667e6f79bd532a8f969800",
       "host": {
-        "externalHostId": 2160
+        "hostId": 2160
       },
       "status": "SUCCESSFUL"
     },
@@ -70,7 +70,7 @@
       "gitProjectId": 5924,
       "gitReference": "761049c06e66e281fe33193f6000bc6c4951a97a",
       "host": {
-        "externalHostId": 1800
+        "hostId": 1800
       },
       "status": "SUCCESSFUL"
     },
@@ -84,7 +84,7 @@
       "gitProjectId": 5924,
       "gitReference": "753dfc06fa3ef0109df3e714c1c590985f7d8e9f",
       "host": {
-        "externalHostId": 1800
+        "hostId": 1800
       },
       "status": "SUCCESSFUL"
     },
@@ -98,7 +98,7 @@
       "gitProjectId": 5924,
       "gitReference": "d6f86428c09f73a136a7b62e5eefdb92b6863737",
       "host": {
-        "externalHostId": 1800
+        "hostId": 1800
       },
       "status": "SUCCESSFUL"
     },
@@ -112,7 +112,7 @@
       "gitProjectId": 5924,
       "gitReference": "434060d47ac53864775292193108848edc983ecb",
       "host": {
-        "externalHostId": 1800
+        "hostId": 1800
       },
       "status": "FAILED"
     },
@@ -126,7 +126,7 @@
       "gitProjectId": 6014,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -140,7 +140,7 @@
       "gitProjectId": 6013,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -154,7 +154,7 @@
       "gitProjectId": 6012,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -168,7 +168,7 @@
       "gitProjectId": 6011,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -182,7 +182,7 @@
       "gitProjectId": 6010,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -196,7 +196,7 @@
       "gitProjectId": 6009,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -210,7 +210,7 @@
       "gitProjectId": 6008,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -224,7 +224,7 @@
       "gitProjectId": 6007,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -238,7 +238,7 @@
       "gitProjectId": 6006,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -252,7 +252,7 @@
       "gitProjectId": 6005,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -266,7 +266,7 @@
       "gitProjectId": 6004,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -280,7 +280,7 @@
       "gitProjectId": 6003,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -294,7 +294,7 @@
       "gitProjectId": 6002,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -308,7 +308,7 @@
       "gitProjectId": 6001,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -322,7 +322,7 @@
       "gitProjectId": 6000,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -336,7 +336,7 @@
       "gitProjectId": 5999,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -350,7 +350,7 @@
       "gitProjectId": 5998,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -364,7 +364,7 @@
       "gitProjectId": 5997,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -378,7 +378,7 @@
       "gitProjectId": 5996,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -392,7 +392,7 @@
       "gitProjectId": 5995,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -406,7 +406,7 @@
       "gitProjectId": 5994,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -420,7 +420,7 @@
       "gitProjectId": 6023,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -434,7 +434,7 @@
       "gitProjectId": 6022,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -448,7 +448,7 @@
       "gitProjectId": 6021,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -462,7 +462,7 @@
       "gitProjectId": 6020,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -476,7 +476,7 @@
       "gitProjectId": 6019,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -490,7 +490,7 @@
       "gitProjectId": 6018,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -504,7 +504,7 @@
       "gitProjectId": 6017,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -518,7 +518,7 @@
       "gitProjectId": 6016,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -532,7 +532,7 @@
       "gitProjectId": 6015,
       "gitReference": "0.1.1",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -546,7 +546,7 @@
       "gitProjectId": 5960,
       "gitReference": "e85014da183000d7e7b090d89bd160f6e86140f2",
       "host": {
-        "externalHostId": 4007
+        "hostId": 4007
       },
       "status": "SUCCESSFUL"
     },
@@ -560,7 +560,7 @@
       "gitProjectId": 6033,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 1282
+        "hostId": 1282
       },
       "status": "SUCCESSFUL"
     },
@@ -574,7 +574,7 @@
       "gitProjectId": 6032,
       "gitReference": "1.4.0",
       "host": {
-        "externalHostId": 1279
+        "hostId": 1279
       },
       "status": "SUCCESSFUL"
     },
@@ -588,7 +588,7 @@
       "gitProjectId": 5420,
       "gitReference": "0.0.2",
       "host": {
-        "externalHostId": 686
+        "hostId": 686
       },
       "status": "SUCCESSFUL"
     },
@@ -602,7 +602,7 @@
       "gitProjectId": 5420,
       "gitReference": "0.0.2",
       "host": {
-        "externalHostId": 686
+        "hostId": 686
       },
       "status": "SUCCESSFUL"
     },
@@ -616,7 +616,7 @@
       "gitProjectId": 4430,
       "gitReference": "08d58388e496c07739eace267edef964f7d7113c",
       "host": {
-        "externalHostId": 2216
+        "hostId": 2216
       },
       "status": "SUCCESSFUL"
     },
@@ -630,7 +630,7 @@
       "gitProjectId": 5420,
       "gitReference": "0.0.2",
       "host": {
-        "externalHostId": 686
+        "hostId": 686
       },
       "status": "SUCCESSFUL"
     },
@@ -644,7 +644,7 @@
       "gitProjectId": 4431,
       "gitReference": "03504807fd20a396de52d4786bc70d109fe3f639",
       "host": {
-        "externalHostId": 2216
+        "hostId": 2216
       },
       "status": "SUCCESSFUL"
     },
@@ -658,7 +658,7 @@
       "gitProjectId": 4430,
       "gitReference": "15d6d5634d8f650600ca545ee212d81f05c70d00",
       "host": {
-        "externalHostId": 2216
+        "hostId": 2216
       },
       "status": "SUCCESSFUL"
     },
@@ -672,7 +672,7 @@
       "gitProjectId": 6027,
       "gitReference": "1.0.2",
       "host": {
-        "externalHostId": 3506
+        "hostId": 3506
       },
       "status": "SUCCESSFUL"
     },
@@ -686,7 +686,7 @@
       "gitProjectId": 6028,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 3506
+        "hostId": 3506
       },
       "status": "SUCCESSFUL"
     },
@@ -700,7 +700,7 @@
       "gitProjectId": 6027,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 3506
+        "hostId": 3506
       },
       "status": "SUCCESSFUL"
     },
@@ -714,7 +714,7 @@
       "gitProjectId": 6029,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 3508
+        "hostId": 3508
       },
       "status": "SUCCESSFUL"
     },
@@ -728,7 +728,7 @@
       "gitProjectId": 4478,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 1545
+        "hostId": 1545
       },
       "status": "SUCCESSFUL"
     },
@@ -742,7 +742,7 @@
       "gitProjectId": 4478,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 1545
+        "hostId": 1545
       },
       "status": "SUCCESSFUL"
     },
@@ -756,7 +756,7 @@
       "gitProjectId": 5960,
       "gitReference": "826a745a91a8de0a84e691d9f94fe18c9779d8b6",
       "host": {
-        "externalHostId": 4007
+        "hostId": 4007
       },
       "status": "SUCCESSFUL"
     },
@@ -770,7 +770,7 @@
       "gitProjectId": 5064,
       "gitReference": "85f06ffa336bed69a146288952d2f428b121fb03",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -784,7 +784,7 @@
       "gitProjectId": 5063,
       "gitReference": "16ab1dff73d9c3763b2370a80118819d77e8be6f",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -798,7 +798,7 @@
       "gitProjectId": 5063,
       "gitReference": "1c114c5d4f273d079d0b3b10333126e3e2b5d4f0",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -812,7 +812,7 @@
       "gitProjectId": 5063,
       "gitReference": "8432b39e5c3cd4b8da59f30cde03e9f284063223",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -826,7 +826,7 @@
       "gitProjectId": 5960,
       "gitReference": "4883927ee813d2eb4412dd795e18c6fa9476596f",
       "host": {
-        "externalHostId": 4007
+        "hostId": 4007
       },
       "status": "SUCCESSFUL"
     },
@@ -840,7 +840,7 @@
       "gitProjectId": 5063,
       "gitReference": "f0dcd6b2dc05b977bf336bb1e692688372fc44e8",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -854,7 +854,7 @@
       "gitProjectId": 5063,
       "gitReference": "f6b085e0dc363a6de09678ab0e5f166d1500ef34",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -868,7 +868,7 @@
       "gitProjectId": 4357,
       "gitReference": "7799f366adf014ed7e151344dfdabd8c65daffcb",
       "host": {
-        "externalHostId": 3779
+        "hostId": 3779
       },
       "status": "SUCCESSFUL"
     },
@@ -882,7 +882,7 @@
       "gitProjectId": 4356,
       "gitReference": "c76b5deab7e41fe99e9a37ac9fa2fac17e3c77da",
       "host": {
-        "externalHostId": 3779
+        "hostId": 3779
       },
       "status": "SUCCESSFUL"
     },
@@ -896,7 +896,7 @@
       "gitProjectId": 4355,
       "gitReference": "4c2c3e55d4ab1eac888e0f42da9d5bf0879b3d18",
       "host": {
-        "externalHostId": 3779
+        "hostId": 3779
       },
       "status": "SUCCESSFUL"
     },
@@ -910,7 +910,7 @@
       "gitProjectId": 4354,
       "gitReference": "18489f65ae8995a0e8d9f22f4a539c5e03539c98",
       "host": {
-        "externalHostId": 3779
+        "hostId": 3779
       },
       "status": "SUCCESSFUL"
     },
@@ -924,7 +924,7 @@
       "gitProjectId": 5064,
       "gitReference": "049bb80d17343dcf16f4d79c7851b0d2b730a34e",
       "host": {
-        "externalHostId": 4406
+        "hostId": 4406
       },
       "status": "SUCCESSFUL"
     },
@@ -938,7 +938,7 @@
       "gitProjectId": 4353,
       "gitReference": "840e0faf6649b3a144a610305f22c8a0612a860a",
       "host": {
-        "externalHostId": 3779
+        "hostId": 3779
       },
       "status": "SUCCESSFUL"
     },
@@ -952,7 +952,7 @@
       "gitProjectId": 4782,
       "gitReference": "1.2.1",
       "host": {
-        "externalHostId": 4924
+        "hostId": 4924
       },
       "status": "SUCCESSFUL"
     },
@@ -966,7 +966,7 @@
       "gitProjectId": 4782,
       "gitReference": "1.2.0",
       "host": {
-        "externalHostId": 4924
+        "hostId": 4924
       },
       "status": "SUCCESSFUL"
     },
@@ -980,7 +980,7 @@
       "gitProjectId": 5991,
       "gitReference": "06753581be06046d3203e31274e0af492194abe7",
       "host": {
-        "externalHostId": 4408
+        "hostId": 4408
       },
       "status": "SUCCESSFUL"
     },
@@ -994,7 +994,7 @@
       "gitProjectId": 5924,
       "gitReference": "753dfc06fa3ef0109df3e714c1c590985f7d8e9f",
       "host": {
-        "externalHostId": 1800
+        "hostId": 1800
       },
       "status": "SUCCESSFUL"
     },
@@ -1008,7 +1008,7 @@
       "gitProjectId": 5924,
       "gitReference": "c30382c06f596e784b4704b6484659d6340d7e76",
       "host": {
-        "externalHostId": 1800
+        "hostId": 1800
       },
       "status": "SUCCESSFUL"
     },
@@ -1022,7 +1022,7 @@
       "gitProjectId": 4360,
       "gitReference": "efbf07415340554074d902fcf3ccf85702154fbf",
       "host": {
-        "externalHostId": 1800
+        "hostId": 1800
       },
       "status": "SUCCESSFUL"
     },
@@ -1036,7 +1036,7 @@
       "gitProjectId": 4656,
       "gitReference": "40d6ae09cefb05de370c834680df9f38f7aab328",
       "host": {
-        "externalHostId": 1800
+        "hostId": 1800
       },
       "status": "SUCCESSFUL"
     },
@@ -1050,7 +1050,7 @@
       "gitProjectId": 4654,
       "gitReference": "1.0.3",
       "host": {
-        "externalHostId": 1800
+        "hostId": 1800
       },
       "status": "SUCCESSFUL"
     },
@@ -1064,7 +1064,7 @@
       "gitProjectId": 5384,
       "gitReference": "1.1.0",
       "host": {
-        "externalHostId": 454
+        "hostId": 454
       },
       "status": "SUCCESSFUL"
     },
@@ -1078,7 +1078,7 @@
       "gitProjectId": 5384,
       "gitReference": "1.1.0",
       "host": {
-        "externalHostId": 454
+        "hostId": 454
       },
       "status": "SUCCESSFUL"
     },
@@ -1092,7 +1092,7 @@
       "gitProjectId": 5384,
       "gitReference": "1.1.0",
       "host": {
-        "externalHostId": 454
+        "hostId": 454
       },
       "status": "FAILED"
     },
@@ -1106,7 +1106,7 @@
       "gitProjectId": 5384,
       "gitReference": "1.1.0",
       "host": {
-        "externalHostId": 454
+        "hostId": 454
       },
       "status": "FAILED"
     },
@@ -1120,7 +1120,7 @@
       "gitProjectId": 4659,
       "gitReference": "1.0.3",
       "host": {
-        "externalHostId": 3207
+        "hostId": 3207
       },
       "status": "SUCCESSFUL"
     },
@@ -1134,7 +1134,7 @@
       "gitProjectId": 6014,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1148,7 +1148,7 @@
       "gitProjectId": 6013,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1162,7 +1162,7 @@
       "gitProjectId": 6012,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1176,7 +1176,7 @@
       "gitProjectId": 6011,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1190,7 +1190,7 @@
       "gitProjectId": 6010,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1204,7 +1204,7 @@
       "gitProjectId": 6009,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1218,7 +1218,7 @@
       "gitProjectId": 6008,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1232,7 +1232,7 @@
       "gitProjectId": 6007,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1246,7 +1246,7 @@
       "gitProjectId": 6006,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1260,7 +1260,7 @@
       "gitProjectId": 6005,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1274,7 +1274,7 @@
       "gitProjectId": 6004,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1288,7 +1288,7 @@
       "gitProjectId": 6003,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1302,7 +1302,7 @@
       "gitProjectId": 6002,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1316,7 +1316,7 @@
       "gitProjectId": 6001,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1330,7 +1330,7 @@
       "gitProjectId": 6000,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1344,7 +1344,7 @@
       "gitProjectId": 5999,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1358,7 +1358,7 @@
       "gitProjectId": 5998,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1372,7 +1372,7 @@
       "gitProjectId": 5997,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1386,7 +1386,7 @@
       "gitProjectId": 5996,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1400,7 +1400,7 @@
       "gitProjectId": 5995,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1414,7 +1414,7 @@
       "gitProjectId": 5994,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1428,7 +1428,7 @@
       "gitProjectId": 6023,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1442,7 +1442,7 @@
       "gitProjectId": 6022,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1456,7 +1456,7 @@
       "gitProjectId": 6021,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1470,7 +1470,7 @@
       "gitProjectId": 6020,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1484,7 +1484,7 @@
       "gitProjectId": 6018,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1498,7 +1498,7 @@
       "gitProjectId": 6017,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1512,7 +1512,7 @@
       "gitProjectId": 6016,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1526,7 +1526,7 @@
       "gitProjectId": 6015,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1540,7 +1540,7 @@
       "gitProjectId": 5974,
       "gitReference": "826db61f8b818c4cf08bc0bc4549407f7be0b5bb",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "SUCCESSFUL"
     },
@@ -1554,7 +1554,7 @@
       "gitProjectId": 6019,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 3962
+        "hostId": 3962
       },
       "status": "SUCCESSFUL"
     },
@@ -1568,7 +1568,7 @@
       "gitProjectId": 5974,
       "gitReference": "654ec1a7debfca2d7e26d080c21f8108e8e74a2d",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "SUCCESSFUL"
     },
@@ -1582,7 +1582,7 @@
       "gitProjectId": 5657,
       "gitReference": "0b48488dadce197d3b0a707b8607f1ead6a948ce",
       "host": {
-        "externalHostId": 4764
+        "hostId": 4764
       },
       "status": "SUCCESSFUL"
     },
@@ -1596,7 +1596,7 @@
       "gitProjectId": 5908,
       "gitReference": "516e32bbdc350217704ab64c25b2aa48efa7d2dd",
       "host": {
-        "externalHostId": 3394
+        "hostId": 3394
       },
       "status": "SUCCESSFUL"
     },
@@ -1610,7 +1610,7 @@
       "gitProjectId": 5943,
       "gitReference": "5c1c449f9896fd87a3e55483e5198632e66f0a33",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -1624,7 +1624,7 @@
       "gitProjectId": 5944,
       "gitReference": "e328d71c3ad7b57b189fdaffce4458a222bd63af",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -1638,7 +1638,7 @@
       "gitProjectId": 2994,
       "gitReference": "0.1.0",
       "host": {
-        "externalHostId": 2160
+        "hostId": 2160
       },
       "status": "SUCCESSFUL"
     },
@@ -1652,7 +1652,7 @@
       "gitProjectId": 5974,
       "gitReference": "80c79e4b9d81eecd428fd84d180b4a3d413f2fae",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "SUCCESSFUL"
     },
@@ -1666,7 +1666,7 @@
       "gitProjectId": 5974,
       "gitReference": "d2217420b75a125dbafb1193947b78cad14d6aed",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "SUCCESSFUL"
     },
@@ -1680,7 +1680,7 @@
       "gitProjectId": 5974,
       "gitReference": "6bb5d63f5c77f906fa07402cde4d827d6168d262",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "SUCCESSFUL"
     },
@@ -1694,7 +1694,7 @@
       "gitProjectId": 5974,
       "gitReference": "0b36eb3773475d138f9f0c41a0006fe53404f167",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "SUCCESSFUL"
     },
@@ -1708,7 +1708,7 @@
       "gitProjectId": 5974,
       "gitReference": "0b36eb3773475d138f9f0c41a0006fe53404f167",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "SUCCESSFUL"
     },
@@ -1722,7 +1722,7 @@
       "gitProjectId": 5282,
       "gitReference": "0.1.2",
       "host": {
-        "externalHostId": 4542
+        "hostId": 4542
       },
       "status": "SUCCESSFUL"
     },
@@ -1736,7 +1736,7 @@
       "gitProjectId": 5947,
       "gitReference": "4bc449a4828af2fdc176ab9b39f319c4c7bf8f58",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -1750,7 +1750,7 @@
       "gitProjectId": 5947,
       "gitReference": "4bc449a4828af2fdc176ab9b39f319c4c7bf8f58",
       "host": {
-        "externalHostId": 4192
+        "hostId": 4192
       },
       "status": "SUCCESSFUL"
     },
@@ -1764,7 +1764,7 @@
       "gitProjectId": 5974,
       "gitReference": "0b36eb3773475d138f9f0c41a0006fe53404f167",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "FAILED"
     },
@@ -1778,7 +1778,7 @@
       "gitProjectId": 5974,
       "gitReference": "0b36eb3773475d138f9f0c41a0006fe53404f167",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "SUCCESSFUL"
     },
@@ -1792,7 +1792,7 @@
       "gitProjectId": 5974,
       "gitReference": "0b36eb3773475d138f9f0c41a0006fe53404f167",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "FAILED"
     },
@@ -1806,7 +1806,7 @@
       "gitProjectId": 5974,
       "gitReference": "9e64def8f7a06123f504d68ac5904e1fe96b98c5",
       "host": {
-        "externalHostId": 2384
+        "hostId": 2384
       },
       "status": "FAILED"
     },
@@ -1820,7 +1820,7 @@
       "gitProjectId": 5969,
       "gitReference": "0.0.1",
       "host": {
-        "externalHostId": 3508
+        "hostId": 3508
       },
       "status": "SUCCESSFUL"
     },
@@ -1834,7 +1834,7 @@
       "gitProjectId": 5968,
       "gitReference": "0.0.1",
       "host": {
-        "externalHostId": 3506
+        "hostId": 3506
       },
       "status": "SUCCESSFUL"
     },
@@ -1848,7 +1848,7 @@
       "gitProjectId": 5967,
       "gitReference": "0.0.1",
       "host": {
-        "externalHostId": 3528
+        "hostId": 3528
       },
       "status": "SUCCESSFUL"
     },
@@ -1862,7 +1862,7 @@
       "gitProjectId": 5936,
       "gitReference": "98ad3e86714a16585708dd3fa042583af1857ec9",
       "host": {
-        "externalHostId": 3528
+        "hostId": 3528
       },
       "status": "SUCCESSFUL"
     },
@@ -1876,7 +1876,7 @@
       "gitProjectId": 5936,
       "gitReference": "dd621fc6c015680509b8f9382c95a2f816560444",
       "host": {
-        "externalHostId": 3528
+        "hostId": 3528
       },
       "status": "SUCCESSFUL"
     },
@@ -1890,7 +1890,7 @@
       "gitProjectId": 5936,
       "gitReference": "dcd6ef6ef42bf131a4e2969fb2908d248c8eda63",
       "host": {
-        "externalHostId": 3528
+        "hostId": 3528
       },
       "status": "SUCCESSFUL"
     },
@@ -1904,7 +1904,7 @@
       "gitProjectId": 5958,
       "gitReference": "3.0.0",
       "host": {
-        "externalHostId": 3061
+        "hostId": 3061
       },
       "status": "SUCCESSFUL"
     },
@@ -1918,7 +1918,7 @@
       "gitProjectId": 4529,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 3208
+        "hostId": 3208
       },
       "status": "SUCCESSFUL"
     },
@@ -1932,7 +1932,7 @@
       "gitProjectId": 5876,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4217
+        "hostId": 4217
       },
       "status": "SUCCESSFUL"
     },
@@ -1946,7 +1946,7 @@
       "gitProjectId": 5875,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4215
+        "hostId": 4215
       },
       "status": "SUCCESSFUL"
     },
@@ -1960,7 +1960,7 @@
       "gitProjectId": 5870,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4222
+        "hostId": 4222
       },
       "status": "SUCCESSFUL"
     },
@@ -1974,7 +1974,7 @@
       "gitProjectId": 5960,
       "gitReference": "3dc69ad331f5c3f318679170ac52a87cd36448b0",
       "host": {
-        "externalHostId": 4007
+        "hostId": 4007
       },
       "status": "SUCCESSFUL"
     },
@@ -1988,7 +1988,7 @@
       "gitProjectId": 5874,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4220
+        "hostId": 4220
       },
       "status": "SUCCESSFUL"
     },
@@ -2002,7 +2002,7 @@
       "gitProjectId": 5960,
       "gitReference": "3dc69ad331f5c3f318679170ac52a87cd36448b0",
       "host": {
-        "externalHostId": 4007
+        "hostId": 4007
       },
       "status": "FAILED"
     },
@@ -2016,7 +2016,7 @@
       "gitProjectId": 4429,
       "gitReference": "5a8680faa647bac548b4c2938fbed209237df70d",
       "host": {
-        "externalHostId": 1835
+        "hostId": 1835
       },
       "status": "SUCCESSFUL"
     },
@@ -2030,7 +2030,7 @@
       "gitProjectId": 5908,
       "gitReference": "516e32bbdc350217704ab64c25b2aa48efa7d2dd",
       "host": {
-        "externalHostId": 3394
+        "hostId": 3394
       },
       "status": "SUCCESSFUL"
     },
@@ -2044,7 +2044,7 @@
       "gitProjectId": 5954,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 4205
+        "hostId": 4205
       },
       "status": "SUCCESSFUL"
     },
@@ -2058,7 +2058,7 @@
       "gitProjectId": 4889,
       "gitReference": "2.0.0",
       "host": {
-        "externalHostId": 3876
+        "hostId": 3876
       },
       "status": "SUCCESSFUL"
     },
@@ -2072,7 +2072,7 @@
       "gitProjectId": 5954,
       "gitReference": "1.0.0",
       "host": {
-        "externalHostId": 4205
+        "hostId": 4205
       },
       "status": "SUCCESSFUL"
     },
@@ -2086,7 +2086,7 @@
       "gitProjectId": 4364,
       "gitReference": "1.0.2",
       "host": {
-        "externalHostId": 2160
+        "hostId": 2160
       },
       "status": "SUCCESSFUL"
     },
@@ -2100,7 +2100,7 @@
       "gitProjectId": 4364,
       "gitReference": "1.0.1",
       "host": {
-        "externalHostId": 2160
+        "hostId": 2160
       },
       "status": "SUCCESSFUL"
     }
diff --git a/src/mocks/fixtures/PagedIOCResponse.json b/src/mocks/fixtures/PagedIOCResponse.json
index f208a09d..0a419578 100644
--- a/src/mocks/fixtures/PagedIOCResponse.json
+++ b/src/mocks/fixtures/PagedIOCResponse.json
@@ -11,7 +11,7 @@
       "gitProjectId": 5336,
       "activeDeployment": {
         "host": {
-          "externalHostId": 3354,
+          "hostId": 3354,
           "fqdn": "vacs-accv-vm-ioc.tn.esss.lu.se",
           "hostName": "vacs-accv-vm-ioc",
           "network": "ChannelAccess-FEB"
@@ -27,7 +27,7 @@
       "gitProjectId": 5335,
       "activeDeployment": {
         "host": {
-          "externalHostId": 3354,
+          "hostId": 3354,
           "fqdn": "vacs-accv-vm-ioc.tn.esss.lu.se",
           "hostName": "vacs-accv-vm-ioc",
           "network": "ChannelAccess-FEB"
@@ -44,7 +44,7 @@
       "gitProjectId": 5334,
       "activeDeployment": {
         "host": {
-          "externalHostId": 3354,
+          "hostId": 3354,
           "fqdn": "vacs-accv-vm-ioc.tn.esss.lu.se",
           "hostName": "vacs-accv-vm-ioc",
           "network": "ChannelAccess-FEB"
@@ -78,7 +78,7 @@
       "gitProjectId": 5954,
       "activeDeployment": {
         "host": {
-          "externalHostId": 4205,
+          "hostId": 4205,
           "fqdn": "rfq-rf-vm-ioc.tn.esss.lu.se",
           "hostName": "rfq-rf-vm-ioc",
           "network": "ChannelAccess-ACC"
@@ -94,7 +94,7 @@
       "gitProjectId": 4314,
       "activeDeployment": {
         "host": {
-          "externalHostId": 2245,
+          "hostId": 2245,
           "fqdn": "rfq-llrf1-mtca-ioc.tn.esss.lu.se",
           "hostName": "rfq-llrf1-mtca-ioc",
           "network": "ChannelAccess-ACC"
@@ -111,7 +111,7 @@
       "gitProjectId": 5429,
       "activeDeployment": {
         "host": {
-          "externalHostId": 4178,
+          "hostId": 4178,
           "fqdn": "rfq-ipc-01.tn.esss.lu.se",
           "hostName": "rfq-ipc-01",
           "network": "ChannelAccess-FEB"
@@ -128,7 +128,7 @@
       "gitProjectId": 1697,
       "activeDeployment": {
         "host": {
-          "externalHostId": 4696,
+          "hostId": 4696,
           "fqdn": "rfq-rflps-vm-ioc01.tn.esss.lu.se",
           "hostName": "rfq-rflps-vm-ioc01",
           "network": "ChannelAccess-ACC"
@@ -145,7 +145,7 @@
       "gitProjectId": 5257,
       "activeDeployment": {
         "host": {
-          "externalHostId": 4205,
+          "hostId": 4205,
           "fqdn": "rfq-rf-vm-ioc.tn.esss.lu.se",
           "hostName": "rfq-rf-vm-ioc",
           "network": "ChannelAccess-ACC"
@@ -162,7 +162,7 @@
       "gitProjectId": 5056,
       "activeDeployment": {
         "host": {
-          "externalHostId": 4408,
+          "hostId": 4408,
           "fqdn": "rfq-lob-vm-ioc.tn.esss.lu.se",
           "hostName": "rfq-lob-vm-ioc",
           "network": "ChannelAccess-FEB"
@@ -189,7 +189,7 @@
       "gitProjectId": 4875,
       "activeDeployment": {
         "host": {
-          "externalHostId": 4521,
+          "hostId": 4521,
           "fqdn": "lab-rf-vm-ioc-02.cslab.esss.lu.se",
           "hostName": "lab-rf-vm-ioc-02",
           "network": "CSLab-GeneralLab"
@@ -224,7 +224,7 @@
       "gitProjectId": 4877,
       "activeDeployment": {
         "host": {
-          "externalHostId": 4521,
+          "hostId": 4521,
           "fqdn": "lab-rf-vm-ioc-02.cslab.esss.lu.se",
           "hostName": "lab-rf-vm-ioc-02",
           "network": "CSLab-GeneralLab"
@@ -241,7 +241,7 @@
       "gitProjectId": 4335,
       "activeDeployment": {
         "host": {
-          "externalHostId": 4205,
+          "hostId": 4205,
           "fqdn": "rfq-rf-vm-ioc.tn.esss.lu.se",
           "hostName": "rfq-rf-vm-ioc",
           "network": "ChannelAccess-ACC"
diff --git a/src/mocks/fixtures/PagedCSEntryHostResponse.json b/src/mocks/fixtures/PagedNetBoxHostResponse.json
similarity index 74%
rename from src/mocks/fixtures/PagedCSEntryHostResponse.json
rename to src/mocks/fixtures/PagedNetBoxHostResponse.json
index 2be8c48f..f148353f 100644
--- a/src/mocks/fixtures/PagedCSEntryHostResponse.json
+++ b/src/mocks/fixtures/PagedNetBoxHostResponse.json
@@ -3,328 +3,378 @@
   "listSize": 25,
   "pageNumber": 0,
   "limit": 100,
-  "csEntryHosts": [
+  "netBoxHosts": [
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3546,
         "fqdn": "mebt-vm-ioc01.tn.esss.lu.se",
         "name": "mebt-vm-ioc01",
         "scope": "TechnicalNetwork",
         "description": "MEBT RF SSPA (Buncher Amplifier) IOC ",
         "network": "ChannelAccess-ACC",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MzU0Nl90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 871,
         "fqdn": "mebt-chopper-vm.tn.esss.lu.se",
         "name": "mebt-chopper-vm",
         "scope": "TechnicalNetwork",
         "description": "Virtual Machine that runs the IOC of the MEBT Chopper Local Protection PLC",
         "network": "ChannelAccess-FEB",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "ODcxX3RydWU=",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3915,
         "fqdn": "mebt-ifc1410-01.tn.esss.lu.se",
         "name": "mebt-ifc1410-01",
         "scope": "TechnicalNetwork",
         "description": "MEBT RFLPS FIM system 01 - IFC1410",
         "network": "ChannelAccess-ACC",
-        "deviceType": "MTCA-IFC"
+        "deviceType": "MTCA-IFC",
+        "hostId": "MzkxNV9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "WARNING"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3916,
         "fqdn": "mebt-ifc1410-02.tn.esss.lu.se",
         "name": "mebt-ifc1410-02",
         "scope": "TechnicalNetwork",
         "description": "MEBT RFLPS FIM system 02 - IFC1410",
         "network": "ChannelAccess-ACC",
-        "deviceType": "MTCA-IFC"
+        "deviceType": "MTCA-IFC",
+        "hostId": "MzkxNl9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3917,
         "fqdn": "mebt-ifc1410-03.tn.esss.lu.se",
         "name": "mebt-ifc1410-03",
         "scope": "TechnicalNetwork",
         "description": "MEBT RFLPS FIM system 03 - IFC1410",
         "network": "ChannelAccess-ACC",
-        "deviceType": "MTCA-IFC"
+        "deviceType": "MTCA-IFC",
+        "hostId": "MzkxN19mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3580,
         "fqdn": "mebt-vm-ioc02.tn.esss.lu.se",
         "name": "mebt-vm-ioc02",
         "scope": "TechnicalNetwork",
         "description": "MEBT Chopper PLC and IOC VM",
         "network": "ChannelAccess-FEB",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MzU4MF90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3528,
         "fqdn": "mebt-llrf1-mtca-ioc.tn.esss.lu.se",
         "name": "mebt-llrf1-mtca-ioc",
         "scope": "TechnicalNetwork",
         "description": null,
         "network": "ChannelAccess-ACC",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MzUyOF9mYWxzZQ==",
+        "vm": false
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3506,
         "fqdn": "mebt-llrf2-mtca-ioc.tn.esss.lu.se",
         "name": "mebt-llrf2-mtca-ioc",
         "scope": "TechnicalNetwork",
         "description": null,
         "network": "ChannelAccess-ACC",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MzUwNl9mYWxzZQ==",
+        "vm": false
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3508,
         "fqdn": "mebt-llrf3-mtca-ioc.tn.esss.lu.se",
         "name": "mebt-llrf3-mtca-ioc",
         "scope": "TechnicalNetwork",
         "description": null,
         "network": "ChannelAccess-ACC",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MzUwOF9mYWxzZQ==",
+        "vm": false
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4705,
         "fqdn": "mebt-rf2-vm-ioc.tn.esss.lu.se",
         "name": "mebt-rf2-vm-ioc",
         "scope": "TechnicalNetwork",
         "description": "IOC host for all non-microTCA IOCs connected to the MEBT RF system number 2",
         "network": "ChannelAccess-ACC",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDcwNV90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4704,
         "fqdn": "mebt-rf1-vm-ioc.tn.esss.lu.se",
         "name": "mebt-rf1-vm-ioc",
         "scope": "TechnicalNetwork",
         "description": "IOC host for all non-microTCA IOCs connected to the MEBT RF system number 1",
         "network": "ChannelAccess-ACC",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDcwNF90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4706,
         "fqdn": "mebt-rf3-vm-ioc.tn.esss.lu.se",
         "name": "mebt-rf3-vm-ioc",
         "scope": "TechnicalNetwork",
         "description": "IOC host for all non-microTCA IOCs connected to the MEBT RF system number 3",
         "network": "ChannelAccess-ACC",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDcwNl90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3705,
         "fqdn": "mebt-010-mtca-ioc01.tn.esss.lu.se",
         "name": "mebt-010-mtca-ioc01",
         "scope": "TechnicalNetwork",
         "description": "MEBT Chopper MTCA CPU (lab test)",
         "network": "ChannelAccess-FEB",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MzcwNV9mYWxzZQ==",
+        "vm": false
       },
       "status": "AVAILABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3703,
         "fqdn": "pbi-bpm01-mtca-ioc03.cslab.esss.lu.se",
         "name": "pbi-bpm01-mtca-ioc03",
         "scope": "LabNetworks",
         "description": "MEBT BPM - CPU 2 (lab test)",
         "network": "CSLab-BeamDiag",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MzcwM19mYWxzZQ==",
+        "vm": false
       },
       "status": "AVAILABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 3548,
         "fqdn": "pbi-bpm01-mtca-ioc04.cslab.esss.lu.se",
         "name": "pbi-bpm01-mtca-ioc04",
         "scope": "LabNetworks",
         "description": "MEBT BPM - 3U crate - new model",
         "network": "CSLab-BeamDiag",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MzU0OF9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 1568,
         "fqdn": "mebt-bpm-vm-01.tn.esss.lu.se",
         "name": "mebt-bpm-vm-01",
         "scope": "TechnicalNetwork",
         "description": "VM that runs the MTCA Monitoring IOC (ipmiComm) for the MEBT BPM crate",
         "network": "ChannelAccess-FEB",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "MTU2OF90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4432,
         "fqdn": "mebt-magnets-vm-ioc03.tn.esss.lu.se",
         "name": "mebt-magnets-vm-ioc03",
         "scope": "TechnicalNetwork",
         "description": "Virtual Machine that runs MEBT Quadrupole Magnets IOC [PROD]",
         "network": "ChannelAccess-FEB",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDQzMl90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4433,
         "fqdn": "mebt-magnets-vm-ioc04.tn.esss.lu.se",
         "name": "mebt-magnets-vm-ioc04",
         "scope": "TechnicalNetwork",
         "description": "Virtual Machine that runs MEBT Corrector Magnets IOC [PROD]",
         "network": "ChannelAccess-FEB",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDQzM190cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4924,
         "fqdn": "mebt-chopper-vm-ioc2.tn.esss.lu.se",
         "name": "mebt-chopper-vm-ioc2",
         "scope": "TechnicalNetwork",
         "description": "MEBT Chopper main VM for running IOCs using CCCE BETA",
         "network": "ChannelAccess-FEB",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDkyNF90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2193,
         "fqdn": "pbi-ws01-mtca-ioc01.tn.esss.lu.se",
         "name": "pbi-ws01-mtca-ioc01",
         "scope": "TechnicalNetwork",
         "description": "MEBT Wire Scanner MTCA CPU PBI-WS01",
         "network": "ChannelAccess-FEB",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MjE5M19mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4937,
         "fqdn": "pbi-emu01-dev-ioc01.cslab.esss.lu.se",
         "name": "pbi-emu01-dev-ioc01",
         "scope": "LabNetworks",
         "description": "VM for development of MEBT EMU auxiliary systems.",
         "network": "CSLab-BeamDiag",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDkzN190cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 4522,
         "fqdn": "pbi-ws01-vm-ioc01.tn.esss.lu.se",
         "name": "pbi-ws01-vm-ioc01",
         "scope": "TechnicalNetwork",
         "description": "VM to run auxiliary IOCs for the MEBT Wire Scanners",
         "network": "ChannelAccess-FEB",
-        "deviceType": "VirtualMachine"
+        "deviceType": "VirtualMachine",
+        "hostId": "NDUyMl90cnVl",
+        "vm": true
       },
       "status": "AVAILABLE",
       "alertSeverity": null
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2506,
         "fqdn": "isrc-mtca-ioc1-obsolete.cslab.esss.lu.se",
         "name": "isrc-mtca-ioc1-obsolete",
         "scope": "LabNetworks",
         "description": "ICSHWI-5294 Magnetron PS, LEBT and MEBT chopper triggering\r\nISrc:Ctrl-CPU-1",
         "network": "CSLab-GeneralLab",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MjUwNl9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2108,
         "fqdn": "pbi-emu01-mtca-ifc02.cslab.esss.lu.se",
         "name": "pbi-emu01-mtca-ifc02",
         "scope": "LabNetworks",
         "description": "IFC1410 CPU for MEBT EMU - located in BI LAB Equipped with two ADC3117 FMC (second unit)",
         "network": "CSLab-BeamDiag",
-        "deviceType": "MTCA-IFC"
+        "deviceType": "MTCA-IFC",
+        "hostId": "MjEwOF9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "ERROR"
     },
     {
-      "csEntryHost": {
+      "netBoxHost": {
         "id": 2211,
         "fqdn": "ccpu-33049-002.cslab.esss.lu.se",
         "name": "ccpu-33049-002",
         "scope": "LabNetworks",
         "description": "For monitoring the switches for the MEBT COLLs and EMUs\r\nUsing front panel eth0 for the ECAT crate",
         "network": "CSLab-BeamDiag",
-        "deviceType": "MTCA-AMC"
+        "deviceType": "MTCA-AMC",
+        "hostId": "MjIxMV9mYWxzZQ==",
+        "vm": false
       },
       "status": "UNREACHABLE",
       "alertSeverity": "ERROR"
diff --git a/src/mocks/fixtures/RecordResponse.json b/src/mocks/fixtures/RecordResponse.json
new file mode 100644
index 00000000..57f84725
--- /dev/null
+++ b/src/mocks/fixtures/RecordResponse.json
@@ -0,0 +1,44 @@
+{
+  "totalCount": 4721420,
+  "listSize": 3,
+  "pageNumber": 0,
+  "limit": 20,
+  "recordList": [
+    {
+      "name": "CCCE:SC-IOC-010:#APP_DIR",
+      "iocName": "CCCE:SC-IOC-010",
+      "iocId": 1868,
+      "hostName": "ccce-w40.cslab.esss.lu.se",
+      "hostId": "NDE5NV90cnVl",
+      "pvStatus": "ACTIVE",
+      "iocVersion": "3926de9c5a8fa42fa8b239f98bf3477059d4cbb6",
+      "description": "Application Directory",
+      "recordType": "waveform",
+      "alias": null
+    },
+    {
+      "name": "CCCE:SC-IOC-010:#APP_DIR1",
+      "iocName": "CCCE:SC-IOC-010",
+      "iocId": 1868,
+      "hostName": "ccce-w40.cslab.esss.lu.se",
+      "hostId": "NDE5NV90cnVl",
+      "pvStatus": "ACTIVE",
+      "iocVersion": "3926de9c5a8fa42fa8b239f98bf3477059d4cbb6",
+      "description": "Application Directory Part 1",
+      "recordType": "stringin",
+      "alias": null
+    },
+    {
+      "name": "CCCE:SC-IOC-010:#APP_DIR2",
+      "iocName": "CCCE:SC-IOC-010",
+      "iocId": 1868,
+      "hostName": "ccce-w40.cslab.esss.lu.se",
+      "hostId": "NDE5NV90cnVl",
+      "pvStatus": "ACTIVE",
+      "iocVersion": "3926de9c5a8fa42fa8b239f98bf3477059d4cbb6",
+      "description": "Application Directory Part 2",
+      "recordType": "stringin",
+      "alias": null
+    }
+  ]
+}
diff --git a/src/mocks/fixtures/ccce-api.json b/src/mocks/fixtures/ccce-api.json
index 6811ef1d..d9be2d82 100644
--- a/src/mocks/fixtures/ccce-api.json
+++ b/src/mocks/fixtures/ccce-api.json
@@ -21,12 +21,18 @@
     {
       "name": "Authentication"
     },
+    {
+      "name": "AWX"
+    },
     {
       "name": "Helper"
     },
     {
       "name": "Records"
     },
+    {
+      "name": "NetBox"
+    },
     {
       "name": "Statistics"
     },
@@ -254,6 +260,47 @@
         ]
       }
     },
+    "/api/v1/migrate": {
+      "post": {
+        "tags": ["NetBox"],
+        "summary": "Assign NetBox host IDs to deployments.",
+        "operationId": "doMigration",
+        "parameters": [
+          {
+            "name": "forceMigration",
+            "in": "query",
+            "description": "Force migration",
+            "required": false,
+            "schema": {
+              "type": "boolean",
+              "default": false
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "The migration has been completed.",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/NetBoxMigrationResponse"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GeneralException"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/iocs": {
       "get": {
         "tags": ["IOCs"],
@@ -306,6 +353,15 @@
               "type": "string"
             }
           },
+          {
+            "name": "host_name",
+            "in": "query",
+            "description": "Host name",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
           {
             "name": "query",
             "in": "query",
@@ -518,16 +574,6 @@
             }
           }
         ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/Undeployment"
-              }
-            }
-          },
-          "required": true
-        },
         "responses": {
           "201": {
             "description": "Undeployment created",
@@ -921,7 +967,7 @@
             }
           },
           "422": {
-            "description": "CSEntry host not found",
+            "description": "NetBox host not found",
             "content": {
               "application/json": {
                 "schema": {
@@ -968,6 +1014,70 @@
         ]
       }
     },
+    "/api/v1/awx/jobs": {
+      "post": {
+        "tags": ["AWX"],
+        "summary": "Update an AWX job's status",
+        "operationId": "updateJob",
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/AwxJobMeta"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "description": "Job updated",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GeneralException"
+                }
+              }
+            }
+          },
+          "401": {
+            "description": "Unauthorized",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GeneralException"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Job not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GeneralException"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Service exception",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GeneralException"
+                }
+              }
+            }
+          }
+        },
+        "security": [
+          {
+            "apiKey": []
+          }
+        ]
+      }
+    },
     "/api/v1/authentication/renew": {
       "post": {
         "tags": ["Authentication"],
@@ -1372,6 +1482,24 @@
         ]
       }
     },
+    "/healthcheck": {
+      "get": {
+        "tags": ["health-check-controller"],
+        "operationId": "getHealthCheck",
+        "responses": {
+          "200": {
+            "description": "OK",
+            "content": {
+              "*/*": {
+                "schema": {
+                  "type": "string"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/statistics/general": {
       "get": {
         "tags": ["Statistics"],
@@ -1427,11 +1555,9 @@
                 "HOSTS_REGISTERED",
                 "HOSTS_WITH_IOCS",
                 "HOSTS_REACHABLE",
-                "HOSTS_WITHOUT_ISSUE",
                 "IOCS_REGISTERED",
                 "IOCS_DEPLOYED",
-                "IOCS_RUNNING",
-                "IOCS_RUNNING_WITHOUT_ISSUE"
+                "IOCS_RUNNING"
               ]
             }
           }
@@ -1738,7 +1864,7 @@
           {
             "name": "record_name",
             "in": "query",
-            "description": "Record name",
+            "description": "Part of the Record name that has to be searched",
             "required": false,
             "schema": {
               "type": "string"
@@ -1747,7 +1873,7 @@
           {
             "name": "ioc_name",
             "in": "query",
-            "description": "IOC name",
+            "description": "Part of the IOC name that has to be searched",
             "required": false,
             "schema": {
               "type": "string"
@@ -1827,7 +1953,7 @@
           {
             "name": "name",
             "in": "path",
-            "description": "Unique ID of the record",
+            "description": "Unique (part of the) name of the record",
             "required": true,
             "schema": {
               "type": "string"
@@ -2159,13 +2285,13 @@
     "/api/v1/hosts": {
       "get": {
         "tags": ["Hosts"],
-        "summary": "List CSEntry hosts",
+        "summary": "List hosts",
         "operationId": "listHosts",
         "parameters": [
           {
             "name": "query",
             "in": "query",
-            "description": "Search text, this query string is passed directly to Elasticsearch. E.g.: To search all hosts where the string \"archiver\" appears in any field, use \"archiver\".To restrict the search to only the name field, use \"name:archiver\".Note that if you pass \"name:arch\", this will not match archiver as elasticsearch uses keywords for string matching. In this case you’d need to use a wildcard: \"name:arch*\".",
+            "description": "Search for host name",
             "required": false,
             "schema": {
               "type": "string"
@@ -2204,11 +2330,11 @@
         ],
         "responses": {
           "200": {
-            "description": "A paged array of CSEntry hosts",
+            "description": "A paged array of hosts",
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/PagedCSEntryHostResponse"
+                  "$ref": "#/components/schemas/PagedNetBoxHostResponse"
                 }
               }
             }
@@ -2246,20 +2372,19 @@
         }
       }
     },
-    "/api/v1/hosts/{host_csentry_id}/with_status": {
+    "/api/v1/hosts/{host_id}/with_status": {
       "get": {
         "tags": ["Hosts"],
-        "summary": "Find host by CSEntry ID and get status",
-        "operationId": "findHostById",
+        "summary": "Find host by external ID and get status",
+        "operationId": "findHostWithStatusById",
         "parameters": [
           {
-            "name": "host_csentry_id",
+            "name": "host_id",
             "in": "path",
-            "description": "Unique CSEntry ID of the host",
+            "description": "Host identifier",
             "required": true,
             "schema": {
-              "type": "integer",
-              "format": "int64"
+              "type": "string"
             }
           }
         ],
@@ -2269,7 +2394,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/CSEntryHostWithStatus"
+                  "$ref": "#/components/schemas/NetBoxHostWithStatus"
                 }
               }
             }
@@ -2317,20 +2442,19 @@
         }
       }
     },
-    "/api/v1/hosts/{host_csentry_id}/iocs": {
+    "/api/v1/hosts/{host_id}/iocs": {
       "get": {
         "tags": ["Hosts"],
         "summary": "Find associated IOCs for the host",
         "operationId": "findAssociatedIocsByHostId",
         "parameters": [
           {
-            "name": "host_csentry_id",
+            "name": "host_id",
             "in": "path",
-            "description": "Unique CSEntry ID of the host",
+            "description": "Host identifier",
             "required": true,
             "schema": {
-              "type": "integer",
-              "format": "int64"
+              "type": "string"
             }
           },
           {
@@ -2388,20 +2512,19 @@
         }
       }
     },
-    "/api/v1/hosts/{host_csentry_id}/info": {
+    "/api/v1/hosts/{host_id}/info": {
       "get": {
         "tags": ["Hosts"],
-        "summary": "Find host by CSEntry ID",
-        "operationId": "findCSentryHostById",
+        "summary": "Find host by external ID",
+        "operationId": "findHostInfoById",
         "parameters": [
           {
-            "name": "host_csentry_id",
+            "name": "host_id",
             "in": "path",
-            "description": "Unique CSEntry ID of the host",
+            "description": "Host identifier",
             "required": true,
             "schema": {
-              "type": "integer",
-              "format": "int64"
+              "type": "string"
             }
           }
         ],
@@ -2567,15 +2690,6 @@
               "type": "string"
             }
           },
-          {
-            "name": "include_all_reference",
-            "in": "query",
-            "description": "Inculde all reference - optional. Default value: include all refernce (not limiting the response)",
-            "required": false,
-            "schema": {
-              "type": "boolean"
-            }
-          },
           {
             "name": "search_method",
             "in": "query",
@@ -2717,6 +2831,17 @@
         "tags": ["Git"],
         "summary": "List IOC projects",
         "operationId": "listProjects",
+        "parameters": [
+          {
+            "name": "query",
+            "in": "query",
+            "description": "Search text (Search for Git repository name)",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "description": "List of Gitlab projects of allowed groups",
@@ -2769,6 +2894,67 @@
         ]
       }
     },
+    "/api/v1/git_helper/project_info/{project_id}": {
+      "get": {
+        "tags": ["Git"],
+        "summary": "Git project detail by repository ID",
+        "operationId": "gitProjectDetails",
+        "parameters": [
+          {
+            "name": "project_id",
+            "in": "path",
+            "description": "Git repo project ID",
+            "required": true,
+            "schema": {
+              "type": "integer",
+              "format": "int64"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Git project details",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GitProjectDto"
+                }
+              }
+            }
+          },
+          "404": {
+            "description": "Project not found",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GeneralException"
+                }
+              }
+            }
+          },
+          "500": {
+            "description": "Service exception",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GeneralException"
+                }
+              }
+            }
+          },
+          "503": {
+            "description": "Git exception",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GeneralException"
+                }
+              }
+            }
+          }
+        }
+      }
+    },
     "/api/v1/deployments/{deployment_id}": {
       "get": {
         "tags": ["Deployments"],
@@ -2885,7 +3071,7 @@
           {
             "name": "query",
             "in": "query",
-            "description": "Search text (Search for IOC name, Git reference, Created by)",
+            "description": "Search text (Search for IOC name, Created by)",
             "required": false,
             "schema": {
               "type": "string"
@@ -2921,9 +3107,9 @@
             }
           },
           {
-            "name": "host_csentry_id",
+            "name": "host_id",
             "in": "query",
-            "description": "CSEntry ID for the host",
+            "description": "Host ID for the host",
             "required": false,
             "schema": {
               "type": "string"
@@ -3481,11 +3667,10 @@
       "Host": {
         "type": "object",
         "properties": {
-          "csEntryId": {
-            "type": "integer",
-            "format": "int64"
+          "hostId": {
+            "type": "string"
           },
-          "csEntryIdValid": {
+          "externalIdValid": {
             "type": "boolean"
           },
           "fqdn": {
@@ -3502,9 +3687,8 @@
       "UpdateHostRequest": {
         "type": "object",
         "properties": {
-          "hostCSEntryId": {
-            "type": "integer",
-            "format": "int64"
+          "hostId": {
+            "type": "string"
           }
         },
         "description": "IOC to update"
@@ -3564,6 +3748,56 @@
           }
         }
       },
+      "HostMigrationResult": {
+        "type": "object",
+        "properties": {
+          "csentryID": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "lastKnownHostName": {
+            "type": "string"
+          },
+          "netBoxId": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "log": {
+            "type": "string"
+          }
+        }
+      },
+      "NetBoxMigrationResponse": {
+        "type": "object",
+        "properties": {
+          "hostsRegisteredInDatabase": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "hostsFoundInCSEntry": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "hostsFoundInNetBox": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "failedDueToServiceErrorInCSEntry": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "failedDueToServiceErrorInNetBox": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "result": {
+            "type": "array",
+            "items": {
+              "$ref": "#/components/schemas/HostMigrationResult"
+            }
+          }
+        }
+      },
       "CreateIoc": {
         "type": "object",
         "properties": {
@@ -3580,9 +3814,8 @@
       "DeploymentHostInfo": {
         "type": "object",
         "properties": {
-          "externalHostId": {
-            "type": "integer",
-            "format": "int64"
+          "hostId": {
+            "type": "string"
           },
           "hostName": {
             "type": "string"
@@ -3613,6 +3846,10 @@
             "type": "string",
             "format": "date-time"
           },
+          "finishedAt": {
+            "type": "string",
+            "format": "date-time"
+          },
           "type": {
             "type": "string",
             "enum": ["DEPLOY", "UNDEPLOY", "START", "STOP"]
@@ -3650,12 +3887,45 @@
           "sourceVersion": {
             "type": "string"
           },
-          "hostCSEntryId": {
+          "hostId": {
+            "type": "string"
+          }
+        },
+        "description": "IOC to update"
+      },
+      "AwxJobMeta": {
+        "type": "object",
+        "properties": {
+          "id": {
             "type": "integer",
             "format": "int64"
+          },
+          "started": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "finished": {
+            "type": "string",
+            "format": "date-time"
+          },
+          "status": {
+            "type": "string",
+            "enum": [
+              "UNKNOWN",
+              "CREATED",
+              "QUEUED_BY_BACKEND",
+              "new",
+              "pending",
+              "waiting",
+              "running",
+              "failed",
+              "canceled",
+              "error",
+              "successful"
+            ]
           }
         },
-        "description": "IOC to update"
+        "description": "Job to update"
       },
       "LoginResponse": {
         "type": "object",
@@ -3761,11 +4031,9 @@
               "HOSTS_REGISTERED",
               "HOSTS_WITH_IOCS",
               "HOSTS_REACHABLE",
-              "HOSTS_WITHOUT_ISSUE",
               "IOCS_REGISTERED",
               "IOCS_DEPLOYED",
-              "IOCS_RUNNING",
-              "IOCS_RUNNING_WITHOUT_ISSUE"
+              "IOCS_RUNNING"
             ]
           }
         }
@@ -3903,15 +4171,31 @@
           "iocName": {
             "type": "string"
           },
+          "iocId": {
+            "type": "integer",
+            "format": "int64"
+          },
           "hostName": {
             "type": "string"
           },
+          "hostId": {
+            "type": "string"
+          },
           "pvStatus": {
             "type": "string",
             "enum": ["ACTIVE", "INACTIVE"]
           },
           "iocVersion": {
             "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "recordType": {
+            "type": "string"
+          },
+          "alias": {
+            "type": "string"
           }
         }
       },
@@ -3924,9 +4208,16 @@
           "iocName": {
             "type": "string"
           },
+          "iocId": {
+            "type": "integer",
+            "format": "int64"
+          },
           "hostName": {
             "type": "string"
           },
+          "hostId": {
+            "type": "string"
+          },
           "pvStatus": {
             "type": "string",
             "enum": ["ACTIVE", "INACTIVE"]
@@ -3934,13 +4225,14 @@
           "iocVersion": {
             "type": "string"
           },
-          "iocId": {
-            "type": "integer",
-            "format": "int64"
+          "description": {
+            "type": "string"
           },
-          "hostCSentryId": {
-            "type": "integer",
-            "format": "int64"
+          "recordType": {
+            "type": "string"
+          },
+          "alias": {
+            "type": "string"
           },
           "properties": {
             "type": "object",
@@ -4118,7 +4410,7 @@
           }
         }
       },
-      "HostInfo": {
+      "HostInfoWithId": {
         "type": "object",
         "properties": {
           "id": {
@@ -4142,112 +4434,20 @@
           },
           "deviceType": {
             "type": "string"
-          }
-        }
-      },
-      "HostInfoWithStatus": {
-        "type": "object",
-        "properties": {
-          "csEntryHost": {
-            "$ref": "#/components/schemas/HostInfo"
           },
-          "status": {
-            "type": "string",
-            "enum": ["AVAILABLE", "UNREACHABLE"]
-          },
-          "alertSeverity": {
-            "type": "string",
-            "enum": ["ERROR", "WARNING", "INFO"]
-          },
-          "iocDeployed": {
-            "type": "boolean"
-          }
-        }
-      },
-      "PagedCSEntryHostResponse": {
-        "type": "object",
-        "properties": {
-          "totalCount": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "listSize": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "pageNumber": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "limit": {
-            "type": "integer",
-            "format": "int32"
-          },
-          "csEntryHosts": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/HostInfoWithStatus"
-            }
-          }
-        }
-      },
-      "CSEntryHost": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "integer",
-            "format": "int64"
-          },
-          "fqdn": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "scope": {
+          "hostId": {
             "type": "string"
           },
-          "description": {
-            "type": "string"
-          },
-          "user": {
-            "type": "string"
-          },
-          "interfaces": {
-            "type": "array",
-            "items": {
-              "$ref": "#/components/schemas/CSEntryInterface"
-            }
-          },
-          "is_ioc": {
+          "vm": {
             "type": "boolean"
-          },
-          "device_type": {
-            "type": "string"
-          },
-          "created_at": {
-            "type": "string",
-            "format": "date-time"
-          },
-          "ansible_vars": {
-            "type": "object",
-            "additionalProperties": {
-              "type": "object"
-            }
-          },
-          "ansible_groups": {
-            "type": "array",
-            "items": {
-              "type": "string"
-            }
           }
         }
       },
-      "CSEntryHostWithStatus": {
+      "NetBoxHostWithStatus": {
         "type": "object",
         "properties": {
-          "csEntryHost": {
-            "$ref": "#/components/schemas/CSEntryHost"
+          "hostInfo": {
+            "$ref": "#/components/schemas/HostInfoWithId"
           },
           "assigned": {
             "type": "boolean"
@@ -4264,39 +4464,30 @@
           }
         }
       },
-      "CSEntryInterface": {
+      "PagedNetBoxHostResponse": {
         "type": "object",
         "properties": {
-          "id": {
+          "totalCount": {
             "type": "integer",
             "format": "int64"
           },
-          "name": {
-            "type": "string"
-          },
-          "network": {
-            "type": "string"
-          },
-          "domain": {
-            "type": "string"
-          },
-          "ip": {
-            "type": "string"
+          "listSize": {
+            "type": "integer",
+            "format": "int32"
           },
-          "mac": {
-            "type": "string"
+          "pageNumber": {
+            "type": "integer",
+            "format": "int32"
           },
-          "host": {
-            "type": "string"
+          "limit": {
+            "type": "integer",
+            "format": "int32"
           },
-          "cnames": {
+          "netBoxHosts": {
             "type": "array",
             "items": {
-              "type": "string"
+              "$ref": "#/components/schemas/NetBoxHostWithStatus"
             }
-          },
-          "is_main": {
-            "type": "boolean"
           }
         }
       },
@@ -4342,6 +4533,9 @@
           },
           "network": {
             "type": "string"
+          },
+          "vm": {
+            "type": "boolean"
           }
         }
       },
@@ -4404,6 +4598,24 @@
           }
         }
       },
+      "GitProjectDto": {
+        "type": "object",
+        "properties": {
+          "id": {
+            "type": "integer",
+            "format": "int64"
+          },
+          "name": {
+            "type": "string"
+          },
+          "description": {
+            "type": "string"
+          },
+          "projectUrl": {
+            "type": "string"
+          }
+        }
+      },
       "DeploymentInfoDetails": {
         "type": "object",
         "properties": {
@@ -4474,11 +4686,10 @@
       "HostWithFqdn": {
         "type": "object",
         "properties": {
-          "csEntryId": {
-            "type": "integer",
-            "format": "int64"
+          "hostId": {
+            "type": "string"
           },
-          "csEntryIdValid": {
+          "externalIdValid": {
             "type": "boolean"
           },
           "fqdn": {
@@ -4531,6 +4742,10 @@
             "type": "string",
             "format": "date-time"
           },
+          "finishedAt": {
+            "type": "string",
+            "format": "date-time"
+          },
           "type": {
             "type": "string",
             "enum": ["DEPLOY", "UNDEPLOY", "START", "STOP"]
diff --git a/src/mocks/mockAPI.js b/src/mocks/mockAPI.js
index cfd07411..f1f5dfe2 100644
--- a/src/mocks/mockAPI.js
+++ b/src/mocks/mockAPI.js
@@ -126,6 +126,11 @@ function getIOC(req) {
   return { body, status };
 }
 
+function findAllRecords(req) {
+  const body = require("./fixtures/RecordResponse.json");
+  return { body };
+}
+
 function getDeployment(req) {
   console.debug(req);
   const params = getParameters(req, "/deployments/:id");
@@ -174,17 +179,17 @@ function getCommandList(req) {
   return { body };
 }
 
-function getCSEntryHostWithStatus(req) {
-  const params = getParameters(req, "/hosts/:id/with_status");
-  const data = require("./fixtures/CSEntryHostWithStatus.json");
-  const body = data.find((x) => x.csEntryHost.id === Number(params.id));
+function findHostWithStatusById(req) {
+  const params = getParameters(req, "/hosts/:host_id/with_status");
+  const data = require("./fixtures/NetBoxHostWithStatus.json");
+  const body = data.find((x) => x.netBoxHost.hostId === params.host_id);
   const status = body ? 200 : 404;
   return { body, status };
 }
 
 function listHosts(req) {
   const data = require("./fixtures/Hosts.json");
-  const body = withMockPagination({ req, data, key: "csEntryHosts" });
+  const body = withMockPagination({ req, data, key: "netBoxHosts" });
   return { body };
 }
 
@@ -290,7 +295,7 @@ const mockAPI = {
     fetchOperation
   },
   hosts: {
-    getCSEntryHostWithStatus,
+    findHostWithStatusById,
     listHosts
   },
   git_helper: {
@@ -312,6 +317,9 @@ const mockAPI = {
   },
   naming: {
     fetchIOCByName
+  },
+  records: {
+    findAllRecords
   }
 };
 
@@ -356,6 +364,9 @@ export const apiHandlers = [
   makeHandler("POST", qRegExp(".*/iocs"), mockAPI.iocs.createIoc),
   makeHandler("GET", qRegExp(".*/iocs/[0-9]+"), mockAPI.iocs.getIOC),
 
+  // records
+  makeHandler("GET", qRegExp(".*/records"), mockAPI.records.findAllRecords),
+
   // git helper
   makeHandler(
     "GET",
@@ -414,8 +425,8 @@ export const apiHandlers = [
   makeHandler("GET", qRegExp(".*/hosts"), mockAPI.hosts.listHosts),
   makeHandler(
     "GET",
-    qRegExp(".*/hosts/[0-9]+/with_status"),
-    mockAPI.hosts.getCSEntryHostWithStatus
+    qRegExp(".*/hosts/[A-Za-z0-9+/]+/with_status"),
+    mockAPI.hosts.findHostWithStatusById
   ),
 
   // monitoring
diff --git a/src/stories/components/common/host/HostTable.stories.js b/src/stories/components/common/host/HostTable.stories.js
index b7a59361..102ada93 100644
--- a/src/stories/components/common/host/HostTable.stories.js
+++ b/src/stories/components/common/host/HostTable.stories.js
@@ -1,6 +1,6 @@
 import React from "react";
 import { Container } from "@mui/material";
-import hosts from "../../../../mocks/fixtures/PagedCSEntryHostResponse.json";
+import hosts from "../../../../mocks/fixtures/PagedNetBoxHostResponse.json";
 import { HostTable } from "../../../../components/host/HostTable";
 import { RouterHarness } from "../../../../mocks/AppHarness";
 import { hideStorybookControls } from "../../../utils/common-args";
@@ -51,7 +51,7 @@ export const Populated = (args) => <Template {...args} />;
 Populated.args = {
   ...Empty.args,
   totalCount: hosts.totalCount,
-  hosts: hosts.csEntryHosts
+  hosts: hosts.netBoxHosts
 };
 
 Populated.argTypes = {
diff --git a/src/views/help/HelpView.js b/src/views/help/HelpView.js
index ab89777f..25fa86d7 100644
--- a/src/views/help/HelpView.js
+++ b/src/views/help/HelpView.js
@@ -34,7 +34,7 @@ export function HelpView() {
               >
                 not
               </Typography>{" "}
-              set up your host (and OS) - this needs to be done in CSEntry.
+              set up your host (and OS) - this needs to be done in NetBox.
             </Typography>
           </Stack>
         }
diff --git a/src/views/host/HostDetailsAccessControl.js b/src/views/host/HostDetailsAccessControl.js
index 06d7b011..e2be0a59 100644
--- a/src/views/host/HostDetailsAccessControl.js
+++ b/src/views/host/HostDetailsAccessControl.js
@@ -10,7 +10,7 @@ export function HostDetailsAccessControl() {
   return (
     <RootPaper data-testid="host-details-container">
       <AccessControl allowedRoles={[]}>
-        <HostDetailsContainer id={id} />
+        <HostDetailsContainer hostId={id} />
       </AccessControl>
     </RootPaper>
   );
diff --git a/src/views/host/HostDetailsContainer.js b/src/views/host/HostDetailsContainer.js
index cb30fd57..d6dba11d 100644
--- a/src/views/host/HostDetailsContainer.js
+++ b/src/views/host/HostDetailsContainer.js
@@ -6,19 +6,19 @@ import NotFoundView from "../../components/navigation/NotFoundView/NotFoundView"
 import { apiContext } from "../../api/DeployApi";
 import { useAPIMethod } from "@ess-ics/ce-ui-common";
 
-export function HostDetailsContainer({ id }) {
+export function HostDetailsContainer({ hostId }) {
   const [error, setError] = useState(null);
   const client = useContext(apiContext);
 
   const params = useMemo(
     () => ({
-      host_csentry_id: id
+      host_id: hostId
     }),
-    [id]
+    [hostId]
   );
 
   const { value: host, error: fetchError } = useAPIMethod({
-    fcn: client.apis.Hosts.findHostById,
+    fcn: client.apis.Hosts.findHostWithStatusById,
     params
   });
 
@@ -35,7 +35,7 @@ export function HostDetailsContainer({ id }) {
       ) : host ? (
         <HostDetailsView
           host={host}
-          id={id}
+          hostId={hostId}
         />
       ) : (
         <LinearProgress color="primary" />
diff --git a/src/views/host/HostDetailsView.js b/src/views/host/HostDetailsView.js
index 7410c7dc..cb032920 100644
--- a/src/views/host/HostDetailsView.js
+++ b/src/views/host/HostDetailsView.js
@@ -1,11 +1,5 @@
 import React, { useEffect, useCallback, useContext, useMemo } from "react";
-import {
-  Box,
-  IconButton,
-  Typography,
-  Link as MuiLink,
-  Stack
-} from "@mui/material";
+import { Box, IconButton, Typography, Stack } from "@mui/material";
 import ArrowBackIcon from "@mui/icons-material/ArrowBack";
 import { HostBadge } from "../../components/host/HostBadge";
 import {
@@ -17,7 +11,7 @@ import {
   usePagination
 } from "@ess-ics/ce-ui-common";
 import { LokiPanel } from "../../components/common/Loki/LokiPanel";
-import { useNavigate, Link as ReactRouterLink } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import {
   applicationTitle,
   initRequestParams
@@ -35,11 +29,11 @@ import {
   ExternalLinkContents
 } from "../../components/common/Link";
 
-export function HostDetailsView({ id, host }) {
+export function HostDetailsView({ hostId, host }) {
   const { setTitle } = useContext(GlobalAppBarContext);
   useEffect(() => {
-    if (host && host.csEntryHost) {
-      setTitle(applicationTitle("Host Details: " + host.csEntryHost.name));
+    if (host && host.netBoxHost) {
+      setTitle(applicationTitle("Host Details: " + host.netBoxHost.name));
     }
   }, [host, setTitle]);
 
@@ -119,66 +113,19 @@ export function HostDetailsView({ id, host }) {
   useEffect(() => {
     let requestParams = initRequestParams(urlPagination, null);
 
-    requestParams.host_csentry_id = id;
+    requestParams.host_id = hostId;
 
     getIocs(requestParams);
 
     return () => {
       abortGetIocs();
     };
-  }, [getIocs, urlPagination, id, abortGetIocs]);
-
-  function listToString(list) {
-    if (list) {
-      if (Array.isArray(list)) {
-        return list.join(", ");
-      }
-      return list;
-    }
-
-    return "";
-  }
-
-  function renderVmOwners(owners) {
-    if (owners && owners.length > 0) {
-      return (
-        <Stack
-          direction="row"
-          flexWrap="wrap"
-          divider={<Typography component="span">,&nbsp;</Typography>}
-        >
-          {owners.map((username) => (
-            <MuiLink
-              component={ReactRouterLink}
-              to={`/user/${username}`}
-              underline="hover"
-              key={username}
-            >
-              {username}
-            </MuiLink>
-          ))}
-        </Stack>
-      );
-    } else {
-      return "---";
-    }
-  }
+  }, [getIocs, urlPagination, hostId, abortGetIocs]);
 
   const renderHost = {
-    "registered by": (
-      <MuiLink
-        component={ReactRouterLink}
-        to={`/user/${host?.csEntryHost?.user}`}
-        underline="hover"
-      >
-        {host?.csEntryHost?.user}
-      </MuiLink>
-    ),
-    "device type": host?.csEntryHost?.device_type,
-    description: host?.csEntryHost?.description,
-    scope: host?.csEntryHost?.scope,
-    "vm owner": renderVmOwners(host?.csEntryHost?.ansible_vars?.vm_owner),
-    "ansible groups": listToString(host?.csEntryHost?.ansible_groups)
+    "device type": host?.netBoxHost?.deviceType,
+    description: host?.netBoxHost?.description,
+    scope: host?.netBoxHost?.scope
   };
 
   const handleClick = (event) => {
@@ -251,21 +198,27 @@ export function HostDetailsView({ id, host }) {
         obj={{
           "Host Configuration": (
             <ExternalLink
-              href={`https://csentry.esss.lu.se/network/hosts/view/${host?.csEntryHost.name}`}
+              href={
+                host?.netBoxHost.vm
+                  ? `${window.NETBOX_ADDRESS}/virtualization/virtual-machines/${host?.netBoxHost.id}`
+                  : `${window.NETBOX_ADDRESS}/dcim/devices/${host?.netBoxHost.id}`
+              }
               aria-label="Host Configuration"
             >
               <ExternalLinkContents>
-                {`https://csentry.esss.lu.se/network/hosts/view/${host?.csEntryHost?.name}`}
+                {host?.netBoxHost.vm
+                  ? `${window.NETBOX_ADDRESS}/virtualization/virtual-machines/${host?.netBoxHost.id}`
+                  : `${window.NETBOX_ADDRESS}/dcim/devices/${host?.netBoxHost.id}`}
               </ExternalLinkContents>
             </ExternalLink>
           ),
           "Host Metrics": (
             <ExternalLink
-              href={`https://grafana.tn.esss.lu.se/d/5zJT23xWz/node-exporter-full?orgId=1&var-node=${host?.csEntryHost.fqdn}`}
+              href={`https://grafana.tn.esss.lu.se/d/5zJT23xWz/node-exporter-full?orgId=1&var-node=${host?.netBoxHost.fqdn}`}
               aria-label="Host Metrics"
             >
               <ExternalLinkContents>
-                {`https://grafana.tn.esss.lu.se/d/5zJT23xWz/node-exporter-full?orgId=1&var-node=${host?.csEntryHost.fqdn}`}
+                {`https://grafana.tn.esss.lu.se/d/5zJT23xWz/node-exporter-full?orgId=1&var-node=${host?.netBoxHost.fqdn}`}
               </ExternalLinkContents>
             </ExternalLink>
           )
diff --git a/src/views/host/HostListView.js b/src/views/host/HostListView.js
index 63afabec..8803a63d 100644
--- a/src/views/host/HostListView.js
+++ b/src/views/host/HostListView.js
@@ -15,8 +15,7 @@ import {
 } from "@ess-ics/ce-ui-common";
 import {
   applicationTitle,
-  initRequestParams,
-  transformHostQuery
+  initRequestParams
 } from "../../components/common/Helper";
 import { SearchBar } from "../../components/common/SearchBar/SearchBar";
 import useUrlState from "@ahooksjs/use-url-state";
@@ -125,7 +124,7 @@ export function HostListView() {
   useEffect(() => {
     let requestParams = initRequestParams(
       pagination,
-      transformHostQuery(deserialize(urlState.query))
+      deserialize(urlState.query)
     );
     requestParams.filter = hostFilter;
     getHosts(requestParams);
@@ -157,7 +156,7 @@ export function HostListView() {
         loading={loading}
       >
         <HostTable
-          hosts={hosts?.csEntryHosts ?? []}
+          hosts={hosts?.netBoxHosts ?? []}
           loading={loading}
           pagination={pagination}
           onPage={onPage}
diff --git a/src/views/records/RecordDetailsView.js b/src/views/records/RecordDetailsView.js
index 6a0fceba..5ac4380f 100644
--- a/src/views/records/RecordDetailsView.js
+++ b/src/views/records/RecordDetailsView.js
@@ -103,11 +103,11 @@ export function RecordDetailsView() {
       Description: record?.description,
       Version: record?.iocVersion,
       "Record type": record.recordType,
-      Host: record.hostCSentryId ? (
+      Host: record.hostId ? (
         <Typography>
           <MuiLink
             component={ReactRouterLink}
-            to={`/hosts/${record.hostCSentryId}`}
+            to={`/hosts/${record.hostId}`}
             underline="hover"
           >
             {record?.hostName}
-- 
GitLab