NE: change cidr to vpc_cidr when implement a VPC

Author: weizhouapache

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/network/NetworkExtensionElement.java

@@ -2323,7 +2323,7 @@ public boolean implementVpc(Vpc vpc, DeployDestination dest, ReservationContext
         // Step 2: Create the VPC namespace (no anchor tier network needed).
         JsonObject implPayload = new JsonObject();
         implPayload.addProperty("vpc_id", String.valueOf(vpc.getId()));
-        implPayload.addProperty("cidr", safeStr(vpc.getCidr()));
+        implPayload.addProperty("vpc_cidr", safeStr(vpc.getCidr()));
 
         // Include source NAT IP if already allocated, so the script can set up the
         // VPC-level SNAT rule for the entire VPC CIDR.
@@ -2416,7 +2416,7 @@ public boolean updateVpcSourceNatIp(Vpc vpc, IpAddress address) {
 
         final JsonObject payload = new JsonObject();
         payload.addProperty("vpc_id", String.valueOf(vpc.getId()));
-        payload.addProperty("cidr", safeStr(vpc.getCidr()));
+        payload.addProperty("vpc_cidr", safeStr(vpc.getCidr()));
         addPublicIpToPayload(payload, address.getId(), true);
 
         final boolean result = executeVpcScript(vpc, CMD_UPDATE_VPC_SOURCE_NAT_IP, payload);

framework/extensions/src/main/java/org/apache/cloudstack/framework/extensions/network/README.md

@@ -401,7 +401,7 @@ can set up the VPC-level SNAT rule at this stage.
 | Field | Description |
 |---|---|
 | `vpc_id` | VPC ID. |
-| `cidr` | VPC supernet CIDR. |
+| `vpc_cidr` | VPC supernet CIDR. |
 | `public_ip` | Source-NAT IP, when already allocated. |
 | `public_vlan` | VLAN of the source-NAT IP, when present. |
 | `public_gateway` | Gateway of the source-NAT IP segment, when present. |
@@ -437,7 +437,7 @@ The `extension.details` blob is removed from CloudStack after a successful retur
 | Field | Description |
 |---|---|
 | `vpc_id` | VPC ID. |
-| `cidr` | VPC supernet CIDR. |
+| `vpc_cidr` | VPC supernet CIDR. |
 | `public_ip` | New source-NAT IP. |
 | `public_vlan` | VLAN of the new source-NAT IP. |
 | `public_gateway` | Gateway of the new source-NAT IP segment. |