You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ha...@apache.org on 2022/10/06 00:28:15 UTC
[cloudstack] 03/05: Fix compilation issues
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a commit to branch 2FA
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 61a9cbbddbc7d9ee896606e595e7436fea5e50d1
Author: Harikrishna Patnala <ha...@gmail.com>
AuthorDate: Wed Sep 21 13:10:22 2022 +0530
Fix compilation issues
---
.../network/contrail/management/MockAccountManager.java | 11 +++++++++++
server/src/main/java/com/cloud/user/AccountManagerImpl.java | 1 -
.../src/test/java/com/cloud/user/MockAccountManagerImpl.java | 11 +++++++++++
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
index f56689a4827..8605ae5fe5d 100644
--- a/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
+++ b/plugins/network-elements/juniper-contrail/src/test/java/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
@@ -27,6 +27,7 @@ import javax.naming.ConfigurationException;
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.MoveUserCmd;
+import org.apache.cloudstack.auth.UserTwoFactorAuthenticator;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.apache.log4j.Logger;
@@ -465,6 +466,16 @@ public class MockAccountManager extends ManagerBase implements AccountManager {
return null;
}
+ @Override
+ public List<UserTwoFactorAuthenticator> listUserTwoFactorAuthenticationProviders() {
+ return null;
+ }
+
+ @Override
+ public UserTwoFactorAuthenticator getUserTwoFactorAuthenticationProvider(Long domainId) {
+ return null;
+ }
+
@Override
public void checkAccess(User user, ControlledEntity entity)
throws PermissionDeniedException {
diff --git a/server/src/main/java/com/cloud/user/AccountManagerImpl.java b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
index c206c8c1c0b..599d27a1edb 100644
--- a/server/src/main/java/com/cloud/user/AccountManagerImpl.java
+++ b/server/src/main/java/com/cloud/user/AccountManagerImpl.java
@@ -60,7 +60,6 @@ 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.UpdateUserCmd;
import org.apache.cloudstack.auth.UserTwoFactorAuthenticator;
-import org.apache.cloudstack.backup.BackupProvider;
import org.apache.cloudstack.config.ApiServiceConfiguration;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
diff --git a/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java b/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java
index 8e2dc7dc54d..b6676efced7 100644
--- a/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java
+++ b/server/src/test/java/com/cloud/user/MockAccountManagerImpl.java
@@ -25,6 +25,7 @@ import javax.naming.ConfigurationException;
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.MoveUserCmd;
+import org.apache.cloudstack.auth.UserTwoFactorAuthenticator;
import org.apache.cloudstack.framework.config.ConfigKey;
import org.springframework.stereotype.Component;
@@ -434,6 +435,16 @@ public class MockAccountManagerImpl extends ManagerBase implements Manager, Acco
return null;
}
+ @Override
+ public List<UserTwoFactorAuthenticator> listUserTwoFactorAuthenticationProviders() {
+ return null;
+ }
+
+ @Override
+ public UserTwoFactorAuthenticator getUserTwoFactorAuthenticationProvider(Long domainId) {
+ return null;
+ }
+
@Override
public void checkAccess(User user, ControlledEntity entity)
throws PermissionDeniedException {