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

Merge 7cf4a333e4 into b7d4df0a11

This commit is contained in:
Andrija Panic 2026-07-04 15:34:29 +01:00 committed by GitHub
parent b7d4df0a11 7cf4a333e4
commit 9359d42aff
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
View File

@ -185,9 +185,9 @@ public class CreateNetworkCmd extends BaseCmd implements UserCmd {
@Parameter(name = ApiConstants.SOURCE_NAT_IP,
type = CommandType.STRING,
description = "IPV4 address to be assigned to the public interface of the network router. " +
"This address will be used as source NAT address for the network. " +
"\nIf an address is given and it cannot be acquired, an error will be returned and the network won´t be implemented,",
description = "Optional IPv4 address to assign to the public interface of the network router. " +
"This address will be used as the Source NAT address for the network. " +
"\nIf an address is given and it cannot be acquired, an error will be returned and the network will not be implemented.",
since = "4.19")
private String sourceNatIP;

6
api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
View File

@ -117,9 +117,9 @@ public class CreateVPCCmd extends BaseAsyncCreateCmd implements UserCmd {
@Parameter(name = ApiConstants.IP6_DNS2, type = CommandType.STRING, description = "The second IPv6 DNS for the VPC", since = "4.18.0")
private String ip6Dns2;
@Parameter(name = ApiConstants.SOURCE_NAT_IP, type = CommandType.STRING, description = "IPv4 address to be assigned to the public interface of the Network router." +
"This address will be used as source NAT address for the Networks in ths VPC. " +
"\nIf an address is given and it cannot be acquired, an error will be returned and the Network won´t be implemented,",
@Parameter(name = ApiConstants.SOURCE_NAT_IP, type = CommandType.STRING, description = "Optional IPv4 address to assign to the public interface of the VPC router. " +
"This address will be used as the Source NAT address for the Networks in this VPC. " +
"\nIf an address is given and it cannot be acquired, an error will be returned and the VPC will not be implemented.",
since = "4.19")
private String sourceNatIP;

3
ui/public/locales/en.json
View File

@ -1170,6 +1170,7 @@
"label.fwdeviceid": "ID",
"label.fwdevicestate": "Status",
"label.gateway": "Gateway",
"label.gateway.internal.routerip": "Gateway (internal IPv4 address for the VR)",
"label.global": "Global",
"label.global.settings": "Global Settings",
"label.globo.dns": "GloboDNS",
@ -2237,7 +2238,7 @@
"label.router.health.check.success": "Success",
"label.router.health.checks": "Health checks",
"label.routercount": "Total of virtual routers",
"label.routerip": "IPv4 address for the VR in this Network.",
"label.routerip": "Public IPv4 address for the VR",
"label.routeripv6": "IPv6 address for the VR in this Network.",
"label.routing.firewall": "IPv4 Routing Firewall",
"label.resourcegroup": "Resource group",

7
ui/src/views/network/CreateIsolatedNetworkForm.vue
View File

@ -201,7 +201,7 @@
ref="gateway"
name="gateway">
<template #label>
<tooltip-label :title="$t('label.gateway')" :tooltip="apiParams.gateway.description"/>
<tooltip-label :title="gatewayLabel" :tooltip="apiParams.gateway.description"/>
</template>
<a-input
v-model:value="form.gateway"
@ -418,6 +418,11 @@ export default {
return sourcenatService && sourcenatService.length === 1
}
return false
},
gatewayLabel () {
return this.selectedNetworkOfferingSupportsSourceNat
? this.$t('label.gateway.internal.routerip')
: this.$t('label.gateway')
}
},
methods: {

4
ui/src/views/network/CreateSharedNetworkForm.vue
View File

@ -344,7 +344,7 @@
</a-row>
<a-form-item v-if="isVirtualRouterForAtLeastOneService" name="routerip" ref="routerip">
<template #label>
<tooltip-label :title="$t('label.routerip')" :tooltip="apiParams.routerip.description"/>
<tooltip-label :title="$t('label.sharedrouterip')" :tooltip="apiParams.routerip.description"/>
</template>
<a-input
v-model:value="form.routerip"
@ -420,7 +420,7 @@
</a-row>
<a-form-item v-if="isVirtualRouterForAtLeastOneService" name="routeripv6" ref="routeripv6">
<template #label>
<tooltip-label :title="$t('label.routeripv6')" :tooltip="apiParams.routeripv6.description"/>
<tooltip-label :title="$t('label.sharedrouteripv6')" :tooltip="apiParams.routeripv6.description"/>
</template>
<a-input
v-model:value="form.routeripv6"