Skip to content

Commit 85e4abf

Browse files
authored
ui: Show default nic/network in infocard (#5080)
1 parent a3f39db commit 85e4abf

File tree

2 files changed

+15
-4
lines changed

2 files changed

+15
-4
lines changed

ui/src/components/view/InfoCard.vue

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,9 @@
281281
style="margin-left: -24px; margin-top: 5px;">
282282
<a-icon type="api" />eth{{ index }} {{ eth.ipaddress }}
283283
<router-link v-if="eth.networkname && eth.networkid" :to="{ path: '/guestnetwork/' + eth.networkid }">({{ eth.networkname }})</router-link>
284+
<a-tag v-if="eth.isdefault">
285+
{{ $t('label.default') }}
286+
</a-tag >
284287
</div>
285288
</div>
286289
</div>
@@ -294,6 +297,9 @@
294297
:key="network.id"
295298
style="margin-top: 5px;">
296299
<a-icon type="api" />{{ network.name }}
300+
<span v-if="resource.defaultnetworkid === network.id">
301+
({{ $t('label.default') }})
302+
</span>
297303
</div>
298304
</div>
299305
</div>

ui/src/views/compute/DeployVM.vue

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -775,7 +775,7 @@ export default {
775775
'sharedexecutable'
776776
],
777777
initDataConfig: {},
778-
defaultNetwork: '',
778+
defaultnetworkid: '',
779779
networkConfig: [],
780780
dataNetworkCreated: [],
781781
tabList: [
@@ -1065,6 +1065,7 @@ export default {
10651065
10661066
if (this.networks) {
10671067
this.vm.networks = this.networks
1068+
this.vm.defaultnetworkid = this.defaultnetworkid
10681069
}
10691070
10701071
if (this.template) {
@@ -1147,6 +1148,7 @@ export default {
11471148
this.form.getFieldDecorator('multidiskoffering', { initialValue: undefined, preserve: true })
11481149
this.form.getFieldDecorator('affinitygroupids', { initialValue: [], preserve: true })
11491150
this.form.getFieldDecorator('networkids', { initialValue: [], preserve: true })
1151+
this.form.getFieldDecorator('defaultnetworkid', { initialValue: undefined, preserve: true })
11501152
this.form.getFieldDecorator('keypair', { initialValue: undefined, preserve: true })
11511153
this.form.getFieldDecorator('cpunumber', { initialValue: undefined, preserve: true })
11521154
this.form.getFieldDecorator('cpuSpeed', { initialValue: undefined, preserve: true })
@@ -1377,7 +1379,10 @@ export default {
13771379
})
13781380
},
13791381
updateDefaultNetworks (id) {
1380-
this.defaultNetwork = id
1382+
this.defaultnetworkid = id
1383+
this.form.setFieldsValue({
1384+
defaultnetworkid: id
1385+
})
13811386
},
13821387
updateNetworkConfig (networks) {
13831388
this.networkConfig = networks
@@ -1528,9 +1533,9 @@ export default {
15281533
networkIds = values.networkids
15291534
if (networkIds.length > 0) {
15301535
for (let i = 0; i < networkIds.length; i++) {
1531-
if (networkIds[i] === this.defaultNetwork) {
1536+
if (networkIds[i] === this.defaultnetworkid) {
15321537
const ipToNetwork = {
1533-
networkid: this.defaultNetwork
1538+
networkid: this.defaultnetworkid
15341539
}
15351540
arrNetwork.unshift(ipToNetwork)
15361541
} else {

0 commit comments

Comments
 (0)