(cloudstack-extensions) branch network-namespace updated: Network Namespace: Update cidr to vpc-cidr in VPC commands

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhouapache pushed a commit to branch network-namespace
in repository https://gitbox.apache.org/repos/asf/cloudstack-extensions.git


The following commit(s) were added to refs/heads/network-namespace by this push:
     new 3c02225  Network Namespace: Update cidr to vpc-cidr in VPC commands
3c02225 is described below

commit 3c02225bd5c15dee0cbe1a09c043c1d40467f36f
Author: Wei Zhou <weiz...@apache.org>
AuthorDate: Thu Jun 4 12:38:37 2026 +0200

    Network Namespace: Update cidr to vpc-cidr in VPC commands
---
 Network-Namespace/README.md                    | 6 +++---
 Network-Namespace/network-namespace-wrapper.sh | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Network-Namespace/README.md b/Network-Namespace/README.md
index 9d93ac5..190b563 100644
--- a/Network-Namespace/README.md
+++ b/Network-Namespace/README.md
@@ -818,7 +818,7 @@ network operations).
 ```
 network-namespace-wrapper.sh implement-vpc \
     --vpc-id <vpc-id> \
-    [--cidr <vpc-cidr>] \
+    [--vpc-cidr <vpc-cidr>] \
     [--public-ip <ip>] [--public-vlan <pvlan>] \
     [--public-gateway <gw>] [--public-cidr <cidr>] \
     [--source-nat true|false]
@@ -828,7 +828,7 @@ Actions:
 1. Create the shared VPC namespace `cs-vpc-<vpc-id>` (idempotent).
 2. Disable IPv6 and enable IP forwarding inside the namespace.
 3. Optionally, when `--source-nat true`, `--public-ip`, and `--public-vlan` 
are all
-   provided and `--cidr` (VPC CIDR) is given:
+   provided and `--vpc-cidr` (VPC CIDR) is given:
    * Create public veth pair `vph-<pvlan>-<vpc-id>` (host) / 
`vpn-<pvlan>-<vpc-id>` (namespace).
    * Assign `<public-ip>` to `vpn-<pvlan>-<vpc-id>` inside the namespace.
    * Set namespace default route via `--public-gateway` (if given).
@@ -846,7 +846,7 @@ Actions:
 network-namespace-wrapper.sh update-vpc-source-nat-ip \
     --vpc-id <vpc-id> \
     --public-ip <new-source-nat-ip> \
-    [--cidr <vpc-cidr>] \
+    [--vpc-cidr <vpc-cidr>] \
     [--public-vlan <pvlan>] \
     [--public-gateway <gw>] \
     [--public-cidr <cidr>] \
diff --git a/Network-Namespace/network-namespace-wrapper.sh 
b/Network-Namespace/network-namespace-wrapper.sh
index d5ad279..e723a95 100755
--- a/Network-Namespace/network-namespace-wrapper.sh
+++ b/Network-Namespace/network-namespace-wrapper.sh
@@ -3367,7 +3367,7 @@ parse_vpc_args() {
 
     VPC_ID=$(_payload_json_get "${payload_file}" "payload.vpc_id")
     NAMESPACE=$(_payload_json_get "${payload_file}" "payload.namespace")
-    VPC_CIDR=$(_payload_json_get "${payload_file}" "payload.cidr")
+    VPC_CIDR=$(_payload_json_get "${payload_file}" "payload.vpc_cidr")
     PUBLIC_IP=$(_payload_json_get "${payload_file}" "payload.public_ip")
     PUBLIC_VLAN=$(_payload_json_get "${payload_file}" "payload.public_vlan")
     PUBLIC_GATEWAY=$(_payload_json_get "${payload_file}" 
"payload.public_gateway")
@@ -3517,7 +3517,7 @@ cmd_update_vpc_source_nat_ip() {
         PUBLIC_VLAN=$(cat "${vsd}/ips/${PUBLIC_IP}.pvlan" 2>/dev/null || true)
     fi
 
-    [ -z "${VPC_CIDR}" ]   && die "update-vpc-source-nat-ip: missing --cidr 
(or persisted vpc cidr)"
+    [ -z "${VPC_CIDR}" ]   && die "update-vpc-source-nat-ip: missing 
--vpc-cidr (or persisted vpc cidr)"
     [ -z "${PUBLIC_VLAN}" ] && die "update-vpc-source-nat-ip: missing 
--public-vlan"
 
     log "update-vpc-source-nat-ip: vpc=${VPC_ID} ns=${NAMESPACE} old=? 
new=${PUBLIC_IP} pvlan=${PUBLIC_VLAN} cidr=${VPC_CIDR}"