1818//
1919package org .apache .cloudstack .diagnostics ;
2020
21- import com .cloud .agent .AgentManager ;
22- import com .cloud .agent .api .Answer ;
23- import com .cloud .agent .api .routing .NetworkElementCommand ;
24- import com .cloud .exception .InvalidParameterValueException ;
25- import com .cloud .hypervisor .Hypervisor ;
26- import com .cloud .server .StatsCollector ;
27- import com .cloud .utils .exception .CloudRuntimeException ;
28- import com .cloud .vm .VMInstanceVO ;
29- import com .cloud .vm .VirtualMachine ;
30- import com .cloud .vm .VirtualMachineManager ;
31- import com .cloud .vm .dao .VMInstanceDao ;
32- import junit .framework .TestCase ;
21+ import java .util .HashMap ;
22+ import java .util .Map ;
23+
3324import org .apache .cloudstack .api .ApiConstants ;
34- import org .apache .cloudstack .api .command .admin .diagnostics .GetDiagnosticsDataCmd ;
3525import org .apache .cloudstack .api .command .admin .diagnostics .RunDiagnosticsCmd ;
3626import org .apache .cloudstack .engine .orchestration .service .NetworkOrchestrationService ;
37- import org .apache .cloudstack .engine .subsystem .api .storage .DataStore ;
38- import org .apache .cloudstack .engine .subsystem .api .storage .DataStoreManager ;
39- import org .apache .cloudstack .engine .subsystem .api .storage .ZoneScope ;
40- import org .apache .cloudstack .storage .image .datastore .ImageStoreEntity ;
41- import org .apache .cxf .management .annotation .ManagedOperationParameter ;
4227import org .junit .After ;
4328import org .junit .Before ;
4429import org .junit .Test ;
4833import org .mockito .Mockito ;
4934import org .mockito .runners .MockitoJUnitRunner ;
5035
51- import java .util .ArrayList ;
52- import java .util .HashMap ;
53- import java .util .List ;
54- import java .util .Map ;
36+ import com .cloud .agent .AgentManager ;
37+ import com .cloud .agent .api .routing .NetworkElementCommand ;
38+ import com .cloud .exception .InvalidParameterValueException ;
39+ import com .cloud .utils .exception .CloudRuntimeException ;
40+ import com .cloud .vm .VMInstanceVO ;
41+ import com .cloud .vm .VirtualMachine ;
42+ import com .cloud .vm .VirtualMachineManager ;
43+ import com .cloud .vm .dao .VMInstanceDao ;
44+
45+ import junit .framework .TestCase ;
5546
5647@ RunWith (MockitoJUnitRunner .class )
5748public class DiagnosticsServiceImplTest extends TestCase {
@@ -71,20 +62,6 @@ public class DiagnosticsServiceImplTest extends TestCase {
7162 @ Mock
7263 private NetworkOrchestrationService networkManager ;
7364
74- // Get Diagnostics Data additions
75- @ Mock
76- private GetDiagnosticsDataCmd getDiagnosticsDataCmd ;
77- @ Mock
78- private DataStoreManager storeMgr ;
79- @ Mock
80- private DataStore store ;
81- @ Mock
82- private StatsCollector statsCollector ;
83- @ Mock
84- private PrepareFilesCommand filesCommand ;
85- @ Mock
86- private ImageStoreEntity storeEntity ;
87-
8865 @ InjectMocks
8966 private DiagnosticsServiceImpl serviceImpl = new DiagnosticsServiceImpl ();
9067
@@ -94,14 +71,6 @@ public void setUp() throws Exception {
9471 Mockito .when (runDiagnosticsCmd .getType ()).thenReturn (DiagnosticsType .PING );
9572 Mockito .when (instanceDao .findByIdTypes (Mockito .anyLong (), Mockito .any (VirtualMachine .Type .class ),
9673 Mockito .any (VirtualMachine .Type .class ), Mockito .any (VirtualMachine .Type .class ))).thenReturn (vmInstanceVO );
97-
98- // GetDiagnosticsDataCmd
99- Map <String , String > accessDetailsMap = new HashMap <>();
100- accessDetailsMap .put (NetworkElementCommand .ROUTER_IP , "169.20.175.10" );
101- Mockito .when (networkManager .getSystemVMAccessDetails (Mockito .any (VMInstanceVO .class ))).thenReturn (accessDetailsMap );
102- Mockito .when (getDiagnosticsDataCmd .getId ()).thenReturn (1L );
103- Mockito .when (vmInstanceVO .getHostId ()).thenReturn (1L );
104-
10574 }
10675
10776 @ After
@@ -225,49 +194,4 @@ public void testValidCharsInParams() throws Exception {
225194 assertTrue (serviceImpl .hasValidChars ("-c 5 -4" ));
226195 assertTrue (serviceImpl .hasValidChars ("-c 5 -4 -AbDfhqUV" ));
227196 }
228-
229- @ Test
230- public void testGetDiagnosticsDataCommandFromDefaults () {
231- Mockito .when (getDiagnosticsDataCmd .getFilesList ()).thenReturn (null );
232- Mockito .when (vmInstanceVO .getType ()).thenReturn (VirtualMachine .Type .ConsoleProxy );
233- List <DataStore > mockList = new ArrayList <>();
234- mockList .add (store );
235- mockList .add (store );
236- mockList .add (store );
237- Mockito .when (storeMgr .getImageStoresByScope (Mockito .any (ZoneScope .class ))).thenReturn (mockList );
238-
239- Long zoneId = 2L ;
240-
241- Mockito .when (vmInstanceVO .getDataCenterId ()).thenReturn (zoneId );
242-
243- Mockito .when (statsCollector .imageStoreHasEnoughCapacity (store , serviceImpl .DiskQuotaPercentageThreshold .value ())).thenReturn (true );
244-
245- List <VMInstanceVO > ssvmList = new ArrayList <>();
246- ssvmList .add (vmInstanceVO );
247- Mockito .when (instanceDao .listByZoneIdAndType (zoneId , VirtualMachine .Type .SecondaryStorageVm )).thenReturn (ssvmList );
248- // Get Default Files from global settings
249- List <String > fileList = DiagnosticsFilesListFactory .getDiagnosticsFilesList (getDiagnosticsDataCmd .getFilesList (),
250- vmInstanceVO ).generateFileList ();
251-
252- String zipFile = "/root/diagnostics_xxxx.tar\n " ;
253-
254- // Mock Agent Answer
255- Mockito .when (agentManager .easySend (Mockito .anyLong (), Mockito .any (PrepareFilesCommand .class ))).thenReturn (new Answer (filesCommand , true , zipFile ));
256-
257- Mockito .when (vmInstanceVO .getHypervisorType ()).thenReturn (Hypervisor .HypervisorType .KVM );
258-
259- String url = serviceImpl .getDiagnosticsDataCommand (getDiagnosticsDataCmd );
260- }
261-
262- @ Test
263- public void getSystemVMInstance () {
264- }
265-
266- @ Test
267- public void prepareNetworkElementCommand () {
268- }
269-
270- @ Test
271- public void getVMSshIp () {
272- }
273197}
0 commit comments