Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

package org.apache.cloudstack.api.command.user.backup.repository;

import com.cloud.utils.StringUtils;
import org.apache.cloudstack.acl.RoleType;
import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
Expand Down Expand Up @@ -100,7 +101,7 @@ public String getProvider() {
}

public String getMountOptions() {
return mountOptions == null ? "" : mountOptions;
return StringUtils.isBlank(mountOptions) ? "" : mountOptions;
}

public Long getZoneId() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,10 @@ public class BackupRepositoryResponse extends BaseResponse {
@Param(description = "backup type")
private String type;

@SerializedName(ApiConstants.MOUNT_OPTIONS)
@Param(description = "mount options", since = "4.22.1")
private String mountOptions;

@SerializedName(ApiConstants.CAPACITY_BYTES)
@Param(description = "capacity of the backup repository")
private Long capacityBytes;
Expand Down Expand Up @@ -128,6 +132,14 @@ public void setType(String type) {
this.type = type;
}

public String getMountOptions() {
return mountOptions;
}

public void setMountOptions(String mountOptions) {
this.mountOptions = mountOptions;
}

public Long getCapacityBytes() {
return capacityBytes;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,4 @@ public interface BackupRepositoryService {
BackupRepository updateBackupRepository(UpdateBackupRepositoryCmd cmd);
boolean deleteBackupRepository(DeleteBackupRepositoryCmd cmd);
Pair<List<BackupRepository>, Integer> listBackupRepositories(ListBackupRepositoriesCmd cmd);

}
3 changes: 3 additions & 0 deletions server/src/main/java/com/cloud/api/ApiResponseHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -5526,6 +5526,9 @@ public BackupRepositoryResponse createBackupRepositoryResponse(BackupRepository
response.setAddress(backupRepository.getAddress());
response.setProviderName(backupRepository.getProvider());
response.setType(backupRepository.getType());
if (StringUtils.isNotBlank(backupRepository.getMountOptions())) {
response.setMountOptions(backupRepository.getMountOptions());
}
response.setCapacityBytes(backupRepository.getCapacityBytes());
response.setCrossZoneInstanceCreation(backupRepository.crossZoneInstanceCreationEnabled());
response.setObjectName("backuprepository");
Expand Down
Loading