diff --git a/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue b/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue index cbfe66a5..b5c3a393 100644 --- a/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue +++ b/pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue @@ -11,6 +11,9 @@ import { HCI as HCI_LABELS_ANNOTATIONS } from '@pkg/harvester/config/labels-anno import CreateEditView from '@shell/mixins/create-edit-view'; import { allHash } from '@shell/utils/promise'; import { HCI } from '../types'; +import { NETWORK_TYPE } from '../config/types'; + +const { L2VLAN, UNTAGGED } = NETWORK_TYPE; const AUTO = 'auto'; const MANUAL = 'manual'; @@ -48,7 +51,7 @@ export default { config.bridge = config.bridge.slice(0, -3); } - const type = this.value.vlanType || 'L2VlanNetwork' ; + const type = this.value.vlanType || L2VLAN ; return { config, @@ -101,15 +104,15 @@ export default { }, networkType() { - return ['L2VlanNetwork', 'UntaggedNetwork']; + return [L2VLAN, UNTAGGED]; }, isUntaggedNetwork() { if (this.isView) { - return this.value.vlanType === 'UntaggedNetwork'; + return this.value.vlanType === UNTAGGED; } - return this.type === 'UntaggedNetwork'; + return this.type === UNTAGGED; } }, diff --git a/pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js b/pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js index a916386c..351e6017 100644 --- a/pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js +++ b/pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js @@ -1,5 +1,8 @@ import SteveModel from '@shell/plugins/steve/steve-class'; import { HCI } from '@shell/config/labels-annotations'; +import { NETWORK_TYPE } from '../config/types'; + +const { UNTAGGED } = NETWORK_TYPE; export default class NetworkAttachmentDef extends SteveModel { applyDefaults() { @@ -42,7 +45,7 @@ export default class NetworkAttachmentDef extends SteveModel { } get vlanId() { - return this.vlanType === 'UntaggedNetwork' ? 'N/A' : this.parseConfig.vlan; + return this.vlanType === UNTAGGED ? 'N/A' : this.parseConfig.vlan; } get customValidationRules() { @@ -65,7 +68,7 @@ export default class NetworkAttachmentDef extends SteveModel { const route = annotations[HCI.NETWORK_ROUTE]; let config = {}; - if (this.vlanType === 'UntaggedNetwork') { + if (this.vlanType === UNTAGGED) { return 'N/A'; }