Skip to content

Commit b5e9178

Browse files
UI: fix issues when deploy VNF applicance on network with SG (#12436)
1 parent 6e5d78a commit b5e9178

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

ui/public/locales/en.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2527,7 +2527,7 @@
25272527
"label.vnf.app.action.reinstall": "Reinstall VNF Appliance",
25282528
"label.vnf.cidr.list": "CIDR from which access to the VNF appliance's Management interface should be allowed from",
25292529
"label.vnf.cidr.list.tooltip": "the CIDR list to forward traffic from to the VNF management interface. Multiple entries must be separated by a single comma character (,). The default value is 0.0.0.0/0.",
2530-
"label.vnf.configure.management": "Configure Firewall and Port Forwarding rules for VNF's management interfaces",
2530+
"label.vnf.configure.management": "Configure network rules for VNF's management interfaces",
25312531
"label.vnf.configure.management.tooltip": "True by default, security group or network rules (source nat and firewall rules) will be configured for VNF management interfaces. False otherwise. Learn what rules are configured at http://docs.cloudstack.apache.org/en/latest/adminguide/networking/vnf_templates_appliances.html#deploying-vnf-appliances",
25322532
"label.vnf.detail.add": "Add VNF detail",
25332533
"label.vnf.detail.remove": "Remove VNF detail",

ui/src/config/section/network.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,10 @@ export default {
356356
permission: ['listVnfAppliances'],
357357
resourceType: 'UserVm',
358358
params: () => {
359-
return { details: 'servoff,tmpl,nics', isvnf: true }
359+
return {
360+
details: 'group,nics,secgrp,tmpl,servoff,diskoff,iso,volume,affgrp,backoff,vnfnics',
361+
isvnf: true
362+
}
360363
},
361364
columns: () => {
362365
const fields = ['name', 'state', 'ipaddress']

ui/src/views/compute/DeployVnfAppliance.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ export default {
13051305
for (const deviceId of managementDeviceIds) {
13061306
if (this.vnfNicNetworks && this.vnfNicNetworks[deviceId] &&
13071307
((this.vnfNicNetworks[deviceId].type === 'Isolated' && this.vnfNicNetworks[deviceId].vpcid === undefined) ||
1308-
(this.vnfNicNetworks[deviceId].type === 'Shared' && this.zone.securitygroupsenabled))) {
1308+
(this.vnfNicNetworks[deviceId].type === 'Shared' && this.vnfNicNetworks[deviceId].service.filter(svc => svc.name === 'SecurityGroupProvider')))) {
13091309
return true
13101310
}
13111311
}

ui/src/views/network/VnfAppliancesTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ export default {
120120
methods: {
121121
fetchData () {
122122
var params = {
123-
details: 'servoff,tmpl,nics',
123+
details: 'group,nics,secgrp,tmpl,servoff,diskoff,iso,volume,affgrp,backoff,vnfnics',
124124
isVnf: true,
125125
listAll: true
126126
}

0 commit comments

Comments
 (0)