Skip to content

Clarify VR public IP labels #13240

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

Open
andrijapanicsb wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Clarify VR public IP labels #13240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c03f130
Clarify VR public IP labels
andrijapanicsb May 26, 2026
53a4e13
Shorten VR public IP label
andrijapanicsb May 26, 2026
8194e40
Clarify VPC router source NAT description
andrijapanicsb May 26, 2026
7cf4a33
Clarify VPC implementation error message
andrijapanicsb May 26, 2026
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: 3 additions & 3 deletions api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
3 changes: 2 additions & 1 deletion ui/public/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1155,6 +1155,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",
Expand Down Expand Up @@ -2192,7 +2193,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",
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache May 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

actually routerip is the ip address of VR on the guest network, not on Public network

Copy link
Copy Markdown
Contributor Author

@andrijapanicsb andrijapanicsb May 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image I think it's the Public one, per desc...?

"label.routeripv6": "IPv6 address for the VR in this Network.",
"label.routing.firewall": "IPv4 Routing Firewall",
"label.resourcegroup": "Resource group",
Expand Down
7 changes: 6 additions & 1 deletion ui/src/views/network/CreateIsolatedNetworkForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,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"
Expand Down Expand Up @@ -412,6 +412,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: {
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/network/CreateSharedNetworkForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Copy link
Copy Markdown
Member

@weizhouapache weizhouapache May 26, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good 👍

Copy link
Copy Markdown
Contributor Author

@andrijapanicsb andrijapanicsb May 26, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

idea was to add prexix Public and to also separate "...for network" (Isolated) vs "...for VPC" (VPC)

</template>
<a-input
v-model:value="form.routerip"
Expand Down Expand Up @@ -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"
Expand Down
Loading