cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kelv...@apache.org
Subject git commit: updated refs/heads/vmsync to e7c3479
Date Mon, 24 Jun 2013 19:19:28 GMT
Updated Branches:
  refs/heads/vmsync 4254cb85c -> e7c34793f


Fix unit test issue in non-oss build, temporarily disable dipendency of external network-elements
like F5, NetScalar


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e7c34793
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e7c34793
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e7c34793

Branch: refs/heads/vmsync
Commit: e7c34793fe6057805ccc2439e9a05d0f1eb331da
Parents: 4254cb8
Author: Kelven Yang <kelveny@gmail.com>
Authored: Mon Jun 24 12:19:02 2013 -0700
Committer: Kelven Yang <kelveny@gmail.com>
Committed: Mon Jun 24 12:19:02 2013 -0700

----------------------------------------------------------------------
 client/pom.xml                                                  | 2 ++
 .../cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java    | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7c34793/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index ab758eb..047cef8 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -590,6 +590,7 @@
         </dependency>
       </dependencies>
     </profile>
+<!--  
     <profile>
       <id>netapp</id>
       <activation>
@@ -650,6 +651,7 @@
         </dependency>
       </dependencies>
     </profile>
+-->    
     <profile>
       <id>vmware</id>
       <activation>

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7c34793/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
index de08c93..f169fe5 100644
--- a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
+++ b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
@@ -32,6 +32,7 @@ import junit.framework.TestCase;
 
 import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd;
 import org.apache.cloudstack.api.command.admin.zone.RemoveVmwareDcCmd;
+import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.test.utils.SpringUtils;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -89,7 +90,7 @@ import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.AccountService;
 import com.cloud.user.AccountVO;
-import com.cloud.user.UserContext;
+import com.cloud.user.UserVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -175,7 +176,7 @@ public class VmwareDatacenterApiUnitTest {
         acct.setType(Account.ACCOUNT_TYPE_ADMIN);
         acct.setAccountName("admin");
         acct.setDomainId(domainId);
-        UserContext.registerContext(1, acct, null, true);
+        CallContext.register(new UserVO(1), new AccountVO(2L), null);
 
         when(_accountDao.findByIdIncludingRemoved(0L)).thenReturn(acct);
 


Mime
View raw message