Clarify VR public IP labels

Author: andrijapanicsb

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

@@ -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;
 

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

@@ -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 Network 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 Network will not be implemented.",
             since = "4.19")
     private String sourceNatIP;
 

ui/public/locales/en.json

@@ -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",
@@ -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 in this network",
 "label.routeripv6": "IPv6 address for the VR in this Network.",
 "label.routing.firewall": "IPv4 Routing Firewall",
 "label.resourcegroup": "Resource group",

ui/src/views/network/CreateIsolatedNetworkForm.vue

@@ -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"
@@ -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: {

ui/src/views/network/CreateSharedNetworkForm.vue

@@ -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"