Skip to content

Commit 68a3bfe

Browse files
Apply suggestions from code review
Co-authored-by: Fabricio Duarte <fabricio.duarte.jr@gmail.com>
1 parent 147a534 commit 68a3bfe

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

api/src/main/java/org/apache/cloudstack/api/response/IPAddressResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ public class IPAddressResponse extends BaseResponseWithAnnotations implements Co
144144
private String purpose;
145145

146146
@SerializedName(ApiConstants.VPC_ACCESS)
147-
@Param(description = "Whether the calling account has access to this network's VPC", since = "4.20")
147+
@Param(description = "Whether the calling account has access to this network's VPC", since = "4.21.0")
148148
private boolean vpcAccess;
149149

150150
@SerializedName(ApiConstants.VPC_ID)

api/src/main/java/org/apache/cloudstack/api/response/NetworkResponse.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ public class NetworkResponse extends BaseResponseWithAssociatedNetwork implement
192192
private Boolean specifyIpRanges;
193193

194194
@SerializedName(ApiConstants.VPC_ACCESS)
195-
@Param(description = "Whether the calling account has access to this network's VPC", since = "4.20")
195+
@Param(description = "Whether the calling account has access to this network's VPC", since = "4.21.0")
196196
private Boolean vpcAccess;
197197

198198
@SerializedName(ApiConstants.VPC_ID)

server/src/main/java/com/cloud/api/ApiResponseHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1158,7 +1158,7 @@ protected void setVpcIdInResponse(Long vpcId, Consumer<String> vpcUuidSetter, Co
11581158
vpcAccessSetter.accept(true);
11591159
} catch (PermissionDeniedException e) {
11601160
vpcAccessSetter.accept(false);
1161-
logger.debug("Setting [%s] as false because the caller does not have access to the VPC [%s].", ApiConstants.VPC_ACCESS, vpc);
1161+
logger.debug("Setting [{}] as false because the caller does not have access to the VPC [{}].", ApiConstants.VPC_ACCESS, vpc);
11621162
}
11631163
vpcNameSetter.accept(vpc.getName());
11641164
vpcUuidSetter.accept(vpc.getUuid());

ui/src/views/network/IpAddressesTab.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ export default {
458458
if (this.owner) {
459459
params.domainid = this.owner.domainid
460460
params.account = this.owner.projectid ? null : this.owner.account
461-
params.projectid = this.owner.projectid ? this.owner.projectid : null
461+
params.projectid = this.owner.projectid || null
462462
}
463463
} else {
464464
params.networkid = this.resource.id

ui/src/views/network/VpcTiersTab.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,9 +714,9 @@ export default {
714714
this.showCreateNetworkModal = false
715715
var params = {
716716
vpcid: this.resource.id,
717-
domainid: this.owner?.domainid ? this.owner.domainid : this.resource.domainid,
717+
domainid: this.owner?.domainid || this.resource.domainid,
718718
account: this.owner?.projectid ? null : (this.owner?.account ? this.owner.account : this.resource.account),
719-
projectid: this.owner?.projectid ? this.owner.projectid : null,
719+
projectid: this.owner?.projectid || null,
720720
networkOfferingId: values.networkOffering,
721721
name: values.name,
722722
displayText: values.name,

0 commit comments

Comments
 (0)