From 883e2cf8307e83cb7d6e91d378e134c14b98a536 Mon Sep 17 00:00:00 2001 From: Murali reddy Date: Mon, 26 Mar 2012 15:44:20 +0530 Subject: [PATCH] Revert "bug 14463: Failed to Deploy VM due to failure in creation of guest VLAN on SRX" This reverts commit c9be61adcb90a8ac615baab34dfceec9cddfa6fc. --- .../network/resource/JuniperSrxResource.java | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/com/cloud/network/resource/JuniperSrxResource.java b/core/src/com/cloud/network/resource/JuniperSrxResource.java index be972abd161..3d680c29a39 100644 --- a/core/src/com/cloud/network/resource/JuniperSrxResource.java +++ b/core/src/com/cloud/network/resource/JuniperSrxResource.java @@ -88,19 +88,19 @@ public class JuniperSrxResource implements ServerResource { private BufferedReader _fromSrx; private PrintWriter _UsagetoSrx; private BufferedReader _UsagefromSrx; - private Integer _numRetries; - private Integer _timeoutInSeconds; - private String _publicZone; - private String _privateZone; - private String _publicInterface; - private String _usageInterface; - private String _privateInterface; - private String _ikeProposalName; - private String _ipsecPolicyName; - private String _primaryDnsAddress; - private String _ikeGatewayHostname; - private String _vpnObjectPrefix; - private final Logger s_logger = Logger.getLogger(JuniperSrxResource.class); + private static Integer _numRetries; + private static Integer _timeoutInSeconds; + private static String _publicZone; + private static String _privateZone; + private static String _publicInterface; + private static String _usageInterface; + private static String _privateInterface; + private static String _ikeProposalName; + private static String _ipsecPolicyName; + private static String _primaryDnsAddress; + private static String _ikeGatewayHostname; + private static String _vpnObjectPrefix; + private static final Logger s_logger = Logger.getLogger(JuniperSrxResource.class); private enum SrxXml { LOGIN("login.xml"),