apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1556 from mike-tutkowski/change-var-names-back

Browse Source 
Hyper-V communication broken by change in variable namesChange variable names back to fix communication with Hyper-V Agent:

https://issues.apache.org/jira/browse/CLOUDSTACK-9383

* pr/1556:
  Removing “_” from the front of member variables in “Command” classes

Signed-off-by: Will Stevens <williamstevens@gmail.com>
This commit is contained in:
Will Stevens 2016-05-25 23:01:22 -04:00
commit 08d04e6de5
3 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java
View File

@ -24,41 +24,41 @@ import java.util.Map;
import com.cloud.storage.template.TemplateProp; import com.cloud.storage.template.TemplateProp;
public class ModifyStoragePoolAnswer extends Answer { public class ModifyStoragePoolAnswer extends Answer {
private StoragePoolInfo _poolInfo; private StoragePoolInfo poolInfo;
private Map<String, TemplateProp> _templateInfo; private Map<String, TemplateProp> templateInfo;
private String _localDatastoreName; private String localDatastoreName;
public ModifyStoragePoolAnswer(ModifyStoragePoolCommand cmd, long capacityBytes, long availableBytes, Map<String, TemplateProp> tInfo) { public ModifyStoragePoolAnswer(ModifyStoragePoolCommand cmd, long capacityBytes, long availableBytes, Map<String, TemplateProp> tInfo) {
super(cmd); super(cmd);
result = true; result = true;
_poolInfo = new StoragePoolInfo(null, cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(), cmd.getPool().getType(), capacityBytes, availableBytes); poolInfo = new StoragePoolInfo(null, cmd.getPool().getHost(), cmd.getPool().getPath(), cmd.getLocalPath(), cmd.getPool().getType(), capacityBytes, availableBytes);
_templateInfo = tInfo; templateInfo = tInfo;
} }
public void setPoolInfo(StoragePoolInfo poolInfo) { public void setPoolInfo(StoragePoolInfo poolInfo) {
_poolInfo = poolInfo; this.poolInfo = poolInfo;
} }
public StoragePoolInfo getPoolInfo() { public StoragePoolInfo getPoolInfo() {
return _poolInfo; return poolInfo;
} }
public void setTemplateInfo(Map<String, TemplateProp> templateInfo) { public void setTemplateInfo(Map<String, TemplateProp> templateInfo) {
_templateInfo = templateInfo; this.templateInfo = templateInfo;
} }
public Map<String, TemplateProp> getTemplateInfo() { public Map<String, TemplateProp> getTemplateInfo() {
return _templateInfo; return templateInfo;
} }
public void setLocalDatastoreName(String localDatastoreName) { public void setLocalDatastoreName(String localDatastoreName) {
_localDatastoreName = localDatastoreName; this.localDatastoreName = localDatastoreName;
} }
public String getLocalDatastoreName() { public String getLocalDatastoreName() {
return _localDatastoreName; return localDatastoreName;
} }
} }

26
core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java
View File

@ -28,15 +28,15 @@ import com.cloud.storage.StoragePool;
public class ModifyStoragePoolCommand extends Command { public class ModifyStoragePoolCommand extends Command {
public static final String LOCAL_PATH_PREFIX = "/mnt/"; public static final String LOCAL_PATH_PREFIX = "/mnt/";
private boolean _add; private boolean add;
private StorageFilerTO _pool; private StorageFilerTO pool;
private String _localPath; private String localPath;
private String _storagePath; private String storagePath;
public ModifyStoragePoolCommand(boolean add, StoragePool pool, String localPath) { public ModifyStoragePoolCommand(boolean add, StoragePool pool, String localPath) {
_add = add; this.add = add;
_pool = new StorageFilerTO(pool); this.pool = new StorageFilerTO(pool);
_localPath = localPath; this.localPath = localPath;
} }
public ModifyStoragePoolCommand(boolean add, StoragePool pool) { public ModifyStoragePoolCommand(boolean add, StoragePool pool) {
@ -44,27 +44,27 @@ public class ModifyStoragePoolCommand extends Command {
} }
public boolean getAdd() { public boolean getAdd() {
return _add; return add;
} }
public void setPool(StoragePool pool) { public void setPool(StoragePool pool) {
_pool = new StorageFilerTO(pool); this.pool = new StorageFilerTO(pool);
} }
public StorageFilerTO getPool() { public StorageFilerTO getPool() {
return _pool; return pool;
} }
public String getLocalPath() { public String getLocalPath() {
return _localPath; return localPath;
} }
public void setStoragePath(String storagePath) { public void setStoragePath(String storagePath) {
_storagePath = storagePath; this.storagePath = storagePath;
} }
public String getStoragePath() { public String getStoragePath() {
return _storagePath; return storagePath;
} }
@Override @Override

12
core/src/com/cloud/agent/api/ModifyTargetsCommand.java
View File

@ -31,23 +31,23 @@ public class ModifyTargetsCommand extends Command {
public static final String MUTUAL_CHAP_NAME = "mutualChapName"; public static final String MUTUAL_CHAP_NAME = "mutualChapName";
public static final String MUTUAL_CHAP_SECRET = "mutualChapSecret"; public static final String MUTUAL_CHAP_SECRET = "mutualChapSecret";
private boolean _add; private boolean add;
private List<Map<String, String>> _targets; private List<Map<String, String>> targets;
public void setAdd(boolean add) { public void setAdd(boolean add) {
_add = add; this.add = add;
} }
public boolean getAdd() { public boolean getAdd() {
return _add; return add;
} }
public void setTargets(List<Map<String, String>> targets) { public void setTargets(List<Map<String, String>> targets) {
_targets = targets; this.targets = targets;
} }
public List<Map<String, String>> getTargets() { public List<Map<String, String>> getTargets() {
return _targets; return targets;
} }
@Override @Override