From 98c8ab1334327cd1c96a4ce3474563dd68df7f51 Mon Sep 17 00:00:00 2001
From: Darren Satkunas <dsatkuna@akamai.com>
Date: Thu, 11 Jan 2024 06:48:12 -0800
Subject: [PATCH 1/2] move DNS from interfaces to layer2networks

---
 .../networks/interfaces/_components/TheForm.vue             | 2 --
 .../Configuration/networks/interfaces/_components/index.js  | 1 -
 .../networks/layer2Networks/_components/TheForm.vue         | 6 ++++++
 .../networks/layer2Networks/_components/index.js            | 1 +
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/html/pfappserver/root/src/views/Configuration/networks/interfaces/_components/TheForm.vue b/html/pfappserver/root/src/views/Configuration/networks/interfaces/_components/TheForm.vue
index e15fafd09f39..40414f2724fa 100644
--- a/html/pfappserver/root/src/views/Configuration/networks/interfaces/_components/TheForm.vue
+++ b/html/pfappserver/root/src/views/Configuration/networks/interfaces/_components/TheForm.vue
@@ -135,7 +135,6 @@ import {
   FormGroupAdditionalListeneningDaemons,
   FormGroupCoa,
   FormGroupDhcpdEnabled,
-  FormGroupDns,
   FormGroupHighAvailability,
   FormGroupIdentifier,
   FormGroupIpAddress,
@@ -157,7 +156,6 @@ const components = {
   FormGroupAdditionalListeneningDaemons,
   FormGroupCoa,
   FormGroupDhcpdEnabled,
-  FormGroupDns,
   FormGroupHighAvailability,
   FormGroupIdentifier,
   FormGroupIpAddress,
diff --git a/html/pfappserver/root/src/views/Configuration/networks/interfaces/_components/index.js b/html/pfappserver/root/src/views/Configuration/networks/interfaces/_components/index.js
index e7e190e6414c..65b736d70585 100644
--- a/html/pfappserver/root/src/views/Configuration/networks/interfaces/_components/index.js
+++ b/html/pfappserver/root/src/views/Configuration/networks/interfaces/_components/index.js
@@ -18,7 +18,6 @@ export {
   BaseFormGroupChosenMultiple               as FormGroupAdditionalListeneningDaemons,
   BaseFormGroupSwitch                       as FormGroupCoa,
   BaseFormGroupSwitch                       as FormGroupDhcpdEnabled,
-  BaseFormGroupInput                        as FormGroupDns,
   BaseFormGroupSwitch                       as FormGroupHighAvailability,
   BaseFormGroupInput                        as FormGroupIdentifier,
   BaseFormGroupInput                        as FormGroupIpAddress,
diff --git a/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/TheForm.vue b/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/TheForm.vue
index 67f9a78c015b..d80e2146d05f 100644
--- a/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/TheForm.vue
+++ b/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/TheForm.vue
@@ -56,6 +56,11 @@
                             :text="$i18n.t('List like 00:11:22:33:44:55:192.168.0.12,11:22:33:44:55:66:192.168.0.13.')"
     />
 
+    <form-group-dns namespace="dns"
+      :column-label="$i18n.t('DNS')"
+      :text="$i18n.t('The DNS server(s) of your network. (comma limited)')"
+    />
+
     <form-group-portal-fqdn namespace="portal_fqdn"
                             :disabled="isFakeMac"
                             :column-label="$i18n.t('Portal FQDN')"
@@ -100,6 +105,7 @@ const components = {
   FormGroupDhcpMaxLeaseTime,
   FormGroupDhcpEnd,
   FormGroupDhcpStart,
+  FormGroupDns,
   FormGroupIdentifier,
   FormGroupIpAssigned,
   FormGroupIpReserved,
diff --git a/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/index.js b/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/index.js
index 118ff80600f3..7ac5420ba143 100644
--- a/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/index.js
+++ b/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/index.js
@@ -21,6 +21,7 @@ export {
   BaseFormGroupInputNumber            as FormGroupDhcpMaxLeaseTime,
   BaseFormGroupInput                  as FormGroupDhcpEnd,
   BaseFormGroupInput                  as FormGroupDhcpStart,
+  BaseFormGroupInput                  as FormGroupDns,
   BaseFormGroupInput                  as FormGroupIdentifier,
   BaseFormGroupTextarea               as FormGroupIpAssigned,
   BaseFormGroupTextarea               as FormGroupIpReserved,

From 15620ab9e3c464b5f8ee9b854fade7ba0d165dfb Mon Sep 17 00:00:00 2001
From: Darren Satkunas <dsatkuna@akamai.com>
Date: Thu, 11 Jan 2024 06:53:49 -0800
Subject: [PATCH 2/2] add missing import

---
 .../networks/layer2Networks/_components/TheForm.vue          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/TheForm.vue b/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/TheForm.vue
index d80e2146d05f..b97c882d18e2 100644
--- a/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/TheForm.vue
+++ b/html/pfappserver/root/src/views/Configuration/networks/layer2Networks/_components/TheForm.vue
@@ -57,8 +57,8 @@
     />
 
     <form-group-dns namespace="dns"
-      :column-label="$i18n.t('DNS')"
-      :text="$i18n.t('The DNS server(s) of your network. (comma limited)')"
+                    :column-label="$i18n.t('DNS')"
+                    :text="$i18n.t('The DNS server(s) of your network. (comma limited)')"
     />
 
     <form-group-portal-fqdn namespace="portal_fqdn"
@@ -86,6 +86,7 @@ import {
   FormGroupDhcpEnd,
   FormGroupDhcpMaxLeaseTime,
   FormGroupDhcpStart,
+  FormGroupDns,
   FormGroupIdentifier,
   FormGroupIpAssigned,
   FormGroupIpReserved,