diff --git a/api/src/com/cloud/api/response/ClusterResponse.java b/api/src/com/cloud/api/response/ClusterResponse.java
index 229acfbcd41..734b70b8aa1 100644
--- a/api/src/com/cloud/api/response/ClusterResponse.java
+++ b/api/src/com/cloud/api/response/ClusterResponse.java
@@ -40,6 +40,9 @@ public class ClusterResponse extends BaseResponse {
@SerializedName("zonename") @Param(description="the Zone name of the cluster")
private String zoneName;
+ @SerializedName("clustertype") @Param(description="the type of the cluster")
+ private String clusterType;
+
public Long getId() {
return id;
}
@@ -87,4 +90,12 @@ public class ClusterResponse extends BaseResponse {
public void setZoneName(String zoneName) {
this.zoneName = zoneName;
}
+
+ public String getClusterType() {
+ return clusterType;
+ }
+
+ public void setClusterType(String clusterType) {
+ this.clusterType = clusterType;
+ }
}
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index a92f975f98e..14da56cf983 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -18,6 +18,7 @@ label.add=Add
label.add.zone=Add Zone
label.adding.zone=Adding Zone
label.add.host=Add Host
+label.add.cluster=Add External Cluster
label.add.primarystorage=Add Primary Storage
label.add.secondarystorage=Add Secondary Storage
label.add.pod=Add Pod
diff --git a/client/WEB-INF/classes/resources/messages_en.properties b/client/WEB-INF/classes/resources/messages_en.properties
index a92f975f98e..14da56cf983 100644
--- a/client/WEB-INF/classes/resources/messages_en.properties
+++ b/client/WEB-INF/classes/resources/messages_en.properties
@@ -18,6 +18,7 @@ label.add=Add
label.add.zone=Add Zone
label.adding.zone=Adding Zone
label.add.host=Add Host
+label.add.cluster=Add External Cluster
label.add.primarystorage=Add Primary Storage
label.add.secondarystorage=Add Secondary Storage
label.add.pod=Add Pod
diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in
index 7271217d0f8..68ace2d04a9 100755
--- a/client/tomcatconf/commands.properties.in
+++ b/client/tomcatconf/commands.properties.in
@@ -166,6 +166,8 @@ listCapacity=com.cloud.api.commands.ListCapacityCmd;1
#### host commands
addHost=com.cloud.api.commands.AddHostCmd;1
+addExternalCluster=com.cloud.api.commands.AddExternalClusterCmd;1
+add=com.cloud.api.commands.AddHostCmd;1
reconnectHost=com.cloud.api.commands.ReconnectHostCmd;1
updateHost=com.cloud.api.commands.UpdateHostCmd;1
deleteHost=com.cloud.api.commands.DeleteHostCmd;1
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 7bf21431960..76f3c0688c8 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -863,6 +863,7 @@ public class ApiResponseHelper implements ResponseGenerator {
clusterResponse.setName(cluster.getName());
clusterResponse.setPodId(cluster.getPodId());
clusterResponse.setZoneId(cluster.getDataCenterId());
+ clusterResponse.setClusterType(cluster.getClusterType().toString());
HostPodVO pod = ApiDBUtils.findPodById(cluster.getPodId());
clusterResponse.setPodName(pod.getName());
DataCenterVO zone = ApiDBUtils.findZoneById(cluster.getDataCenterId());
diff --git a/ui/index.jsp b/ui/index.jsp
index 968df397690..23a2a86dc79 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -186,7 +186,16 @@