api:rename RegisterCmd.java => RegisterUserKeyCmd.java

api/src/main/java/com/cloud/user/AccountService.java

@@ -25,7 +25,7 @@
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.command.admin.account.CreateAccountCmd;
 import org.apache.cloudstack.api.command.admin.user.GetUserKeysCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
 import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
 
 import com.cloud.dc.DataCenter;
@@ -95,7 +95,7 @@ User createUser(String userName, String password, String firstName, String lastN
 
     void markUserRegistered(long userId);
 
-    public String[] createApiKeyAndSecretKey(RegisterCmd cmd);
+    public String[] createApiKeyAndSecretKey(RegisterUserKeyCmd cmd);
 
     public String[] createApiKeyAndSecretKey(final long userId);
 

api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java

@@ -26,14 +26,14 @@
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.RegisterResponse;
+import org.apache.cloudstack.api.response.RegisterUserKeyResponse;
 import org.apache.cloudstack.api.response.UserResponse;
 
 import java.util.Map;
 
 @APICommand(name = "getUserKeys",
             description = "This command allows the user to query the seceret and API keys for the account",
-            responseObject = RegisterResponse.class,
+            responseObject = RegisterUserKeyResponse.class,
             requestHasSensitiveInfo = false,
             responseHasSensitiveInfo = true,
             authorized = {RoleType.User, RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin},
@@ -57,7 +57,7 @@ public Long getID(){
     public void execute(){
         Pair<Boolean, Map<String, String>> keys = _accountService.getKeys(this);
 
-        RegisterResponse response = new RegisterResponse();
+        RegisterUserKeyResponse response = new RegisterUserKeyResponse();
         if(keys != null){
             response.setApiKeyAccess(keys.first());
             response.setApiKey(keys.second().get("apikey"));

api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterCmd.java → api/src/main/java/org/apache/cloudstack/api/command/admin/user/RegisterUserKeyCmd.java

@@ -22,17 +22,17 @@
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
-import org.apache.cloudstack.api.response.RegisterResponse;
+import org.apache.cloudstack.api.response.RegisterUserKeyResponse;
 import org.apache.cloudstack.api.response.UserResponse;
 
 import com.cloud.user.Account;
 import com.cloud.user.User;
 
 @APICommand(name = "registerUserKeys",
-            responseObject = RegisterResponse.class,
+            responseObject = RegisterUserKeyResponse.class,
             description = "This command allows a user to register for the developer API, returning a secret key and an API key. This request is made through the integration API port, so it is a privileged command and must be made on behalf of a user. It is up to the implementer just how the username and password are entered, and then how that translates to an integration API request. Both secret key and API key should be returned to the user",
             requestHasSensitiveInfo = false, responseHasSensitiveInfo = true)
-public class RegisterCmd extends BaseCmd {
+public class RegisterUserKeyCmd extends BaseCmd {
 
 
     /////////////////////////////////////////////////////
@@ -81,7 +81,7 @@ public ApiCommandResourceType getApiResourceType() {
     @Override
     public void execute() {
         String[] keys = _accountService.createApiKeyAndSecretKey(this);
-        RegisterResponse response = new RegisterResponse();
+        RegisterUserKeyResponse response = new RegisterUserKeyResponse();
         if (keys != null) {
             response.setApiKey(keys[0]);
             response.setSecretKey(keys[1]);

api/src/main/java/org/apache/cloudstack/api/response/RegisterResponse.java → api/src/main/java/org/apache/cloudstack/api/response/RegisterUserKeyResponse.java

@@ -23,7 +23,7 @@
 
 import com.cloud.serializer.Param;
 
-public class RegisterResponse extends BaseResponse {
+public class RegisterUserKeyResponse extends BaseResponse {
     @SerializedName(ApiConstants.API_KEY)
     @Param(description = "the api key of the registered user", isSensitive = true)
     private String apiKey;

plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java

@@ -37,7 +37,7 @@
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.command.admin.account.UpdateAccountCmd;
 import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
 import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
 import org.apache.cloudstack.context.CallContext;
 
@@ -118,7 +118,7 @@ public void checkAccess(Account arg0, AccessType arg1, boolean arg2, ControlledE
     }
 
     @Override
-    public String[] createApiKeyAndSecretKey(RegisterCmd arg0) {
+    public String[] createApiKeyAndSecretKey(RegisterUserKeyCmd arg0) {
         // TODO Auto-generated method stub
         return null;
     }

server/src/main/java/com/cloud/server/ManagementServerImpl.java

@@ -282,7 +282,7 @@
 import org.apache.cloudstack.api.command.admin.user.ListUsersCmd;
 import org.apache.cloudstack.api.command.admin.user.LockUserCmd;
 import org.apache.cloudstack.api.command.admin.user.MoveUserCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
 import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
 import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd;
@@ -3843,7 +3843,7 @@ public List<Class<?>> getCommands() {
         cmdList.add(ListUsersCmd.class);
         cmdList.add(LockUserCmd.class);
         cmdList.add(MoveUserCmd.class);
-        cmdList.add(RegisterCmd.class);
+        cmdList.add(RegisterUserKeyCmd.class);
         cmdList.add(UpdateUserCmd.class);
         cmdList.add(CreateVlanIpRangeCmd.class);
         cmdList.add(UpdateVlanIpRangeCmd.class);

server/src/main/java/com/cloud/user/AccountManagerImpl.java

@@ -61,7 +61,7 @@
 import org.apache.cloudstack.api.command.admin.user.DeleteUserCmd;
 import org.apache.cloudstack.api.command.admin.user.GetUserKeysCmd;
 import org.apache.cloudstack.api.command.admin.user.MoveUserCmd;
-import org.apache.cloudstack.api.command.admin.user.RegisterCmd;
+import org.apache.cloudstack.api.command.admin.user.RegisterUserKeyCmd;
 import org.apache.cloudstack.api.command.admin.user.UpdateUserCmd;
 import org.apache.cloudstack.api.response.UserTwoFactorAuthenticationSetupResponse;
 import org.apache.cloudstack.auth.UserAuthenticator;
@@ -3123,7 +3123,7 @@ public UserTwoFactorAuthenticator getUserTwoFactorAuthenticationProvider(final S
     @Override
     @DB
     @ActionEvent(eventType = EventTypes.EVENT_REGISTER_FOR_SECRET_API_KEY, eventDescription = "register for the developer API keys")
-    public String[] createApiKeyAndSecretKey(RegisterCmd cmd) {
+    public String[] createApiKeyAndSecretKey(RegisterUserKeyCmd cmd) {
         Account caller = getCurrentCallingAccount();
         final Long userId = cmd.getId();