From ec3698dfbe178e0d5334255279edf6e8ddaf5961 Mon Sep 17 00:00:00 2001 From: Harikrishna Date: Tue, 4 Apr 2023 12:20:16 +0530 Subject: [PATCH] Added details about account/domain to which network will be assigned during creation (#7387) --- .../api/command/user/network/CreateNetworkCmd.java | 5 +++-- .../src/main/java/com/cloud/network/NetworkServiceImpl.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java index bc26a47ae71..8b8ce104076 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmd.java @@ -111,13 +111,14 @@ public class CreateNetworkCmd extends BaseCmd implements UserCmd { + " - Account. Account means that only the account owner can use the network, domain - all accounts in the domain can use the network") private String aclType; - @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "account that will own the network") + @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "Account that will own the network. Account should be under the selected domain") private String accountName; @Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the network") private Long projectId; - @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "domain ID of the account owning a network") + @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, entityType = DomainResponse.class, description = "domain ID of the account owning a network. " + + "If no account is provided then network will be assigned to the caller account and domain") private Long domainId; @Parameter(name = ApiConstants.SUBDOMAIN_ACCESS, diff --git a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java index d27b8bc2c42..746e4365e1b 100644 --- a/server/src/main/java/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/main/java/com/cloud/network/NetworkServiceImpl.java @@ -1402,6 +1402,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C if ((cmd.getAccountName() != null && domainId != null) || cmd.getProjectId() != null) { owner = _accountMgr.finalizeOwner(caller, cmd.getAccountName(), domainId, cmd.getProjectId()); } else { + s_logger.info(String.format("Assigning the network to caller:%s because either projectId or accountname and domainId are not provided", caller.getAccountName())); owner = caller; }