HARVESTER: SR-IOV polish

harvester · Apr 27, 2023 · 0df1b35 · 0df1b35
1 parent fdaaf7e
commit 0df1b35
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 133 deletions.
diff --git a/pkg/harvester/dialog/EnableSriovDevice.vue b/pkg/harvester/dialog/EnableSriovDevice.vue
@@ -4,6 +4,7 @@ import { mapGetters } from 'vuex';
 import { Card } from '@components/Card';
 import AsyncButton from '@shell/components/AsyncButton';
 import { escapeHtml } from '@shell/utils/string';
+import { clone } from '@shell/utils/object';
 
 export default {
   name: 'HarvesterEnableSriovDevice',
@@ -22,7 +23,9 @@ export default {
   },
 
   data() {
-    return { numVFs: 0 };
+    const numVFs = this.resources[0].spec?.numVFs || 1;
+
+    return { numVFs, numVFsHistory: clone(numVFs) };
   },
 
   computed: { ...mapGetters({ t: 'i18n/t' }) },
@@ -36,10 +39,12 @@ export default {
       const actionResource = this.resources[0];
 
       try {
+        this.resources[0].spec.numVFs = this.numVFs;
         await actionResource.save();
         buttonCb(true);
         this.close();
       } catch (err) {
+        this.resources[0].spec.numVFs = this.numVFsHistory;
         this.$store.dispatch('growl/fromError', {
           title: this.t('generic.notification.title.error', { name: escapeHtml(actionResource.metadata.name) }),
           err,
@@ -62,7 +67,7 @@ export default {
 
     <template #body>
       <LabeledInput
-        v-model.number="resources[0].spec.numVFs"
+        v-model.number="numVFs"
         type="number"
         min="0"
         required

diff --git a/pkg/harvester/formatters/HarvesterNodeName.vue b/pkg/harvester/formatters/HarvesterNodeName.vue
diff --git a/pkg/harvester/formatters/SriovNodeName.vue b/pkg/harvester/formatters/SriovNodeName.vue
diff --git a/pkg/harvester/list/devices.harvesterhci.io.sriovnetworkdevice.vue b/pkg/harvester/list/devices.harvesterhci.io.sriovnetworkdevice.vue
@@ -1,6 +1,7 @@
 <script>
 import { STATE, AGE, SIMPLE_NAME } from '@shell/config/table-headers';
 import { NODE } from '@shell/config/types';
+import { HCI } from '../types';
 import ResourceTable from '@shell/components/ResourceTable';
 
 export default {
@@ -30,9 +31,9 @@ export default {
       const nodeCol = {
         name:      'node',
         label:     'Node',
-        value:     'id',
+        value:     'realNodeName',
         sort:      ['realNodeName'],
-        formatter: 'SriovNodeName',
+        formatter: 'CopyToClipboard',
         labelKey:  'tableHeaders.node'
       };
 
@@ -67,7 +68,7 @@ export default {
 
       return cols;
     },
-  },
+  }
 };
 </script>
 

diff --git a/pkg/harvester/list/kubevirt.io.virtualmachine.vue b/pkg/harvester/list/kubevirt.io.virtualmachine.vue
@@ -72,9 +72,9 @@ export default {
       const nodeCol = {
         name:      'node',
         label:     'Node',
-        value:     'id',
+        value:     'realAttachNodeName',
         sort:      ['realAttachNodeName'],
-        formatter: 'HarvesterNodeName',
+        formatter: 'CopyToClipboard',
         labelKey:  'tableHeaders.node'
       };
 

diff --git a/pkg/harvester/models/devices.harvesterhci.io.sriovnetworkdevice.js b/pkg/harvester/models/devices.harvesterhci.io.sriovnetworkdevice.js
@@ -1,7 +1,9 @@
 import SteveModel from '@shell/plugins/steve/steve-class';
+import { escapeHtml } from '@shell/utils/string';
 import { colorForState } from '@shell/plugins/dashboard-store/resource-class';
 import { NODE } from '@shell/config/types';
 import { HCI } from '../types';
+import { clone } from '@shell/utils/object';
 
 /**
  * Class representing SR-IOV Device resource.
@@ -63,14 +65,25 @@ export default class SRIOVDevice extends SteveModel {
   }
 
   async disableDevice() {
-    this.spec.numVFs = 0;
-    await this.save();
+    const numVFsHistory = clone(this.spec.numVFs);
+
+    try {
+      this.spec.numVFs = 0;
+      await this.save();
+    } catch (err) {
+      this.spec.numVFs = numVFsHistory;
+      this.$dispatch('growl/fromError', {
+        title: this.t('generic.notification.title.error', { name: escapeHtml(this.metadata.name) }),
+        err,
+      }, { root: true });
+    }
   }
 
   get realNodeName() {
-    const device = this.$getters['byId'](HCI.SR_IOV, this.id);
-    const nodeName = device?.spec?.nodeName;
-    const node = this.$getters['byId'](NODE, nodeName);
+    const inStore = this.$rootGetters['currentProduct'].inStore;
+    const nodeName = this.spec?.nodeName;
+    const nodes = this.$rootGetters[`${ inStore }/all`](NODE);
+    const node = nodes.find(N => N.id === nodeName);
 
     return node?.nameDisplay || '';
   }