etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1) Fixed AddHost, AddSecondaryStorage, UpdateIso, UpdateTemplate to return correct command name. 

2) Added missing accessors getFormat and isPasswordEnabled to UpdateTemplateOrIso abstract class.
This commit is contained in:
alena 2010-08-18 21:03:31 -07:00
parent 4c86af9901
commit 78846ec4eb
5 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/src/com/cloud/api/commands/AddHostCmd.java
View File

@ -30,7 +30,13 @@ public class AddHostCmd extends AddHostOrStorageCmd {
public static final Logger s_logger = Logger.getLogger(AddHostCmd.class.getName());
private static final String s_name = "addhostresponse";
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
public String getName() {
return s_name;
}
/*
@Override
public List<Pair<String, Object>> execute(Map<String, Object> params)

12
server/src/com/cloud/api/commands/AddHostOrStorageCmd.java
View File

@ -28,7 +28,6 @@ import com.cloud.api.Parameter;
@Implementation(method="discoverHosts", manager=Manager.AgentManager)
public abstract class AddHostOrStorageCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddHostOrStorageCmd.class.getName());
private static final String s_name = "addhostorstorageresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -87,16 +86,5 @@ public abstract class AddHostOrStorageCmd extends BaseCmd {
public Long getZoneId() {
return zoneId;
}
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
return s_name;
}
}

9
server/src/com/cloud/api/commands/AddSecondaryStorageCmd.java
View File

@ -54,6 +54,15 @@ public class AddSecondaryStorageCmd extends AddHostOrStorageCmd {
public String getUsername() {
return null;
}
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
public String getName() {
return s_name;
}
/*
@Override

10
server/src/com/cloud/api/commands/UpdateIsoCmd.java
View File

@ -40,6 +40,16 @@ public class UpdateIsoCmd extends UpdateTemplateOrIsoCmd {
public String getFormat() {
return null;
}
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
return s_name;
}
// @Override

22
server/src/com/cloud/api/commands/UpdateTemplateOrIsoCmd.java
View File

@ -28,7 +28,6 @@ import com.cloud.api.Parameter;
@Implementation(method="updateTemplate", manager=Manager.ManagementServer)
public abstract class UpdateTemplateOrIsoCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName());
private static final String s_name = "updatetemplateorisoresponse";
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////
@ -48,6 +47,12 @@ public abstract class UpdateTemplateOrIsoCmd extends BaseCmd {
@Parameter(name="ostypeid", type=CommandType.LONG)
private Long osTypeId;
@Parameter(name="format", type=CommandType.STRING)
private String format;
@Parameter(name="passwordenabled", type=CommandType.BOOLEAN)
private Boolean passwordEnabled;
/////////////////////////////////////////////////////
/////////////////// Accessors ///////////////////////
@ -72,14 +77,13 @@ public abstract class UpdateTemplateOrIsoCmd extends BaseCmd {
public Long getOsTypeId() {
return osTypeId;
}
/////////////////////////////////////////////////////
/////////////// API Implementation///////////////////
/////////////////////////////////////////////////////
@Override
public String getName() {
return s_name;
public Boolean isPasswordEnabled() {
return passwordEnabled;
}
public String getFormat() {
return format;
}
}