From c19341bec9905e4117295108b1ddb52c68bcb938 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Tue, 11 Nov 2025 11:46:43 +0800
Subject: [PATCH] feat: support for HotPlugNICs from Kubevirt (#582) (#594)

* refactor: rename hotplug volume
* feat: add hotplug NIC
* feat: add hot unplug
* refactor: rename NIC
* feat: get latest status
* feat: disable not ready options
* feat: filter out system networks
* refactor: update wordings

---------


(cherry picked from commit f9bff21e840885a120679864a0ef312163bd48a7)

Signed-off-by: Yi-Ya Chen <yiya.chen@suse.com>
Co-authored-by: Yiya Chen <yiya.chen@suse.com>
---
 pkg/harvester/config/feature-flags.js         |   3 +-
 .../kubevirt.io.virtualmachine/index.vue      |   2 +
 .../dialog/HarvesterAddHotplugNic.vue         | 212 ++++++++++++++++++
 ...vue => HarvesterAddHotplugVolumeModal.vue} |   6 +-
 ...nplugVolume.vue => HarvesterHotUnplug.vue} |  50 ++++-
 .../VirtualMachineNetwork/index.vue           | 117 +++++++---
 .../VirtualMachineVolume/index.vue            | 115 +++++-----
 pkg/harvester/l10n/en-us.yaml                 |  30 ++-
 ...cni.cncf.io.networkattachmentdefinition.js |  10 +
 .../models/kubevirt.io.virtualmachine.js      |  41 +++-
 10 files changed, 471 insertions(+), 115 deletions(-)
 create mode 100644 pkg/harvester/dialog/HarvesterAddHotplugNic.vue
 rename pkg/harvester/dialog/{HarvesterAddHotplugModal.vue => HarvesterAddHotplugVolumeModal.vue} (94%)
 rename pkg/harvester/dialog/{HarvesterUnplugVolume.vue => HarvesterHotUnplug.vue} (63%)

diff --git a/pkg/harvester/config/feature-flags.js b/pkg/harvester/config/feature-flags.js
index 906e6f0f..e50033ad 100644
--- a/pkg/harvester/config/feature-flags.js
+++ b/pkg/harvester/config/feature-flags.js
@@ -53,7 +53,8 @@ const FEATURE_FLAGS = {
     'vmMachineTypeAuto',
     'lhV2VolExpansion',
     'l2VlanTrunkMode',
-    'kubevirtMigration'
+    'kubevirtMigration',
+    'hotplugNic'
   ]
 };
 
diff --git a/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue b/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
index de924ebf..9f97bf4f 100644
--- a/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
+++ b/pkg/harvester/detail/kubevirt.io.virtualmachine/index.vue
@@ -213,6 +213,7 @@ export default {
         const diskRows = this.getDiskRows(neu);
 
         this['diskRows'] = diskRows;
+        this['networkRows'] = this.getNetworkRows(neu, { fromTemplate: false, init: false });
       },
       deep: true
     }
@@ -265,6 +266,7 @@ export default {
         <Network
           v-model:value="networkRows"
           mode="view"
+          :vm="value"
         />
       </Tab>
 
diff --git a/pkg/harvester/dialog/HarvesterAddHotplugNic.vue b/pkg/harvester/dialog/HarvesterAddHotplugNic.vue
new file mode 100644
index 00000000..aede3404
--- /dev/null
+++ b/pkg/harvester/dialog/HarvesterAddHotplugNic.vue
@@ -0,0 +1,212 @@
+<script>
+import { exceptionToErrorsArray } from '@shell/utils/error';
+import { mapGetters } from 'vuex';
+import { NETWORK_ATTACHMENT } from '@shell/config/types';
+import { Card } from '@components/Card';
+import { Banner } from '@components/Banner';
+import AsyncButton from '@shell/components/AsyncButton';
+import { LabeledInput } from '@components/Form/LabeledInput';
+import LabeledSelect from '@shell/components/form/LabeledSelect';
+import { HCI as HCI_ANNOTATIONS } from '@pkg/harvester/config/labels-annotations';
+import { NETWORK_TYPE } from '../config/types';
+
+export default {
+  name: 'AddHotplugNic',
+
+  emits: ['close'],
+
+  components: {
+    AsyncButton,
+    Card,
+    LabeledInput,
+    LabeledSelect,
+    Banner
+  },
+
+  props: {
+    resources: {
+      type:     Array,
+      required: true
+    }
+  },
+
+  async fetch() {
+    try {
+      this.allVMNetworks = await this.$store.dispatch('harvester/findAll', { type: NETWORK_ATTACHMENT });
+    } catch (err) {
+      this.errors = exceptionToErrorsArray(err);
+      this.allVMNetworks = [];
+    }
+  },
+
+  data() {
+    return {
+      interfaceName: '',
+      networkName:   '',
+      macAddress:    '',
+      allVMNetworks: [],
+      errors:        [],
+    };
+  },
+
+  computed: {
+    ...mapGetters({ t: 'i18n/t' }),
+
+    actionResource() {
+      return this.resources?.[0];
+    },
+
+    isFormValid() {
+      return this.interfaceName !== '' && this.networkName !== '';
+    },
+
+    vmNetworksOption() {
+      return this.allVMNetworks
+        .filter((network) => {
+          const labels = network.metadata?.labels || {};
+          const type = labels[HCI_ANNOTATIONS.NETWORK_TYPE];
+
+          const isValidType = [
+            NETWORK_TYPE.L2VLAN,
+            NETWORK_TYPE.UNTAGGED,
+            NETWORK_TYPE.L2TRUNK_VLAN,
+          ].includes(type);
+
+          return isValidType && !network.isSystem;
+        })
+        .map((network) => {
+          const label = network.isNotReady ? `${ network.id } (${ this.t('generic.notReady') })` : network.id;
+
+          return ({
+            label,
+            value:    network.id || '',
+            disabled: network.isNotReady,
+          });
+        });
+    }
+  },
+
+  methods: {
+    close() {
+      this.interfaceName = '';
+      this.networkName = '';
+      this.macAddress = '';
+      this.errors = [];
+      this.$emit('close');
+    },
+
+    async save(buttonCb) {
+      if (!this.actionResource) {
+        buttonCb(false);
+
+        return;
+      }
+
+      const payload = {
+        interfaceName: this.interfaceName,
+        networkName:   this.networkName
+      };
+
+      if (this.macAddress) {
+        payload.macAddress = this.macAddress;
+      }
+
+      try {
+        const res = await this.actionResource.doAction('addNic', payload);
+
+        if ([200, 204].includes(res?._status)) {
+          this.$store.dispatch('growl/success', {
+            title:   this.t('generic.notification.title.succeed'),
+            message: this.t('harvester.modal.hotplugNic.success', {
+              interfaceName: this.interfaceName,
+              vm:            this.actionResource.nameDisplay
+            })
+          }, { root: true });
+
+          this.close();
+          buttonCb(true);
+        } else {
+          this.errors = exceptionToErrorsArray(res);
+          buttonCb(false);
+        }
+      } catch (err) {
+        this.errors = exceptionToErrorsArray(err);
+        buttonCb(false);
+      }
+    }
+  }
+};
+</script>
+
+<template>
+  <Card
+    ref="modal"
+    name="modal"
+    :show-highlight-border="false"
+  >
+    <template #title>
+      <h4
+        v-clean-html="t('harvester.modal.hotplugNic.title')"
+        class="text-default-text"
+      />
+    </template>
+
+    <template #body>
+      <LabeledInput
+        v-model:value="interfaceName"
+        :label="t('generic.name')"
+        required
+      />
+      <LabeledSelect
+        v-model:value="networkName"
+        class="mt-20"
+        :label="t('harvester.modal.hotplugNic.vmNetwork')"
+        :options="vmNetworksOption"
+        required
+      />
+      <LabeledInput
+        v-model:value="macAddress"
+        class="mt-20"
+        label-key="harvester.modal.hotplugNic.macAddress"
+        :tooltip="t('harvester.modal.hotplugNic.macAddressTooltip', _, true)"
+      />
+      <Banner
+        v-for="(err, i) in errors"
+        :key="i"
+        :label="err"
+        color="error"
+      />
+    </template>
+
+    <template #actions>
+      <div class="actions">
+        <div class="buttons">
+          <button
+            type="button"
+            class="btn role-secondary mr-10"
+            @click="close"
+          >
+            {{ t('generic.cancel') }}
+          </button>
+
+          <AsyncButton
+            mode="apply"
+            :disabled="!isFormValid"
+            @click="save"
+          />
+        </div>
+      </div>
+    </template>
+  </Card>
+</template>
+
+<style lang="scss" scoped>
+.actions {
+  width: 100%;
+}
+.buttons {
+  display: flex;
+  justify-content: flex-end;
+  width: 100%;
+}
+</style>
diff --git a/pkg/harvester/dialog/HarvesterAddHotplugModal.vue b/pkg/harvester/dialog/HarvesterAddHotplugVolumeModal.vue
similarity index 94%
rename from pkg/harvester/dialog/HarvesterAddHotplugModal.vue
rename to pkg/harvester/dialog/HarvesterAddHotplugVolumeModal.vue
index accf9394..14dcfb2d 100644
--- a/pkg/harvester/dialog/HarvesterAddHotplugModal.vue
+++ b/pkg/harvester/dialog/HarvesterAddHotplugVolumeModal.vue
@@ -11,7 +11,7 @@ import { LabeledInput } from '@components/Form/LabeledInput';
 import LabeledSelect from '@shell/components/form/LabeledSelect';
 
 export default {
-  name: 'HotplugModal',
+  name: 'HotplugVolumeModal',
 
   emits: ['close'],
 
@@ -90,7 +90,7 @@ export default {
           if (res._status === 200 || res._status === 204) {
             this.$store.dispatch('growl/success', {
               title:   this.t('generic.notification.title.succeed'),
-              message: this.t('harvester.modal.hotplug.success', { diskName: this.diskName, vm: this.actionResource.nameDisplay })
+              message: this.t('harvester.modal.hotplugVolume.success', { diskName: this.diskName, vm: this.actionResource.nameDisplay })
             }, { root: true });
 
             this.close();
@@ -122,7 +122,7 @@ export default {
   >
     <template #title>
       <h4
-        v-clean-html="t('harvester.modal.hotplug.title')"
+        v-clean-html="t('harvester.modal.hotplugVolume.title')"
         class="text-default-text"
       />
     </template>
diff --git a/pkg/harvester/dialog/HarvesterUnplugVolume.vue b/pkg/harvester/dialog/HarvesterHotUnplug.vue
similarity index 63%
rename from pkg/harvester/dialog/HarvesterUnplugVolume.vue
rename to pkg/harvester/dialog/HarvesterHotUnplug.vue
index dd72f8b8..cf3f0ea9 100644
--- a/pkg/harvester/dialog/HarvesterUnplugVolume.vue
+++ b/pkg/harvester/dialog/HarvesterHotUnplug.vue
@@ -1,13 +1,12 @@
 <script>
 import { mapState, mapGetters } from 'vuex';
-
 import { exceptionToErrorsArray } from '@shell/utils/error';
 import { Card } from '@components/Card';
 import { Banner } from '@components/Banner';
 import AsyncButton from '@shell/components/AsyncButton';
 
 export default {
-  name: 'HarvesterHotUnplugModal',
+  name: 'HarvesterHotUnplug',
 
   emits: ['close'],
 
@@ -35,8 +34,25 @@ export default {
     actionResource() {
       return this.resources[0];
     },
-    diskName() {
-      return this.modalData.diskName;
+
+    name() {
+      return this.modalData.name;
+    },
+
+    isVolume() {
+      return this.modalData.type === 'volume';
+    },
+
+    titleKey() {
+      return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.title' : 'harvester.virtualMachine.hotUnplug.detachNIC.title';
+    },
+
+    actionLabelKey() {
+      return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.actionLabel' : 'harvester.virtualMachine.hotUnplug.detachNIC.actionLabel';
+    },
+
+    successMessageKey() {
+      return this.isVolume ? 'harvester.virtualMachine.hotUnplug.detachVolume.success' : 'harvester.virtualMachine.hotUnplug.detachNIC.success';
     }
   },
 
@@ -47,14 +63,20 @@ export default {
 
     async save(buttonCb) {
       try {
-        const res = await this.actionResource.doAction('removeVolume', { diskName: this.diskName });
+        let res;
+
+        if (this.isVolume) {
+          res = await this.actionResource.doAction('removeVolume', { diskName: this.name });
+        } else {
+          res = await this.actionResource.doAction('removeNic', { interfaceName: this.name });
+        }
 
         if (res._status === 200 || res._status === 204) {
           this.$store.dispatch(
             'growl/success',
             {
               title:   this.t('generic.notification.title.succeed'),
-              message: this.t('harvester.modal.hotunplug.success', { name: this.diskName })
+              message: this.t(this.successMessageKey, { name: this.name })
             },
             { root: true }
           );
@@ -64,14 +86,14 @@ export default {
         } else {
           const error = [res?.data] || exceptionToErrorsArray(res);
 
-          this['errors'] = error;
+          this.errors = error;
           buttonCb(false);
         }
       } catch (err) {
         const error = err?.data || err;
         const message = exceptionToErrorsArray(error);
 
-        this['errors'] = message;
+        this.errors = message;
         buttonCb(false);
       }
     }
@@ -87,7 +109,7 @@ export default {
   >
     <template #title>
       <h4
-        v-clean-html="t('harvester.virtualMachine.unplug.title', { name: diskName })"
+        v-clean-html="t(titleKey, { name })"
         class="text-default-text"
       />
       <Banner
@@ -111,9 +133,9 @@ export default {
 
           <AsyncButton
             mode="apply"
-            :action-label="t('harvester.virtualMachine.unplug.actionLabel')"
-            :waiting-label="t('harvester.virtualMachine.unplug.actionLabel')"
-            :success-label="t('harvester.virtualMachine.unplug.actionLabel')"
+            :action-label="t(actionLabelKey)"
+            :waiting-label="t(actionLabelKey)"
+            :success-label="t(actionLabelKey)"
             @click="save"
           />
         </div>
@@ -132,4 +154,8 @@ export default {
   justify-content: flex-end;
   width: 100%;
 }
+
+::v-deep(.card-title) {
+  display: block;
+}
 </style>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineNetwork/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineNetwork/index.vue
index a87fd738..93f8db8f 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineNetwork/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineNetwork/index.vue
@@ -1,6 +1,5 @@
 <script>
 import InfoBox from '@shell/components/InfoBox';
-
 import { NETWORK_ATTACHMENT } from '@shell/config/types';
 import { sortBy } from '@shell/utils/sort';
 import { clone } from '@shell/utils/object';
@@ -14,6 +13,13 @@ export default {
   components: { InfoBox, Base },
 
   props: {
+    vm: {
+      type:    Object,
+      default: () => {
+        return {};
+      }
+    },
+
     mode: {
       type:    String,
       default: 'create'
@@ -32,10 +38,15 @@ export default {
     }
   },
 
+  async fetch() {
+    await this.fetchHotunplugData();
+  },
+
   data() {
     return {
-      rows:    this.addKeyId(clone(this.value)),
-      nameIdx: 1
+      nameIdx:            1,
+      rows:               this.addKeyId(clone(this.value)),
+      hotunpluggableNics: new Set(),
     };
   },
 
@@ -64,15 +75,57 @@ export default {
 
       return out;
     },
+
+    canCheckHotunplug() {
+      return !!this.vm?.actions?.findHotunpluggableNics;
+    },
+
+    vmState() {
+      return this.vm?.stateDisplay;
+    }
   },
 
   watch: {
     value(neu) {
-      this.rows = neu;
+      this.rows = this.mergeHotplugData(clone(neu));
     },
+
+    vmState(newState, oldState) {
+      if (newState !== oldState) {
+        this.fetchHotunplugData();
+      }
+    }
   },
 
   methods: {
+    async fetchHotunplugData() {
+      if (!this.canCheckHotunplug) {
+        this.rows = this.mergeHotplugData(clone(this.value));
+
+        return;
+      }
+
+      try {
+        const resp = await this.vm.doAction('findHotunpluggableNics');
+
+        this.hotunpluggableNics = new Set(resp?.interfaces || []);
+      } catch (e) {
+        // eslint-disable-next-line no-console
+        console.error('Failed to fetch hot-unpluggable NICs:', e);
+        this.hotunpluggableNics = new Set();
+      }
+
+      this.rows = this.mergeHotplugData(clone(this.value));
+    },
+
+    mergeHotplugData(networks) {
+      return (networks || []).map((network) => ({
+        ...network,
+        isHotunpluggable: this.hotunpluggableNics.has(network.name),
+        rowKeyId:         network.rowKeyId || randomStr(10)
+      }));
+    },
+
     add(type) {
       const name = this.generateName();
 
@@ -118,7 +171,11 @@ export default {
 
     update() {
       this.$emit('update:value', this.rows);
-    }
+    },
+
+    unplugNIC(network) {
+      this.vm.unplugNIC(network.name);
+    },
   }
 };
 </script>
@@ -129,17 +186,28 @@ export default {
       v-for="(row, i) in rows"
       :key="i"
     >
-      <button
-        v-if="!isView"
-        type="button"
-        class="role-link remove-vol"
-        @click="remove(row)"
-      >
-        <i class="icon icon-x" />
-      </button>
-
-      <h3> {{ t('harvester.virtualMachine.network.title') }} </h3>
-
+      <div class="box-title mb-10">
+        <h3>
+          {{ t('harvester.virtualMachine.network.title') }}
+        </h3>
+        <button
+          v-if="!isView"
+          type="button"
+          class="role-link btn btn-sm remove"
+          @click="remove(row)"
+        >
+          <i class="icon icon-x" />
+        </button>
+        <button
+          v-if="vm.hotplugNicFeatureEnabled && row.isHotunpluggable && isView"
+          type="button"
+          class="role-link btn btn-sm remove"
+          :disabled="!canCheckHotunplug"
+          @click="unplugNIC(row)"
+        >
+          {{ t('harvester.virtualMachine.hotUnplug.detachNIC.actionLabel') }}
+        </button>
+      </div>
       <Base
         v-model:value="rows[i]"
         :rows="rows"
@@ -162,16 +230,13 @@ export default {
 </template>
 
 <style lang='scss' scoped>
-.infoBox{
-  position: relative;
-}
+.box-title{
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 
-.remove-vol {
-  position: absolute;
-  top: 10px;
-  right: 16px;
-  padding:0px;
-  max-height: 28px;
-  min-height: 28px;
+  h3 {
+    margin-bottom: 0;
+  }
 }
 </style>
diff --git a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue
index 012cacd7..13c0221c 100644
--- a/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue
+++ b/pkg/harvester/edit/kubevirt.io.virtualmachine/VirtualMachineVolume/index.vue
@@ -303,55 +303,57 @@ export default {
         v-for="(volume, i) in rows"
         :key="volume.id"
       >
-        <InfoBox class="box">
-          <button
-            v-if="!isView"
-            type="button"
-            class="role-link btn btn-sm remove"
-            @click="removeVolume(volume)"
-          >
-            <i class="icon icon-x" />
-          </button>
-          <button
-            v-if="volume.hotpluggable && isView"
-            type="button"
-            class="role-link btn remove"
-            @click="unplugVolume(volume)"
-          >
-            {{ t('harvester.virtualMachine.unplug.detachVolume') }}
-          </button>
-          <h3>
-            <span
-              v-if="volume.to && isVirtualType"
-              class="title"
-            >
-              <router-link :to="volume.to">
-                {{ t('harvester.virtualMachine.volume.edit') }} {{ headerFor(volume.source) }}
-              </router-link>
-
-              <BadgeStateFormatter
-                v-if="volume.pvc"
-                class="ml-10 state"
-                :arbitrary="true"
-                :row="volume.pvc"
-                :value="volume.pvc.state"
-              />
-              <a
-                v-if="dev && !!volume.pvc && !!volume.pvc.resourceExternalLink"
-                v-clean-tooltip="t(volume.pvc.resourceExternalLink.tipsKey || 'generic.resourceExternalLinkTips')"
-                class="ml-5 resource-external"
-                rel="nofollow noopener noreferrer"
-                target="_blank"
-                :href="volume.pvc.resourceExternalLink.url"
+        <InfoBox>
+          <div class="box-title mb-10">
+            <h3>
+              <span
+                v-if="volume.to && isVirtualType"
+                class="title"
               >
-                <i class="icon icon-external-link" />
-              </a>
-            </span>
+                <router-link :to="volume.to">
+                  {{ t('harvester.virtualMachine.volume.edit') }} {{ headerFor(volume.source) }}
+                </router-link>
 
-            <span v-else>
-              {{ headerFor(volume.source, !!volume?.volumeBackups) }}
-            </span>
-          </h3>
+                <BadgeStateFormatter
+                  v-if="volume.pvc"
+                  class="ml-10 state"
+                  :arbitrary="true"
+                  :row="volume.pvc"
+                  :value="volume.pvc.state"
+                />
+                <a
+                  v-if="dev && !!volume.pvc && !!volume.pvc.resourceExternalLink"
+                  v-clean-tooltip="t(volume.pvc.resourceExternalLink.tipsKey || 'generic.resourceExternalLinkTips')"
+                  class="ml-5 resource-external"
+                  rel="nofollow noopener noreferrer"
+                  target="_blank"
+                  :href="volume.pvc.resourceExternalLink.url"
+                >
+                  <i class="icon icon-external-link" />
+                </a>
+              </span>
+
+              <span v-else>
+                {{ headerFor(volume.source, !!volume?.volumeBackups) }}
+              </span>
+            </h3>
+            <button
+              v-if="!isView"
+              type="button"
+              class="role-link btn btn-sm remove"
+              @click="removeVolume(volume)"
+            >
+              <i class="icon icon-x" />
+            </button>
+            <button
+              v-if="volume.hotpluggable && isView"
+              type="button"
+              class="role-link btn btn-sm remove"
+              @click="unplugVolume(volume)"
+            >
+              {{ t('harvester.virtualMachine.hotUnplug.detachVolume.actionLabel') }}
+            </button>
+          </div>
           <div>
             <component
               :is="componentFor(volume.source)"
@@ -495,25 +497,24 @@ export default {
 </template>
 
 <style lang='scss' scoped>
-  .box {
-    position: relative;
+  .box-title {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+
+    h3 {
+      margin-bottom: 0;
+    }
   }
 
   .title {
     display: flex;
+    align-items: center;
 
     .state {
       font-size: 16px;
     }
   }
-
-  .remove {
-    position: absolute;
-    top: 10px;
-    right: 10px;
-    padding: 0px;
-  }
-
   .bootOrder {
     display: flex;
     align-items: center;
diff --git a/pkg/harvester/l10n/en-us.yaml b/pkg/harvester/l10n/en-us.yaml
index a1f26eae..89881e1a 100644
--- a/pkg/harvester/l10n/en-us.yaml
+++ b/pkg/harvester/l10n/en-us.yaml
@@ -154,15 +154,19 @@ harvester:
       nodeTimeout:
         label: Node Collection Timeout
         tooltip: Minutes allowed for collecting logs/configurations on nodes.<br/>See docs support-bundle-node-collection-timeout for detail.
-    hotplug:
+    hotplugVolume:
       success: 'Volume { diskName } is mounted to the virtual machine { vm }.'
       title: Add Volume
+    hotplugNic:
+      success: 'The settings have been saved, but the network interface {interfaceName} will be attached only after the virtual machine is migrated.'
+      title: Add Network Interface
+      vmNetwork: Virtual Machine Network
+      macAddress: MAC Address
+      macAddressTooltip: If left blank, the MAC address will be automatically generated.
     cpuMemoryHotplug:
       success: 'CPU and Memory are updated to the virtual machine { vm }.'
       title: Edit CPU and Memory
       maxResourcesMessage: 'You can increase the CPU to maximum { maxCpu }C and memory to maximum { maxMemory }.'
-    hotunplug:
-      success: 'Volume { name } is detached successfully.'
     snapshot:
       title: Take Snapshot
       name: Name
@@ -226,7 +230,8 @@ harvester:
     disableCPUManager: Disable CPU Manager
     cordon: Cordon
     uncordon: Uncordon
-    addHotplug: Add Volume
+    addHotplugVolume: Add Volume
+    addHotplugNic: Hotplug Network Interface
     exportImage: Export Image
     viewlogs: View Logs
     cancelExpand: Cancel Expand
@@ -582,6 +587,16 @@ harvester:
       title: Enable CPU and memory hotplug
       tooltip: The default maximum CPU and maximum memory are {hotPlugTimes} times based on CPU and memory.
       restartVMMessage: Restart action is required for the virtual machine configuration change to take effect
+    hotUnplug:
+      actionLabel: Detach
+      detachVolume:
+        title: 'Are you sure that you want to detach volume {name}?'
+        actionLabel: Detach Volume
+        success: 'Volume { name } is detached successfully.'
+      detachNIC:
+        title: 'Are you sure that you want to detach network interface {name}?'
+        actionLabel: Detach Network Interface
+        success: 'The settings have been saved, but the network interface {name} will be detached only after the virtual machine is migrated.'
     instance:
       singleInstance:
       multipleInstance:
@@ -613,11 +628,6 @@ harvester:
       title: 'Select the volume you want to delete:'
       deleteAll: Delete All
       tips: "Warn: The snapshots of the virtual machine will be deleted with virtual machine and the snapshots of volume will be deleted with volume."
-    unplug:
-      title: 'Are you sure that you want to detach volume {name} ?'
-      actionLabel: Detach
-      detachVolume:
-        Detach Volume
     restartTip: |-
       {restart, select,
         true {Restart}
@@ -1695,7 +1705,7 @@ harvester:
     available: Available
     total: Total
     vGPUID: vGPU ID
-    goSriovGPU: 
+    goSriovGPU:
       prefix: Please enable the supported GPU devices in
       middle: SR-IOV GPU Devices
       suffix: page to manage the vGPU MIG configurations.
diff --git a/pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js b/pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js
index 83562481..086396ee 100644
--- a/pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js
+++ b/pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js
@@ -29,6 +29,16 @@ export default class NetworkAttachmentDef extends SteveModel {
     }
   }
 
+  get isSystem() {
+    const systemNamespaces = this.$rootGetters['systemNamespaces'];
+
+    if (systemNamespaces.includes(this.metadata?.namespace)) {
+      return true;
+    }
+
+    return false;
+  }
+
   get isIpamStatic() {
     return this.parseConfig.ipam?.type === 'static';
   }
diff --git a/pkg/harvester/models/kubevirt.io.virtualmachine.js b/pkg/harvester/models/kubevirt.io.virtualmachine.js
index 1a3a1622..793acf36 100644
--- a/pkg/harvester/models/kubevirt.io.virtualmachine.js
+++ b/pkg/harvester/models/kubevirt.io.virtualmachine.js
@@ -200,10 +200,16 @@ export default class VirtVm extends HarvesterResource {
         label:   this.t('harvester.action.abortMigration')
       },
       {
-        action:  'addHotplug',
+        action:  'addHotplugVolume',
         enabled: !!this.actions?.addVolume,
         icon:    'icon icon-plus',
-        label:   this.t('harvester.action.addHotplug')
+        label:   this.t('harvester.action.addHotplugVolume')
+      },
+      {
+        action:  'addHotplugNic',
+        enabled: this.hotplugNicFeatureEnabled && !!this.actions?.addNic,
+        icon:    'icon icon-plus',
+        label:   this.t('harvester.action.addHotplugNic')
       },
       {
         action:  'createTemplate',
@@ -389,8 +395,20 @@ export default class VirtVm extends HarvesterResource {
 
     this.$dispatch('promptModal', {
       resources,
-      diskName,
-      component: 'HarvesterUnplugVolume'
+      name:      diskName,
+      type:      'volume',
+      component:  'HarvesterHotUnplug',
+    });
+  }
+
+  unplugNIC(networkName) {
+    const resources = this;
+
+    this.$dispatch('promptModal', {
+      resources,
+      name:      networkName,
+      type:      'network',
+      component: 'HarvesterHotUnplug',
     });
   }
 
@@ -498,10 +516,17 @@ export default class VirtVm extends HarvesterResource {
     });
   }
 
-  addHotplug(resources = this) {
+  addHotplugVolume(resources = this) {
     this.$dispatch('promptModal', {
       resources,
-      component: 'HarvesterAddHotplugModal'
+      component: 'HarvesterAddHotplugVolumeModal'
+    });
+  }
+
+  addHotplugNic(resources = this) {
+    this.$dispatch('promptModal', {
+      resources,
+      component: 'HarvesterAddHotplugNic'
     });
   }
 
@@ -1234,6 +1259,10 @@ export default class VirtVm extends HarvesterResource {
     return this.$rootGetters['harvester-common/getFeatureEnabled']('vmMachineTypeAuto');
   }
 
+  get hotplugNicFeatureEnabled() {
+    return this.$rootGetters['harvester-common/getFeatureEnabled']('hotplugNic');
+  }
+
   get isBackupTargetUnavailable() {
     const allSettings = this.$rootGetters['harvester/all'](HCI.SETTING) || [];
     const backupTargetSetting = allSettings.find( (O) => O.id === 'backup-target');