Skip to content

ui: Show default nic/network in infocard #5080

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DaanHoogland merged 2 commits into from
Jun 17, 2021
Merged

ui: Show default nic/network in infocard #5080

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9ca2f20
ui: Show default nic/network in infocard
davidjumani Jun 7, 2021
10984fd
using tags
davidjumani Jun 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions ui/src/components/view/InfoCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,6 +281,9 @@
style="margin-left: -24px; margin-top: 5px;">
<a-icon type="api" />eth{{ index }} {{ eth.ipaddress }}
<router-link v-if="eth.networkname && eth.networkid" :to="{ path: '/guestnetwork/' + eth.networkid }">({{ eth.networkname }})</router-link>
<a-tag v-if="eth.isdefault">
{{ $t('label.default') }}
</a-tag >
</div>
</div>
</div>
Expand All @@ -294,6 +297,9 @@
:key="network.id"
style="margin-top: 5px;">
<a-icon type="api" />{{ network.name }}
<span v-if="resource.defaultnetworkid === network.id">
({{ $t('label.default') }})
</span>
</div>
</div>
</div>
Expand Down
13 changes: 9 additions & 4 deletions ui/src/views/compute/DeployVM.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -758,7 +758,7 @@ export default {
'sharedexecutable'
],
initDataConfig: {},
defaultNetwork: '',
defaultnetworkid: '',
networkConfig: [],
dataNetworkCreated: [],
tabList: [
Expand Down Expand Up @@ -1038,6 +1038,7 @@ export default {

if (this.networks) {
this.vm.networks = this.networks
this.vm.defaultnetworkid = this.defaultnetworkid
}

if (this.template) {
Expand Down Expand Up @@ -1110,6 +1111,7 @@ export default {
this.form.getFieldDecorator('multidiskoffering', { initialValue: undefined, preserve: true })
this.form.getFieldDecorator('affinitygroupids', { initialValue: [], preserve: true })
this.form.getFieldDecorator('networkids', { initialValue: [], preserve: true })
this.form.getFieldDecorator('defaultnetworkid', { initialValue: undefined, preserve: true })
this.form.getFieldDecorator('keypair', { initialValue: undefined, preserve: true })
this.form.getFieldDecorator('cpunumber', { initialValue: undefined, preserve: true })
this.form.getFieldDecorator('cpuSpeed', { initialValue: undefined, preserve: true })
Expand Down Expand Up @@ -1337,7 +1339,10 @@ export default {
})
},
updateDefaultNetworks (id) {
this.defaultNetwork = id
this.defaultnetworkid = id
this.form.setFieldsValue({
defaultnetworkid: id
})
},
updateNetworkConfig (networks) {
this.networkConfig = networks
Expand Down Expand Up @@ -1487,9 +1492,9 @@ export default {
networkIds = values.networkids
if (networkIds.length > 0) {
for (let i = 0; i < networkIds.length; i++) {
if (networkIds[i] === this.defaultNetwork) {
if (networkIds[i] === this.defaultnetworkid) {
const ipToNetwork = {
networkid: this.defaultNetwork
networkid: this.defaultnetworkid
}
arrNetwork.unshift(ipToNetwork)
} else {
Expand Down