etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

more fixes

This commit is contained in:
Harikrishna Patnala 2026-03-05 15:33:39 +05:30
parent dc99a359c5
commit 18b007d681
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -7227,6 +7227,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
forVpc = false;
} else if (service == Service.NetworkACL) {
forVpc = true;
} else if (service == Service.Firewall) {
forVpc = true;
}
}

17
ui/src/views/network/PublicIpResource.vue
View File

@ -147,29 +147,16 @@ export default {
return
}
// VPC IPs with static nat have firewall (only if associatednetworkid present)
// VPC IPs with static nat have nothing
if (this.resource.isstaticnat) {
if (this.resource.virtualmachinetype === 'DomainRouter') {
let tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'vpn'))
if (this.resource.associatednetworkid) {
tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => ['vpn', 'firewall'].includes(tab.name)))
}
this.tabs = tabs
} else {
if (this.resource.associatednetworkid) {
this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => tab.name === 'firewall'))
} else {
this.tabs = this.defaultTabs
}
this.tabs = this.defaultTabs.concat(this.$route.meta.tabs.filter(tab => ['vpn', 'firewall'].includes(tab.name)))
}
return
}
// VPC IPs have all tabs, but firewall only if associatednetworkid present
let tabs = this.$route.meta.tabs
if (!this.resource.associatednetworkid) {
tabs = tabs.filter(tab => tab.name !== 'firewall')
}
const network = await this.fetchNetwork()
if (network && network.networkofferingconservemode) {