From fd2ec19438bc1c200e8dc0b15edbcee652587c87 Mon Sep 17 00:00:00 2001
From: anthony <anthony@cloud.com>
Date: Tue, 7 Jun 2011 14:41:05 -0700
Subject: [PATCH] bug 9351: xen.max.product.version is not used, remove them

status 9351: resolved fixed
---
 .../src/com/cloud/configuration/Config.java   |  6 ----
 .../xen/discoverer/XcpServerDiscoverer.java   | 28 +------------------
 2 files changed, 1 insertion(+), 33 deletions(-)

diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java
index 8a3da7257df..a914a19f351 100755
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -185,12 +185,6 @@ public enum Config {
     XenStorageNetwork2("Network", ManagementServer.class, String.class, "xen.storage.network.device2", "cloud-stor2", "Specify when there are storage networks", null),
     XenPrivateNetwork("Network", ManagementServer.class, String.class, "xen.private.network.device", null, "Specify when the private network name is different", null),
     NetworkGuestCidrLimit("Network", NetworkManager.class, Integer.class, "network.guest.cidr.limit", "22", "size limit for guest cidr; can't be less than this value", null),
-    XenMinVersion("Advanced", ManagementServer.class, String.class, "xen.min.version", "3.3.1", "Minimum Xen version", null),
-    XenProductMinVersion("Advanced", ManagementServer.class, String.class, "xen.min.product.version", "0.1.1", "Minimum XenServer version", null),
-	XenXapiMinVersion("Advanced", ManagementServer.class, String.class, "xen.min.xapi.version", "1.3", "Minimum Xapi Tool Stack version", null),
-    XenMaxVersion("Advanced", ManagementServer.class, String.class, "xen.max.version", "3.4.2", "Maximum Xen version", null),
-    XenProductMaxVersion("Advanced", ManagementServer.class, String.class, "xen.max.product.version", "5.6.0", "Maximum XenServer version", null),
-    XenXapiMaxVersion("Advanced", ManagementServer.class, String.class, "xen.max.xapi.version", "1.3", "Maximum Xapi Tool Stack version", null),
     XenSetupMultipath("Advanced", ManagementServer.class, String.class, "xen.setup.multipath", "false", "Setup the host to do multipath", null),
     XenBondStorageNic("Advanced", ManagementServer.class, String.class, "xen.bond.storage.nics", null, "Attempt to bond the two networks if found", null),
     XenHeartBeatInterval("Advanced", ManagementServer.class, Integer.class, "xen.heartbeat.interval", "60", "heartbeat to use when implementing XenServer Self Fencing", null),
diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 1f324c50da6..31ed7a57c98 100755
--- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -21,7 +21,6 @@ import java.net.InetAddress;
 import java.net.URI;
 import java.net.UnknownHostException;
 import java.util.HashMap;
-import java.util.LinkedHashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
@@ -97,12 +96,6 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
     protected boolean _checkHvm;
     protected String _guestNic;
     protected boolean _setupMultipath;
-    private String _minProductVersion;
-    private String _minXapiVersion;
-    private String _minXenVersion;
-    private String _maxProductVersion;
-    private String _maxXapiVersion;
-    private String _maxXenVersion;
     protected String _instance;
 
     @Inject protected AlertManager _alertMgr;
@@ -406,26 +399,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
         throw new RuntimeException(msg);
     }
     
-    protected void serverConfig() {
-        _minXenVersion = _params.get(Config.XenMinVersion.key());
-        if (_minXenVersion == null) {
-            _minXenVersion = "3.3.1";
-        }
-        
-        _minProductVersion = _params.get(Config.XenProductMinVersion.key());
-        if (_minProductVersion == null) {
-            _minProductVersion = "5.5.0";
-        }
-        
-        _minXapiVersion = _params.get(Config.XenXapiMinVersion.key());
-        if (_minXapiVersion == null) {
-            _minXapiVersion = "1.3";
-        }
-   
-        _maxXenVersion = _params.get(Config.XenMaxVersion.key());
-        _maxProductVersion = _params.get(Config.XenProductMaxVersion.key());
-        _maxXapiVersion = _params.get(Config.XenXapiMaxVersion.key());
-        
+    protected void serverConfig() {      
         String value = _params.get(Config.XenSetupMultipath.key());
         _setupMultipath = Boolean.parseBoolean(value);
     }