From 41f7c745bdb54aedd18982072b4361583613e9a5 Mon Sep 17 00:00:00 2001
From: Anthony Xu <anthony@mobl-ant.(none)>
Date: Wed, 18 Aug 2010 17:33:25 -0700
Subject: [PATCH] bug 5934: if it is standalone, give cluser name as
 Standalone-ip/name

status 5934: resolved fixed

Conflicts:

	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
---
 .../com/cloud/api/commands/AddHostCmd.java    |  7 +++++++
 .../xen/discoverer/XcpServerDiscoverer.java   | 19 +------------------
 2 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/server/src/com/cloud/api/commands/AddHostCmd.java b/server/src/com/cloud/api/commands/AddHostCmd.java
index 76271fb5311..faf3aa70f5c 100644
--- a/server/src/com/cloud/api/commands/AddHostCmd.java
+++ b/server/src/com/cloud/api/commands/AddHostCmd.java
@@ -75,6 +75,13 @@ public class AddHostCmd extends BaseCmd {
             throw new ServerApiException(BaseCmd.PARAM_ERROR, "Can't specify cluster by both id and name");
         }
         
+        if (clusterName == null && clusterId == null) {  
+               // Stand alone, assign a name to it
+               String[] stringarray = url.split("//");
+               String address = stringarray[stringarray.length - 1];
+               clusterName = "Standalone-" + address; 
+        }
+        
         if ((clusterName != null || clusterId != null) && podId == null) {
             throw new ServerApiException(BaseCmd.PARAM_ERROR, "Can't specify cluster without specifying the pod");
         }
diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
index 8b0e7bd280f..e7017710f9e 100644
--- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
+++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
@@ -81,7 +81,6 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
     protected String _privateNic;
     protected String _storageNic1;
     protected String _storageNic2;
-    protected boolean _formPoolsInPod;
     protected int _wait;
     protected XenServerConnectionPool _connPool;
     protected String _increase;
@@ -132,19 +131,6 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
             String cluster = null;
             if (clusterId != null) {
                 cluster = Long.toString(clusterId);
-            } else if (_formPoolsInPod) {
-                if (podId != null) {
-                    List<ClusterVO> clusters = _clusterDao.listByPodId(podId);
-                    if (clusters.size() > 1) {
-                        throw new DiscoveryException("There are more than one cluster in the pod and we don't know which to add to.");
-                    } else if (clusters.size() == 1) {
-                        clusterId = clusters.get(0).getId();
-                        cluster = Long.toString(clusterId);
-                    } else {
-                        Map<Pool, Pool.Record> pools = Pool.getAllRecords(conn);
-                        cluster = pools.values().iterator().next().uuid;
-                    }
-                }
             }
             
             Map<Host, Host.Record> hosts = Host.getAllRecords(conn);
@@ -300,7 +286,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
         if ( resources.size() == 0 ) {
             return false;
         }
-        if (clusterId == null && !_formPoolsInPod) {
+        if (clusterId == null ) {
             if (resources.size() > 1) {
                 s_logger.warn("There's no cluster specified but we found a pool of xenservers " + resources.size());
                 throw new DiscoveryException("There's no cluster specified but we found a pool of xenservers " + resources.size());
@@ -439,9 +425,6 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L
         value = _params.get("xen.check.hvm");
         _checkHvm = value == null ? true : Boolean.parseBoolean(value);
         
-        value = _params.get(Config.CreatePoolsInPod.key());
-        _formPoolsInPod = Boolean.parseBoolean(value);
-        
         _connPool = XenServerConnectionPool.getInstance();
         
         _agentMgr.registerForHostEvents(this, true, false, true);