diff --git a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java index ce2c0f36caf..e8197a8baea 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java @@ -144,7 +144,7 @@ public class IPAddressResponse extends BaseResponseWithAnnotations implements Co private String purpose; @SerializedName(ApiConstants.VPC_ACCESS) - @Param(description = "Whether the calling account has access to this network's VPC", since = "4.20") + @Param(description = "Whether the calling account has access to this network's VPC", since = "4.21.0") private boolean vpcAccess; @SerializedName(ApiConstants.VPC_ID) diff --git a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java index a785ed2ac98..40323c1217f 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java +++ b/api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java @@ -204,7 +204,7 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement private Boolean specifyIpRanges; @SerializedName(ApiConstants.VPC_ACCESS) - @Param(description = "Whether the calling account has access to this network's VPC", since = "4.20") + @Param(description = "Whether the calling account has access to this network's VPC", since = "4.21.0") private Boolean vpcAccess; @SerializedName(ApiConstants.VPC_ID) diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index 6bf8fd51d4c..9ce3674fcb9 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java @@ -1256,7 +1256,7 @@ public class ApiResponseHelper implements ResponseGenerator, ResourceIdSupport { vpcAccessSetter.accept(true); } catch (PermissionDeniedException e) { vpcAccessSetter.accept(false); - logger.debug("Setting [%s] as false because the caller does not have access to the VPC [%s].", ApiConstants.VPC_ACCESS, vpc); + logger.debug("Setting [{}] as false because the caller does not have access to the VPC [{}].", ApiConstants.VPC_ACCESS, vpc); } vpcNameSetter.accept(vpc.getName()); vpcUuidSetter.accept(vpc.getUuid()); diff --git a/ui/src/views/network/VpcTiersTab.vue b/ui/src/views/network/VpcTiersTab.vue index f9ad835cdfc..e867c7d95ff 100644 --- a/ui/src/views/network/VpcTiersTab.vue +++ b/ui/src/views/network/VpcTiersTab.vue @@ -783,9 +783,9 @@ export default { this.showCreateNetworkModal = false var params = { vpcid: this.resource.id, - domainid: this.owner?.domainid ? this.owner.domainid : this.resource.domainid, + domainid: this.owner?.domainid || this.resource.domainid, account: this.owner?.projectid ? null : (this.owner?.account ? this.owner.account : this.resource.account), - projectid: this.owner?.projectid ? this.owner.projectid : null, + projectid: this.owner?.projectid || null, networkOfferingId: values.networkOffering, name: values.name, displayText: values.name,