diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index 7603442c09d..b9b6829a39d 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -475,7 +475,6 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager { return attache; } - @Override public Answer sendToSecStorage(HostVO ssHost, Command cmd) { if( ssHost.getType() == Host.Type.LocalSecondaryStorage ) { @@ -505,6 +504,7 @@ public class AgentManagerImpl implements AgentManager, HandlerFactory, Manager { } return null; } + @Override public long sendToSecStorage(HostVO ssHost, Command cmd, Listener listener) { diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index a2f5a51e3e0..eb6aeb3792c 100644 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -375,7 +375,7 @@ public class ResourceManagerImpl implements ResourceManager, ResourceService, Ma String url = cmd.getUrl(); return discoverHostsFull(dcId, null, null, null, url, null, null, "SecondaryStorage", null, null, null); } - + private List discoverHostsFull(Long dcId, Long podId, Long clusterId, String clusterName, String url, String username, String password, String hypervisorType, List hostTags, Map params, String allocationState) throws IllegalArgumentException, DiscoveryException, InvalidParameterValueException { URI uri = null; diff --git a/ui/jsp/cluster.jsp b/ui/jsp/cluster.jsp index ac06222369e..9bd2c1dd7e3 100644 --- a/ui/jsp/cluster.jsp +++ b/ui/jsp/cluster.jsp @@ -199,6 +199,7 @@ dictionary = { +
  • diff --git a/ui/jsp/host.jsp b/ui/jsp/host.jsp index 8a7d1aa054d..38a0a80abf0 100644 --- a/ui/jsp/host.jsp +++ b/ui/jsp/host.jsp @@ -744,6 +744,7 @@ dictionary = {
    • +
  • diff --git a/ui/jsp/pod.jsp b/ui/jsp/pod.jsp index 0049e38c322..53a6f9cca2b 100644 --- a/ui/jsp/pod.jsp +++ b/ui/jsp/pod.jsp @@ -440,6 +440,8 @@ dictionary = {
    • + +
  • diff --git a/ui/jsp/resource.jsp b/ui/jsp/resource.jsp index 603224ef370..e8e263abdae 100644 --- a/ui/jsp/resource.jsp +++ b/ui/jsp/resource.jsp @@ -919,6 +919,7 @@
    • +
  • diff --git a/ui/jsp/zone.jsp b/ui/jsp/zone.jsp index 7e407935b8b..55238010d46 100644 --- a/ui/jsp/zone.jsp +++ b/ui/jsp/zone.jsp @@ -407,6 +407,7 @@ dictionary = {
    • +
  • diff --git a/ui/scripts/cloud.core.pod.js b/ui/scripts/cloud.core.pod.js index 7b84838e4d0..69126553c90 100644 --- a/ui/scripts/cloud.core.pod.js +++ b/ui/scripts/cloud.core.pod.js @@ -606,10 +606,14 @@ function bindAddHostButton($leftmenuItem1) { clusterObj = clustersUnderOnePod[clusterId]; hypervisor = clusterObj.hypervisortype; if(hypervisor == "VMware") { + + // for VMware, we can only add host to existing cluster, only host address is needed as of now +/* isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg")); isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg")); isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg")); isValid &= validateString("vCenter Datacenter", $thisDialog.find("#host_vcenter_dc"), $thisDialog.find("#host_vcenter_dc_errormsg")); +*/ isValid &= validateString("vCenter Host", $thisDialog.find("#host_vcenter_host"), $thisDialog.find("#host_vcenter_host_errormsg")); } else { if (hypervisor == "BareMetal") { @@ -638,6 +642,7 @@ function bindAddHostButton($leftmenuItem1) { array1.push("&hosttags=" + todb(trim($thisDialog.find("#host_tags").val()))); if(hypervisor == "VMware") { +/* var username = trim($thisDialog.find("#host_vcenter_username").val()); array1.push("&username="+todb(username)); @@ -647,7 +652,11 @@ function bindAddHostButton($leftmenuItem1) { var hostname = trim($thisDialog.find("#host_vcenter_address").val()); hostname += "/" + todb(trim($thisDialog.find("#host_vcenter_dc").val())); hostname += "/" + todb(trim($thisDialog.find("#host_vcenter_host").val())); - +*/ + array1.push("&username="); + array1.push("&password="); + var hostname = trim($thisDialog.find("#host_vcenter_host").val()); + var url; if(hostname.indexOf("http://")==-1) url = "http://" + hostname; diff --git a/ui/scripts/cloud.core.resource.js b/ui/scripts/cloud.core.resource.js index d088207dc95..8b36b593fd8 100644 --- a/ui/scripts/cloud.core.resource.js +++ b/ui/scripts/cloud.core.resource.js @@ -878,10 +878,12 @@ function initAddHostShortcut() { clusterObj = clustersUnderOnePod[clusterId]; hypervisor = clusterObj.hypervisortype; if(hypervisor == "VMware") { +/* isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg")); isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg")); isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg")); isValid &= validateString("vCenter Datacenter", $thisDialog.find("#host_vcenter_dc"), $thisDialog.find("#host_vcenter_dc_errormsg")); +*/ isValid &= validateString("vCenter Host", $thisDialog.find("#host_vcenter_host"), $thisDialog.find("#host_vcenter_host_errormsg")); } else { if (hypervisor == "BareMetal") { @@ -922,6 +924,7 @@ function initAddHostShortcut() { array1.push("&hosttags=" + todb(trim($thisDialog.find("#host_tags").val()))); if(hypervisor == "VMware") { +/* var username = trim($thisDialog.find("#host_vcenter_username").val()); array1.push("&username="+todb(username)); @@ -931,7 +934,11 @@ function initAddHostShortcut() { var hostname = trim($thisDialog.find("#host_vcenter_address").val()); hostname += "/" + trim($thisDialog.find("#host_vcenter_dc").val()); hostname += "/" + trim($thisDialog.find("#host_vcenter_host").val()); - +*/ + array1.push("&username="); + array1.push("&password="); + var hostname = trim($thisDialog.find("#host_vcenter_host").val()); + var url; if(hostname.indexOf("http://")==-1) url = "http://" + todb(hostname); diff --git a/ui/scripts/cloud.core.zone.js b/ui/scripts/cloud.core.zone.js index 30b22edc69e..0d2546d2ec2 100644 --- a/ui/scripts/cloud.core.zone.js +++ b/ui/scripts/cloud.core.zone.js @@ -795,10 +795,12 @@ function bindAddHostButtonOnZonePage($button, zoneId, zoneName) { clusterObj = clustersUnderOnePod[clusterId]; hypervisor = clusterObj.hypervisortype; if(hypervisor == "VMware") { +/* isValid &= validateString("vCenter Address", $thisDialog.find("#host_vcenter_address"), $thisDialog.find("#host_vcenter_address_errormsg")); isValid &= validateString("vCenter User", $thisDialog.find("#host_vcenter_username"), $thisDialog.find("#host_vcenter_username_errormsg")); isValid &= validateString("vCenter Password", $thisDialog.find("#host_vcenter_password"), $thisDialog.find("#host_vcenter_password_errormsg")); isValid &= validateString("vCenter Datacenter", $thisDialog.find("#host_vcenter_dc"), $thisDialog.find("#host_vcenter_dc_errormsg")); +*/ isValid &= validateString("vCenter Host", $thisDialog.find("#host_vcenter_host"), $thisDialog.find("#host_vcenter_host_errormsg")); } else { if (hypervisor == "BareMetal") { @@ -838,7 +840,8 @@ function bindAddHostButtonOnZonePage($button, zoneId, zoneName) { array1.push("&hosttags=" + todb(trim($thisDialog.find("#host_tags").val()))); if(hypervisor == "VMware") { - var username = trim($thisDialog.find("#host_vcenter_username").val()); +/* + var username = trim($thisDialog.find("#host_vcenter_username").val()); array1.push("&username="+todb(username)); var password = trim($thisDialog.find("#host_vcenter_password").val()); @@ -847,7 +850,11 @@ function bindAddHostButtonOnZonePage($button, zoneId, zoneName) { var hostname = trim($thisDialog.find("#host_vcenter_address").val()); hostname += "/" + trim($thisDialog.find("#host_vcenter_dc").val()); hostname += "/" + trim($thisDialog.find("#host_vcenter_host").val()); - +*/ + array1.push("&username="); + array1.push("&password="); + var hostname = trim($thisDialog.find("#host_vcenter_host").val()); + var url; if(hostname.indexOf("http://")==-1) url = "http://" + todb(hostname);