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

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>

core/src/com/cloud/agent/api/ModifyStoragePoolAnswer.java

@@ -24,41 +24,41 @@ import java.util.Map;
 import com.cloud.storage.template.TemplateProp;
 
 public class ModifyStoragePoolAnswer extends Answer {
-    private StoragePoolInfo _poolInfo;
-    private Map<String, TemplateProp> _templateInfo;
-    private String _localDatastoreName;
+    private StoragePoolInfo poolInfo;
+    private Map<String, TemplateProp> templateInfo;
+    private String localDatastoreName;
 
     public ModifyStoragePoolAnswer(ModifyStoragePoolCommand cmd, long capacityBytes, long availableBytes, Map<String, TemplateProp> tInfo) {
         super(cmd);
 
         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) {
-        _poolInfo = poolInfo;
+        this.poolInfo = poolInfo;
     }
 
     public StoragePoolInfo getPoolInfo() {
-        return _poolInfo;
+        return poolInfo;
     }
 
     public void setTemplateInfo(Map<String, TemplateProp> templateInfo) {
-        _templateInfo = templateInfo;
+        this.templateInfo = templateInfo;
     }
 
     public Map<String, TemplateProp> getTemplateInfo() {
-        return _templateInfo;
+        return templateInfo;
     }
 
     public void setLocalDatastoreName(String localDatastoreName) {
-        _localDatastoreName = localDatastoreName;
+        this.localDatastoreName = localDatastoreName;
     }
 
     public String getLocalDatastoreName() {
-        return _localDatastoreName;
+        return localDatastoreName;
     }
 }

core/src/com/cloud/agent/api/ModifyStoragePoolCommand.java

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

core/src/com/cloud/agent/api/ModifyTargetsCommand.java

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