From b34349d4139230fb4ca99bf89a6b0e1f707e58e2 Mon Sep 17 00:00:00 2001 From: Dixsie Wolmers Date: Tue, 2 Nov 2021 22:06:35 -0500 Subject: Network Settings: Add and Delete IPV4 and DNS address Adds ability to add or delete static ipv4 and dns addesses per interface. Signed-off-by: Dixsie Wolmers Change-Id: Ie143ded2f173dd48f137471a684ba0d35ab0bf69 --- src/locales/en-US.json | 2 + src/store/modules/Settings/NetworkStore.js | 119 +++++++++++++++++++++ src/views/Settings/Network/ModalDns.vue | 92 ++++++++++++++++ src/views/Settings/Network/ModalIpv4.vue | 165 +++++++++++++++++++++++++++++ src/views/Settings/Network/Network.vue | 44 +++++++- src/views/Settings/Network/TableDns.vue | 37 +++++-- src/views/Settings/Network/TableIpv4.vue | 47 +++++--- 7 files changed, 484 insertions(+), 22 deletions(-) create mode 100644 src/views/Settings/Network/ModalDns.vue create mode 100644 src/views/Settings/Network/ModalIpv4.vue diff --git a/src/locales/en-US.json b/src/locales/en-US.json index 3bfc4a88..acf01192 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -651,9 +651,11 @@ "modal": { "ipAddress": "IP address", "gateway": "Gateway", + "staticDns": "Static DNS", "subnetMask": "Subnet mask" }, "table": { + "addDnsAddress": "Add IP address", "addIpv4Address": "Add static IPv4 address", "addressOrigin": "Address origin", "deleteDns": "Edit DNS address", diff --git a/src/store/modules/Settings/NetworkStore.js b/src/store/modules/Settings/NetworkStore.js index 5b95cb00..176fcd74 100644 --- a/src/store/modules/Settings/NetworkStore.js +++ b/src/store/modules/Settings/NetworkStore.js @@ -7,13 +7,20 @@ const NetworkStore = { ethernetData: [], firstInterfaceId: '', //used for setting global DHCP settings globalNetworkSettings: [], + selectedInterfaceId: '', // which tab is selected + selectedInterfaceIndex: 0, // which tab is selected }, getters: { ethernetData: (state) => state.ethernetData, firstInterfaceId: (state) => state.firstInterfaceId, globalNetworkSettings: (state) => state.globalNetworkSettings, + selectedInterfaceId: (state) => state.selectedInterfaceId, + selectedInterfaceIndex: (state) => state.selectedInterfaceIndex, }, mutations: { + setDomainNameState: (state, domainState) => + (state.domainState = domainState), + setDnsState: (state, dnsState) => (state.dnsState = dnsState), setEthernetData: (state, ethernetData) => (state.ethernetData = ethernetData), setFirstInterfaceId: (state, firstInterfaceId) => @@ -28,6 +35,7 @@ const NetworkStore = { LinkStatus, } = data; return { + defaultGateway: IPv4StaticAddresses[0]?.Gateway, //First static gateway is the default gateway dhcpAddress: IPv4Addresses.filter( (ipv4) => ipv4.AddressOrigin === 'DHCP' ), @@ -40,6 +48,11 @@ const NetworkStore = { }; }); }, + setNtpState: (state, ntpState) => (state.ntpState = ntpState), + setSelectedInterfaceId: (state, selectedInterfaceId) => + (state.selectedInterfaceId = selectedInterfaceId), + setSelectedInterfaceIndex: (state, selectedInterfaceIndex) => + (state.selectedInterfaceIndex = selectedInterfaceIndex), }, actions: { async getEthernetData({ commit }) { @@ -65,6 +78,7 @@ const NetworkStore = { commit('setEthernetData', ethernetData); commit('setFirstInterfaceId', firstInterfaceId); + commit('setSelectedInterfaceId', firstInterfaceId); commit('setGlobalNetworkSettings', ethernetInterfaces); }) .catch((error) => { @@ -158,6 +172,111 @@ const NetworkStore = { ); }); }, + async setSelectedTabIndex({ commit }, tabIndex) { + commit('setSelectedInterfaceIndex', tabIndex); + }, + async setSelectedTabId({ commit }, tabId) { + commit('setSelectedInterfaceId', tabId); + }, + async saveIpv4Address({ dispatch, state }, ipv4Form) { + const originalAddresses = state.ethernetData[ + state.selectedInterfaceIndex + ].IPv4StaticAddresses.map((ipv4) => { + const { Address, SubnetMask, Gateway } = ipv4; + return { + Address, + SubnetMask, + Gateway, + }; + }); + const newAddress = [ipv4Form]; + return api + .patch( + `/redfish/v1/Managers/bmc/EthernetInterfaces/${state.selectedInterfaceId}`, + { IPv4StaticAddresses: originalAddresses.concat(newAddress) } + ) + .then(dispatch('getEthernetData')) + .then(() => { + return i18n.t('pageNetwork.toast.successSaveNetworkSettings', { + setting: i18n.t('pageNetwork.ipv4'), + }); + }) + .catch((error) => { + console.log(error); + throw new Error( + i18n.t('pageNetwork.toast.errorSaveNetworkSettings', { + setting: i18n.t('pageNetwork.ipv4'), + }) + ); + }); + }, + async editIpv4Address({ dispatch, state }, ipv4TableData) { + return api + .patch( + `/redfish/v1/Managers/bmc/EthernetInterfaces/${state.selectedInterfaceId}`, + { IPv4StaticAddresses: ipv4TableData } + ) + .then(dispatch('getEthernetData')) + .then(() => { + return i18n.t('pageNetwork.toast.successSaveNetworkSettings', { + setting: i18n.t('pageNetwork.ipv4'), + }); + }) + .catch((error) => { + console.log(error); + throw new Error( + i18n.t('pageNetwork.toast.errorSaveNetworkSettings', { + setting: i18n.t('pageNetwork.ipv4'), + }) + ); + }); + }, + async saveDnsAddress({ dispatch, state }, dnsForm) { + const newAddress = dnsForm; + const originalAddresses = + state.ethernetData[state.selectedInterfaceIndex].StaticNameServers; + const newDnsArray = originalAddresses.concat(newAddress); + return api + .patch( + `/redfish/v1/Managers/bmc/EthernetInterfaces/${state.selectedInterfaceId}`, + { StaticNameServers: newDnsArray } + ) + .then(dispatch('getEthernetData')) + .then(() => { + return i18n.t('pageNetwork.toast.successSaveNetworkSettings', { + setting: i18n.t('pageNetwork.dns'), + }); + }) + .catch((error) => { + console.log(error); + throw new Error( + i18n.t('pageNetwork.toast.errorSaveNetworkSettings', { + setting: i18n.t('pageNetwork.dns'), + }) + ); + }); + }, + async editDnsAddress({ dispatch, state }, dnsTableData) { + return api + .patch( + `/redfish/v1/Managers/bmc/EthernetInterfaces/${state.selectedInterfaceId}`, + { StaticNameServers: dnsTableData } + ) + .then(dispatch('getEthernetData')) + .then(() => { + return i18n.t('pageNetwork.toast.successSaveNetworkSettings', { + setting: i18n.t('pageNetwork.dns'), + }); + }) + .catch((error) => { + console.log(error); + throw new Error( + i18n.t('pageNetwork.toast.errorSaveNetworkSettings', { + setting: i18n.t('pageNetwork.dns'), + }) + ); + }); + }, }, }; diff --git a/src/views/Settings/Network/ModalDns.vue b/src/views/Settings/Network/ModalDns.vue new file mode 100644 index 00000000..7f127173 --- /dev/null +++ b/src/views/Settings/Network/ModalDns.vue @@ -0,0 +1,92 @@ + + + diff --git a/src/views/Settings/Network/ModalIpv4.vue b/src/views/Settings/Network/ModalIpv4.vue new file mode 100644 index 00000000..dcf4a579 --- /dev/null +++ b/src/views/Settings/Network/ModalIpv4.vue @@ -0,0 +1,165 @@ + + + diff --git a/src/views/Settings/Network/Network.vue b/src/views/Settings/Network/Network.vue index 918c8e98..729a7a3c 100644 --- a/src/views/Settings/Network/Network.vue +++ b/src/views/Settings/Network/Network.vue @@ -4,7 +4,7 @@ - + @@ -31,6 +31,9 @@ + + + @@ -38,6 +41,8 @@ import BVToastMixin from '@/components/Mixins/BVToastMixin'; import DataFormatterMixin from '@/components/Mixins/DataFormatterMixin'; import LoadingBarMixin, { loading } from '@/components/Mixins/LoadingBarMixin'; +import ModalIpv4 from './ModalIpv4.vue'; +import ModalDns from './ModalDns.vue'; import NetworkGlobalSettings from './NetworkGlobalSettings.vue'; import NetworkInterfaceSettings from './NetworkInterfaceSettings.vue'; import PageSection from '@/components/Global/PageSection'; @@ -49,6 +54,8 @@ import { mapState } from 'vuex'; export default { name: 'Network', components: { + ModalIpv4, + ModalDns, NetworkGlobalSettings, NetworkInterfaceSettings, PageSection, @@ -63,6 +70,7 @@ export default { }, data() { return { + defaultGateway: '', loading, tabIndex: 0, }; @@ -70,6 +78,11 @@ export default { computed: { ...mapState('network', ['ethernetData']), }, + watch: { + ethernetData() { + this.getGateway(); + }, + }, created() { this.startLoader(); const globalSettings = new Promise((resolve) => { @@ -95,8 +108,37 @@ export default { ]).finally(() => this.endLoader()); }, methods: { + getGateway() { + this.defaultGateway = this.$store.getters[ + 'network/globalNetworkSettings' + ][this.tabIndex].defaultGateway; + }, getTabIndex(selectedIndex) { this.tabIndex = selectedIndex; + this.$store.dispatch('network/setSelectedTabIndex', this.tabIndex); + this.$store.dispatch( + 'network/setSelectedTabId', + this.ethernetData[selectedIndex].Id + ); + this.defaultGateway = this.$store.getters[ + 'network/globalNetworkSettings' + ][this.tabIndex].defaultGateway; + }, + saveIpv4Address(modalFormData) { + this.startLoader(); + this.$store + .dispatch('network/saveIpv4Address', modalFormData) + .then((message) => this.successToast(message)) + .catch(({ message }) => this.errorToast(message)) + .finally(() => this.endLoader()); + }, + saveDnsAddress(modalFormData) { + this.startLoader(); + this.$store + .dispatch('network/saveDnsAddress', modalFormData) + .then((message) => this.successToast(message)) + .catch(({ message }) => this.errorToast(message)) + .finally(() => this.endLoader()); }, }, }; diff --git a/src/views/Settings/Network/TableDns.vue b/src/views/Settings/Network/TableDns.vue index 2578ba36..569109f1 100644 --- a/src/views/Settings/Network/TableDns.vue +++ b/src/views/Settings/Network/TableDns.vue @@ -2,6 +2,12 @@ +
+ + + {{ $t('pageNetwork.table.addDnsAddress') }} + +
-