Skip to content

Commit fe6f045

Browse files
author
Alex Huang
committed
fixed unit tests from merge
1 parent 10d9c01 commit fe6f045

513 files changed

Lines changed: 2336 additions & 1944 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/com/cloud/agent/api/proxy/StartConsoleProxyAgentHttpHandlerCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
package com.cloud.agent.api.proxy;
1818

1919
import com.cloud.agent.api.Command;
20-
import com.cloud.agent.api.LogLevel.Log4jLevel;
2120
import com.cloud.agent.api.LogLevel;
21+
import com.cloud.agent.api.LogLevel.Log4jLevel;
2222

2323
public class StartConsoleProxyAgentHttpHandlerCommand extends Command {
2424
@LogLevel(Log4jLevel.Off)

‎api/src/com/cloud/agent/api/storage/CreateEntityDownloadURLCommand.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
// under the License.
1717
package com.cloud.agent.api.storage;
1818

19-
import com.cloud.agent.api.Command;
2019

2120
public class CreateEntityDownloadURLCommand extends AbstractDownloadCommand {
2221

‎api/src/com/cloud/agent/api/storage/DownloadCommand.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818

1919
import java.net.URI;
2020

21-
import com.cloud.storage.Volume;
21+
import org.apache.cloudstack.api.InternalIdentity;
22+
2223
import com.cloud.storage.Storage.ImageFormat;
24+
import com.cloud.storage.Volume;
2325
import com.cloud.template.VirtualMachineTemplate;
24-
import org.apache.cloudstack.api.InternalIdentity;
2526

2627

2728
public class DownloadCommand extends AbstractDownloadCommand implements InternalIdentity {

‎api/src/com/cloud/agent/api/storage/ListTemplateAnswer.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.util.Map;
2020

2121
import com.cloud.agent.api.Answer;
22-
2322
import com.cloud.storage.template.TemplateInfo;
2423

2524
public class ListTemplateAnswer extends Answer {

‎api/src/com/cloud/agent/api/storage/ListVolumeCommand.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
// under the License.
1717
package com.cloud.agent.api.storage;
1818

19-
import com.cloud.agent.api.LogLevel;
20-
import com.cloud.agent.api.LogLevel.Log4jLevel;
21-
import com.cloud.agent.api.to.SwiftTO;
2219

2320
public class ListVolumeCommand extends StorageCommand {
2421

‎api/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
// under the License.
1717
package com.cloud.agent.api.storage;
1818

19-
import com.cloud.storage.Storage.ImageFormat;
2019
import com.cloud.agent.api.to.StorageFilerTO;
20+
import com.cloud.storage.Storage.ImageFormat;
2121
import com.cloud.storage.StoragePool;
2222

2323
/**

‎api/src/com/cloud/agent/api/storage/ResizeVolumeCommand.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import com.cloud.agent.api.Command;
2020
import com.cloud.agent.api.to.StorageFilerTO;
21-
import com.cloud.storage.StoragePool;
2221

2322
public class ResizeVolumeCommand extends Command {
2423
private String path;

‎api/src/com/cloud/agent/api/storage/UploadCommand.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@
1616
// under the License.
1717
package com.cloud.agent.api.storage;
1818

19+
import org.apache.cloudstack.api.InternalIdentity;
20+
1921
import com.cloud.agent.api.storage.DownloadCommand.PasswordAuth;
2022
import com.cloud.agent.api.to.TemplateTO;
2123
import com.cloud.storage.Upload.Type;
2224
import com.cloud.template.VirtualMachineTemplate;
23-
import org.apache.cloudstack.api.InternalIdentity;
2425

2526

2627
public class UploadCommand extends AbstractUploadCommand implements InternalIdentity {

‎api/src/com/cloud/agent/api/to/FirewallRuleTO.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
import java.util.ArrayList;
2020
import java.util.List;
2121

22+
import org.apache.cloudstack.api.InternalIdentity;
23+
2224
import com.cloud.network.rules.FirewallRule;
2325
import com.cloud.network.rules.FirewallRule.State;
2426
import com.cloud.utils.net.NetUtils;
25-
import org.apache.cloudstack.api.InternalIdentity;
2627

2728
/**
2829
* FirewallRuleTO transfers a port range for an ip to be opened.

‎api/src/com/cloud/agent/api/to/NetworkACLTO.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,11 @@
2020
import java.util.ArrayList;
2121
import java.util.List;
2222

23+
import org.apache.cloudstack.api.InternalIdentity;
24+
2325
import com.cloud.network.rules.FirewallRule;
2426
import com.cloud.network.rules.FirewallRule.TrafficType;
2527
import com.cloud.utils.net.NetUtils;
26-
import org.apache.cloudstack.api.InternalIdentity;
2728

2829

2930
public class NetworkACLTO implements InternalIdentity {

0 commit comments

Comments
 (0)