Fix compilation error due to cherry-pick CLOUDSTACK-6569.

minchen07 · minchen07 · commit 7f595778ada0 · 2014-05-02T16:01:13.000-07:00
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -1093,9 +1093,6 @@ public Volume attachVolumeToVM(Long vmId, Long volumeId, Long deviceId) {
             throw new InvalidParameterValueException("Please specify a VM that is in the same zone as the volume.");
         }
 
-        // permission check
-        _accountMgr.checkAccess(caller, null, true, volumeToAttach, vm);
-
         // Check that the device ID is valid
         if (deviceId != null) {
             // validate ROOT volume type
diff --git a/server/test/com/cloud/storage/VolumeApiServiceImplTest.java b/server/test/com/cloud/storage/VolumeApiServiceImplTest.java
@@ -27,6 +27,15 @@
 
 import javax.inject.Inject;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.rules.ExpectedException;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.MockitoAnnotations;
+
 import org.apache.cloudstack.acl.ControlledEntity;
 import org.apache.cloudstack.acl.SecurityChecker.AccessType;
 import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd;
@@ -39,14 +48,6 @@
 import org.apache.cloudstack.framework.jobs.impl.AsyncJobVO;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
 
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.hypervisor.Hypervisor.HypervisorType;
@@ -232,7 +233,7 @@ public void setup() throws Exception {
         }
 
         // helper methods mock
-        doNothing().when(_svc._accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(Boolean.class), any(ControlledEntity.class));
+        doNothing().when(_svc._accountMgr).checkAccess(any(Account.class), any(AccessType.class), any(ControlledEntity.class));
         doNothing().when(_svc._jobMgr).updateAsyncJobAttachment(any(Long.class), any(String.class), any(Long.class));
         when(_svc._jobMgr.submitAsyncJob(any(AsyncJobVO.class), any(String.class), any(Long.class))).thenReturn(1L);
     }

Original file line number	Diff line number	Diff line change
`@@ -1093,9 +1093,6 @@ public Volume attachVolumeToVM(Long vmId, Long volumeId, Long deviceId) {`
`1093`	`1093`	`throw new InvalidParameterValueException("Please specify a VM that is in the same zone as the volume.");`
`1094`	`1094`	`}`
`1095`	`1095`
`1096`		`- // permission check`
`1097`		`- _accountMgr.checkAccess(caller, null, true, volumeToAttach, vm);`
`1098`		`-`
`1099`	`1096`	`// Check that the device ID is valid`
`1100`	`1097`	`if (deviceId != null) {`
`1101`	`1098`	`// validate ROOT volume type`