diff --git a/core/src/com/cloud/network/resource/F5BigIpResource.java b/core/src/com/cloud/network/resource/F5BigIpResource.java index 2d3cd31cd7a..bd3a38dfb91 100644 --- a/core/src/com/cloud/network/resource/F5BigIpResource.java +++ b/core/src/com/cloud/network/resource/F5BigIpResource.java @@ -161,17 +161,17 @@ public class F5BigIpResource implements ServerResource { throw new ConfigurationException("Unable to find password"); } - _publicInterface = (String) params.get("publicInterface"); + _publicInterface = (String) params.get("publicinterface"); if (_publicInterface == null) { throw new ConfigurationException("Unable to find public interface"); } - _privateInterface = (String) params.get("privateInterface"); + _privateInterface = (String) params.get("privateinterface"); if (_privateInterface == null) { throw new ConfigurationException("Unable to find private interface"); } - _numRetries = NumbersUtil.parseInt((String) params.get("numRetries"), 1); + _numRetries = NumbersUtil.parseInt((String) params.get("numretries"), 1); _guid = (String)params.get("guid"); if (_guid == null) { diff --git a/core/src/com/cloud/network/resource/JuniperSrxResource.java b/core/src/com/cloud/network/resource/JuniperSrxResource.java index 5bf1d0da92b..d0393f82161 100644 --- a/core/src/com/cloud/network/resource/JuniperSrxResource.java +++ b/core/src/com/cloud/network/resource/JuniperSrxResource.java @@ -315,26 +315,26 @@ public class JuniperSrxResource implements ServerResource { throw new ConfigurationException("Unable to find password"); } - _publicInterface = (String) params.get("publicInterface"); + _publicInterface = (String) params.get("publicinterface"); if (_publicInterface == null) { throw new ConfigurationException("Unable to find public interface."); } - _usageInterface = (String) params.get("usageInterface"); + _usageInterface = (String) params.get("usageinterface"); - _privateInterface = (String) params.get("privateInterface"); + _privateInterface = (String) params.get("privateinterface"); if (_privateInterface == null) { throw new ConfigurationException("Unable to find private interface."); } - _publicZone = (String) params.get("publicZone"); + _publicZone = (String) params.get("publiczone"); if (_publicZone == null) { - throw new ConfigurationException("Unable to find public security zone."); + _publicZone = "untrust"; } - _privateZone = (String) params.get("privateZone"); + _privateZone = (String) params.get("privatezone"); if (_privateZone == null) { - throw new ConfigurationException("Unable to find private security zone."); + _privateZone = "trust"; } _guid = (String)params.get("guid"); @@ -342,9 +342,9 @@ public class JuniperSrxResource implements ServerResource { throw new ConfigurationException("Unable to find the guid"); } - _numRetries = NumbersUtil.parseInt((String) params.get("numRetries"), 1); + _numRetries = NumbersUtil.parseInt((String) params.get("numretries"), 1); - _timeoutInSeconds = NumbersUtil.parseInt((String) params.get("timeoutInSeconds"), 300); + _timeoutInSeconds = NumbersUtil.parseInt((String) params.get("timeout"), 300); _objectNameWordSep = "-"; diff --git a/core/src/com/cloud/network/resource/NetscalerResource.java b/core/src/com/cloud/network/resource/NetscalerResource.java index d9ac6aa434a..f7a337735da 100644 --- a/core/src/com/cloud/network/resource/NetscalerResource.java +++ b/core/src/com/cloud/network/resource/NetscalerResource.java @@ -122,17 +122,17 @@ public class NetscalerResource implements ServerResource { throw new ConfigurationException("Unable to find password"); } - _publicInterface = (String) params.get("publicInterface"); + _publicInterface = (String) params.get("publicinterface"); if (_publicInterface == null) { throw new ConfigurationException("Unable to find public interface"); } - _privateInterface = (String) params.get("privateInterface"); + _privateInterface = (String) params.get("privateinterface"); if (_privateInterface == null) { throw new ConfigurationException("Unable to find private interface"); } - _numRetries = NumbersUtil.parseInt((String) params.get("numRetries"), 2); + _numRetries = NumbersUtil.parseInt((String) params.get("numretries"), 2); _guid = (String)params.get("guid"); if (_guid == null) {