From 5de19953766f5c3ccc6f1122770cc5e7052d539d Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 23 Feb 2022 14:00:16 +0100 Subject: [PATCH 1/2] api: update description of internal LB APIs (#6035) --- .../user/loadbalancer/CreateApplicationLoadBalancerCmd.java | 2 +- .../user/loadbalancer/DeleteApplicationLoadBalancerCmd.java | 2 +- .../user/loadbalancer/ListApplicationLoadBalancersCmd.java | 2 +- .../user/loadbalancer/UpdateApplicationLoadBalancerCmd.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java index 4e31c6abf34..592f49f4406 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/CreateApplicationLoadBalancerCmd.java @@ -41,7 +41,7 @@ import com.cloud.network.Network; import com.cloud.network.rules.LoadBalancerContainer.Scheme; import com.cloud.utils.net.NetUtils; -@APICommand(name = "createLoadBalancer", description = "Creates a load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0", +@APICommand(name = "createLoadBalancer", description = "Creates an internal load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class CreateApplicationLoadBalancerCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger.getLogger(CreateApplicationLoadBalancerCmd.class.getName()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java index a723279890a..f63b0014bd3 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/DeleteApplicationLoadBalancerCmd.java @@ -33,7 +33,7 @@ import org.apache.cloudstack.network.lb.ApplicationLoadBalancerRule; import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; -@APICommand(name = "deleteLoadBalancer", description = "Deletes a load balancer", responseObject = SuccessResponse.class, since = "4.2.0", +@APICommand(name = "deleteLoadBalancer", description = "Deletes an internal load balancer", responseObject = SuccessResponse.class, since = "4.2.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class DeleteApplicationLoadBalancerCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger.getLogger(DeleteApplicationLoadBalancerCmd.class.getName()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java index 79322c2a6ec..a925b880a22 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListApplicationLoadBalancersCmd.java @@ -35,7 +35,7 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.LoadBalancerContainer.Scheme; import com.cloud.utils.Pair; -@APICommand(name = "listLoadBalancers", description = "Lists load balancers", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0", +@APICommand(name = "listLoadBalancers", description = "Lists internal load balancers", responseObject = ApplicationLoadBalancerResponse.class, since = "4.2.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class ListApplicationLoadBalancersCmd extends BaseListTaggedResourcesCmd { public static final Logger s_logger = Logger.getLogger(ListApplicationLoadBalancersCmd.class.getName()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java index 3dd15641773..2c91f934f7d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/UpdateApplicationLoadBalancerCmd.java @@ -31,7 +31,7 @@ import com.cloud.event.EventTypes; import com.cloud.exception.InvalidParameterValueException; import com.cloud.network.rules.FirewallRule; -@APICommand(name = "updateLoadBalancer", description = "Updates a load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.4.0", +@APICommand(name = "updateLoadBalancer", description = "Updates an internal load balancer", responseObject = ApplicationLoadBalancerResponse.class, since = "4.4.0", requestHasSensitiveInfo = false, responseHasSensitiveInfo = false) public class UpdateApplicationLoadBalancerCmd extends BaseAsyncCustomIdCmd { public static final Logger s_logger = Logger.getLogger(UpdateApplicationLoadBalancerCmd.class.getName()); From ca12ef31acff8d27438f279889b04bd38091fb5a Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Wed, 23 Feb 2022 14:02:52 +0100 Subject: [PATCH 2/2] ui: add VXLAN network identifiers (VNIs) in message.guest.traffic.in.advanced.zone (#6034) --- ui/public/locales/ar.json | 2 +- ui/public/locales/ca.json | 2 +- ui/public/locales/en.json | 2 +- ui/public/locales/it_IT.json | 2 +- ui/public/locales/pl.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/public/locales/ar.json b/ui/public/locales/ar.json index a0086c0db16..ad38a15bf42 100644 --- a/ui/public/locales/ar.json +++ b/ui/public/locales/ar.json @@ -2148,7 +2148,7 @@ "message.generate.keys": "\u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u0644\u062a\u0623\u0643\u064a\u062f \u0628\u0623\u0646\u0643 \u062a\u0631\u063a\u0628 \u0628\u0625\u0646\u0634\u0627\u0621 \u0645\u0641\u0627\u062a\u064a\u062d \u062c\u062f\u064a\u062f\u0629 \u0644\u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645", "message.gslb.delete.confirm": "Please confirm you want to delete this GSLB", "message.gslb.lb.remove.confirm": "Please confirm you want to remove load balancing from GSLB", -"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.", +"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs or VXLAN network identifiers (VNIs) to carry guest traffic for each physical network.", "message.guest.traffic.in.basic.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.", "message.host.dedicated": "Host Dedicated", "message.host.dedication.released": "Host dedication released", diff --git a/ui/public/locales/ca.json b/ui/public/locales/ca.json index 13f1ce63a29..a82dea24c32 100644 --- a/ui/public/locales/ca.json +++ b/ui/public/locales/ca.json @@ -2150,7 +2150,7 @@ "message.generate.keys": "Si us plau confirmeu que voleu generar noves claus per aquest usuari.", "message.gslb.delete.confirm": "Please confirm you want to delete this GSLB", "message.gslb.lb.remove.confirm": "Please confirm you want to remove load balancing from GSLB", -"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.", +"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs or VXLAN network identifiers (VNIs) to carry guest traffic for each physical network.", "message.guest.traffic.in.basic.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.", "message.host.dedicated": "Host Dedicated", "message.host.dedication.released": "Host dedication released", diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json index e171e2173f0..6be9e8e0b6c 100644 --- a/ui/public/locales/en.json +++ b/ui/public/locales/en.json @@ -3007,7 +3007,7 @@ "message.generate.keys": "Please confirm that you would like to generate new keys for this user.", "message.gslb.delete.confirm": "Please confirm you want to delete this GSLB", "message.gslb.lb.remove.confirm": "Please confirm you want to remove load balancing from GSLB", -"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.", +"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs or VXLAN network identifiers (VNIs) to carry guest traffic for each physical network.", "message.guest.traffic.in.basic.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.", "message.guestnetwork.state.allocated": "Indicates the network configuration is in allocated but not setup", "message.guestnetwork.state.destroy": "Indicates that the network is destroyed", diff --git a/ui/public/locales/it_IT.json b/ui/public/locales/it_IT.json index 1007eb3a909..139eb08c4dc 100644 --- a/ui/public/locales/it_IT.json +++ b/ui/public/locales/it_IT.json @@ -2150,7 +2150,7 @@ "message.generate.keys": "Si prega di confermare di voler generare nuove chiavi per questo utente.", "message.gslb.delete.confirm": "Please confirm you want to delete this GSLB", "message.gslb.lb.remove.confirm": "Please confirm you want to remove load balancing from GSLB", -"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.", +"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs or VXLAN network identifiers (VNIs) to carry guest traffic for each physical network.", "message.guest.traffic.in.basic.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.", "message.host.dedicated": "Host Dedicated", "message.host.dedication.released": "Host dedication released", diff --git a/ui/public/locales/pl.json b/ui/public/locales/pl.json index b2b1331690d..595b0073b81 100644 --- a/ui/public/locales/pl.json +++ b/ui/public/locales/pl.json @@ -2150,7 +2150,7 @@ "message.generate.keys": "Please confirm that you would like to generate new keys for this user.", "message.gslb.delete.confirm": "Please confirm you want to delete this GSLB", "message.gslb.lb.remove.confirm": "Please confirm you want to remove load balancing from GSLB", -"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs to carry guest traffic for each physical network.", +"message.guest.traffic.in.advanced.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of VLAN IDs or VXLAN network identifiers (VNIs) to carry guest traffic for each physical network.", "message.guest.traffic.in.basic.zone": "Guest network traffic is communication between end-user virtual machines. Specify a range of IP addresses that CloudStack can assign to guest VMs. Make sure this range does not overlap the reserved system IP range.", "message.host.dedicated": "Host Dedicated", "message.host.dedication.released": "Host dedication released",