Skip to content

Commit d206fcb

Browse files
Cleanups and formatting
1 parent 4c65259 commit d206fcb

File tree

8 files changed

+211
-298
lines changed

8 files changed

+211
-298
lines changed

plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java

Lines changed: 65 additions & 73 deletions
Large diffs are not rendered by default.

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/CitrixResourceBaseTest.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ public void actualIsoTemplateTestXenServer71() throws XenAPIException, XmlRpcExc
181181

182182
Assert.assertEquals("guest-tools.iso", returnedIsoTemplateName);
183183
}
184-
184+
185185
@Test
186186
public void getAllLocalSrForTypeTest() throws Exception {
187187
String mockHostUuid = "hostUuid";
@@ -226,14 +226,14 @@ public void getAllLocalSrForTypeTest() throws Exception {
226226
Assert.assertEquals(expectedListOfSrs.size(), allLocalSrForType.size());
227227
Assert.assertEquals(expectedListOfSrs.get(0), allLocalSrForType.get(0));
228228
}
229-
229+
230230
@Test
231231
public void getAllLocalSrForTypeNoSrsFoundTest() throws XenAPIException, XmlRpcException {
232232
Connection connectionMock = Mockito.mock(Connection.class);
233233
List<SR> allLocalSrForType = citrixResourceBase.getAllLocalSrForType(connectionMock, SRType.EXT);
234234
Assert.assertTrue(allLocalSrForType.isEmpty());
235235
}
236-
236+
237237
@Test
238238
public void getAllLocalSrsTest() throws XenAPIException, XmlRpcException {
239239
Connection connectionMock = Mockito.mock(Connection.class);
@@ -259,7 +259,6 @@ public void getAllLocalSrsTest() throws XenAPIException, XmlRpcException {
259259
inOrder.verify(citrixResourceBase).getAllLocalSrForType(connectionMock, SRType.EXT);
260260
}
261261

262-
263262
@Test
264263
public void createStoragePoolInfoTest() throws XenAPIException, XmlRpcException {
265264
Connection connectionMock = Mockito.mock(Connection.class);
@@ -343,7 +342,7 @@ public void createStartUpStorageCommandTest() throws XenAPIException, XmlRpcExce
343342
Assert.assertEquals(citrixResourceBase._dcId + "", startUpStorageCommand.getDataCenter());
344343
Assert.assertEquals(StorageResourceType.STORAGE_POOL, startUpStorageCommand.getResourceType());
345344
}
346-
345+
347346
@Test
348347
public void initializeLocalSrTest() throws XenAPIException, XmlRpcException {
349348
Connection connectionMock = Mockito.mock(Connection.class);

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpOssResourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public void testPatchFilePath() {
4242
}
4343

4444
@Test(expected = CloudRuntimeException.class)
45-
public void testGetFiles(){
45+
public void testGetFiles() {
4646
testGetPathFilesExeption();
4747
}
4848

4949
@Test
50-
public void testGetFilesListReturned(){
50+
public void testGetFilesListReturned() {
5151
testGetPathFilesListReturned();
5252
}
5353
}

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XcpServerResourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public void testPatchFilePath() {
4242
}
4343

4444
@Test(expected = CloudRuntimeException.class)
45-
public void testGetFilesExeption(){
45+
public void testGetFilesExeption() {
4646
testGetPathFilesExeption();
4747
}
4848

4949
@Test
50-
public void testGetFilesListReturned(){
50+
public void testGetFilesListReturned() {
5151
testGetPathFilesListReturned();
5252
}
5353
}

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56FP1ResourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public void testPatchFilePath() {
4242
}
4343

4444
@Test(expected = CloudRuntimeException.class)
45-
public void testGetFiles(){
45+
public void testGetFiles() {
4646
testGetPathFilesExeption();
4747
}
4848

4949
@Test
50-
public void testGetFilesListReturned(){
50+
public void testGetFilesListReturned() {
5151
testGetPathFilesListReturned();
5252
}
5353
}

plugins/hypervisors/xenserver/src/test/java/com/cloud/hypervisor/xenserver/resource/XenServer56ResourceTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ public void testPatchFilePath() {
4242
}
4343

4444
@Test(expected = CloudRuntimeException.class)
45-
public void testGetFiles(){
45+
public void testGetFiles() {
4646
testGetPathFilesExeption();
4747
}
4848

4949
@Test
50-
public void testGetFilesListReturned(){
50+
public void testGetFilesListReturned() {
5151
testGetPathFilesListReturned();
5252
}
5353
}

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

Lines changed: 53 additions & 87 deletions
Large diffs are not rendered by default.

server/src/main/java/com/cloud/storage/StorageManagerImpl.java

Lines changed: 81 additions & 125 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)