public/harvester-ui-extension
1
0
Fork 0
mirror of https://github.com/harvester/harvester-ui-extension.git synced 2025-12-13 21:21:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

extract network_type to config/types

Browse Source 
Signed-off-by: andy.lee <andy.lee@suse.com>
(cherry picked from commit 5f76da4629136344e06b7a3b1d62e5e59599dfff)
This commit is contained in:
andy.lee 2025-02-10 16:54:09 +08:00 committed by Mergify
parent 36b1406738
commit 06c9a8b3d9
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/harvester/edit/harvesterhci.io.networkattachmentdefinition.vue
View File

@ -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 CreateEditView from '@shell/mixins/create-edit-view';
import { allHash } from '@shell/utils/promise'; import { allHash } from '@shell/utils/promise';
import { HCI } from '../types'; import { HCI } from '../types';
import { NETWORK_TYPE } from '../config/types';
const { L2VLAN, UNTAGGED } = NETWORK_TYPE;
const AUTO = 'auto'; const AUTO = 'auto';
const MANUAL = 'manual'; const MANUAL = 'manual';
@ -48,7 +51,7 @@ export default {
config.bridge = config.bridge.slice(0, -3); config.bridge = config.bridge.slice(0, -3);
} }
const type = this.value.vlanType || 'L2VlanNetwork' ; const type = this.value.vlanType || L2VLAN ;
return { return {
config, config,
@ -101,15 +104,15 @@ export default {
}, },
networkType() { networkType() {
return ['L2VlanNetwork', 'UntaggedNetwork']; return [L2VLAN, UNTAGGED];
}, },
isUntaggedNetwork() { isUntaggedNetwork() {
if (this.isView) { if (this.isView) {
return this.value.vlanType === 'UntaggedNetwork'; return this.value.vlanType === UNTAGGED;
} }
return this.type === 'UntaggedNetwork'; return this.type === UNTAGGED;
} }
}, },

7
pkg/harvester/models/k8s.cni.cncf.io.networkattachmentdefinition.js
View File

@ -1,5 +1,8 @@
import SteveModel from '@shell/plugins/steve/steve-class'; import SteveModel from '@shell/plugins/steve/steve-class';
import { HCI } from '@shell/config/labels-annotations'; import { HCI } from '@shell/config/labels-annotations';
import { NETWORK_TYPE } from '../config/types';
const { UNTAGGED } = NETWORK_TYPE;
export default class NetworkAttachmentDef extends SteveModel { export default class NetworkAttachmentDef extends SteveModel {
applyDefaults() { applyDefaults() {
@ -42,7 +45,7 @@ export default class NetworkAttachmentDef extends SteveModel {
} }
get vlanId() { get vlanId() {
return this.vlanType === 'UntaggedNetwork' ? 'N/A' : this.parseConfig.vlan; return this.vlanType === UNTAGGED ? 'N/A' : this.parseConfig.vlan;
} }
get customValidationRules() { get customValidationRules() {
@ -65,7 +68,7 @@ export default class NetworkAttachmentDef extends SteveModel {
const route = annotations[HCI.NETWORK_ROUTE]; const route = annotations[HCI.NETWORK_ROUTE];
let config = {}; let config = {};
if (this.vlanType === 'UntaggedNetwork') { if (this.vlanType === UNTAGGED) {
return 'N/A'; return 'N/A';
} }