etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 9078: You will only see VMs with Virtual Network support when adding port forwarding and lb rules.

This commit is contained in:
will 2011-03-21 13:59:59 -07:00
parent 197a09f29d
commit 5a5bdc485c
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
server/src/com/cloud/api/commands/ListVMsCmd.java
View File

@ -32,6 +32,7 @@ import com.cloud.async.AsyncJobVO;
import com.cloud.domain.DomainVO; import com.cloud.domain.DomainVO;
import com.cloud.host.HostVO; import com.cloud.host.HostVO;
import com.cloud.server.Criteria; import com.cloud.server.Criteria;
import com.cloud.service.ServiceOffering;
import com.cloud.service.ServiceOfferingVO; import com.cloud.service.ServiceOfferingVO;
import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateVO;
import com.cloud.user.Account; import com.cloud.user.Account;
@ -52,6 +53,7 @@ public class ListVMsCmd extends BaseCmd {
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ZONE_ID, Boolean.FALSE)); s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ZONE_ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.POD_ID, Boolean.FALSE)); s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.POD_ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.HOST_ID, Boolean.FALSE)); s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.HOST_ID, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.FOR_VIRTUAL_NETWORK, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.KEYWORD, Boolean.FALSE)); s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.KEYWORD, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ACCOUNT, Boolean.FALSE)); s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.ACCOUNT, Boolean.FALSE));
s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.DOMAIN_ID, Boolean.FALSE)); s_properties.add(new Pair<Enum, Boolean>(BaseCmd.Properties.DOMAIN_ID, Boolean.FALSE));
@ -80,6 +82,7 @@ public class ListVMsCmd extends BaseCmd {
Long zoneId = (Long)params.get(BaseCmd.Properties.ZONE_ID.getName()); Long zoneId = (Long)params.get(BaseCmd.Properties.ZONE_ID.getName());
Long podId = (Long)params.get(BaseCmd.Properties.POD_ID.getName()); Long podId = (Long)params.get(BaseCmd.Properties.POD_ID.getName());
Long hostId = (Long)params.get(BaseCmd.Properties.HOST_ID.getName()); Long hostId = (Long)params.get(BaseCmd.Properties.HOST_ID.getName());
Boolean forVirtualNetwork = (Boolean)params.get(BaseCmd.Properties.FOR_VIRTUAL_NETWORK.getName());
String keyword = (String)params.get(BaseCmd.Properties.KEYWORD.getName()); String keyword = (String)params.get(BaseCmd.Properties.KEYWORD.getName());
Integer page = (Integer)params.get(BaseCmd.Properties.PAGE.getName()); Integer page = (Integer)params.get(BaseCmd.Properties.PAGE.getName());
Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName()); Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName());
@ -149,8 +152,7 @@ public class ListVMsCmd extends BaseCmd {
throw new ServerApiException(BaseCmd.VM_LIST_ERROR, "unable to find virtual machines for account id " + accountName.toString()); throw new ServerApiException(BaseCmd.VM_LIST_ERROR, "unable to find virtual machines for account id " + accountName.toString());
} }
Object[] vmTag = new Object[virtualMachines.size()]; List vmTag = new ArrayList();
int i = 0;
HashMap<Long, HostVO> hostMap = new HashMap<Long, HostVO>(); HashMap<Long, HostVO> hostMap = new HashMap<Long, HostVO>();
List<HostVO> hostList = getManagementServer().listAllActiveHosts(); List<HostVO> hostList = getManagementServer().listAllActiveHosts();
@ -235,8 +237,14 @@ public class ListVMsCmd extends BaseCmd {
// Service Offering Info // Service Offering Info
ServiceOfferingVO offering = getManagementServer().findServiceOfferingById(vmInstance.getServiceOfferingId()); ServiceOfferingVO offering = getManagementServer().findServiceOfferingById(vmInstance.getServiceOfferingId());
// Probably not the best place to check but it will have to do for now to make this
// the least intrusive fix.
if (forVirtualNetwork != null && forVirtualNetwork && offering.getGuestIpType() != ServiceOffering.GuestIpType.Virtualized) {
continue;
}
vmData.add(new Pair<String, Object>(BaseCmd.Properties.SERVICE_OFFERING_ID.getName(), Long.valueOf(vmInstance.getServiceOfferingId()).toString())); vmData.add(new Pair<String, Object>(BaseCmd.Properties.SERVICE_OFFERING_ID.getName(), Long.valueOf(vmInstance.getServiceOfferingId()).toString()));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.SERVICE_OFFERING_NAME.getName(), offering.getName())); vmData.add(new Pair<String, Object>(BaseCmd.Properties.SERVICE_OFFERING_NAME.getName(), offering.getName()));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.CPU_NUMBER.getName(), Integer.valueOf(offering.getCpu()).toString())); vmData.add(new Pair<String, Object>(BaseCmd.Properties.CPU_NUMBER.getName(), Integer.valueOf(offering.getCpu()).toString()));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.CPU_SPEED.getName(), Integer.valueOf(offering.getSpeed()).toString())); vmData.add(new Pair<String, Object>(BaseCmd.Properties.CPU_SPEED.getName(), Integer.valueOf(offering.getSpeed()).toString()));
vmData.add(new Pair<String, Object>(BaseCmd.Properties.MEMORY.getName(), Integer.valueOf(offering.getRamSize()).toString())); vmData.add(new Pair<String, Object>(BaseCmd.Properties.MEMORY.getName(), Integer.valueOf(offering.getRamSize()).toString()));
@ -261,10 +269,10 @@ public class ListVMsCmd extends BaseCmd {
//network groups //network groups
vmData.add(new Pair<String, Object>(BaseCmd.Properties.NETWORK_GROUP_LIST.getName(), getManagementServer().getNetworkGroupsNamesForVm(vmInstance.getId()))); vmData.add(new Pair<String, Object>(BaseCmd.Properties.NETWORK_GROUP_LIST.getName(), getManagementServer().getNetworkGroupsNamesForVm(vmInstance.getId())));
vmTag[i++] = vmData; vmTag.add(vmData);
} }
List<Pair<String, Object>> returnTags = new ArrayList<Pair<String, Object>>(); List<Pair<String, Object>> returnTags = new ArrayList<Pair<String, Object>>();
Pair<String, Object> vmTags = new Pair<String, Object>("virtualmachine", vmTag); Pair<String, Object> vmTags = new Pair<String, Object>("virtualmachine", vmTag.toArray());
returnTags.add(vmTags); returnTags.add(vmTags);
return returnTags; return returnTags;
} }

4
ui/scripts/cloud.core.network.js
View File

@ -399,7 +399,7 @@ function showNetworkingTab(p_domainId, p_account) {
createPortForwardingRow.find("#protocol").val("TCP"); createPortForwardingRow.find("#protocol").val("TCP");
$.ajax({ $.ajax({
data: "command=listVirtualMachines&pagesize=500&response=json&domainid="+ipPanel.data("ip_domainid")+"&account="+ipPanel.data("ip_account"), data: "command=listVirtualMachines&forvirtualnetwork=true&pagesize=500&response=json&domainid="+ipPanel.data("ip_domainid")+"&account="+ipPanel.data("ip_account"),
dataType: "json", dataType: "json",
success: function(json) { success: function(json) {
var instances = json.listvirtualmachinesresponse.virtualmachine; var instances = json.listvirtualmachinesresponse.virtualmachine;
@ -436,7 +436,7 @@ function showNetworkingTab(p_domainId, p_account) {
var virtualMachineId = json.virtualmachineid; var virtualMachineId = json.virtualmachineid;
$.ajax({ $.ajax({
data: "command=listVirtualMachines&pagesize=500&response=json&domainid="+ipPanel.data("ip_domainid")+"&account="+ipPanel.data("ip_account"), data: "command=listVirtualMachines&forvirtualnetwork=true&pagesize=500&response=json&domainid="+ipPanel.data("ip_domainid")+"&account="+ipPanel.data("ip_account"),
dataType: "json", dataType: "json",
success: function(json) { success: function(json) {
var instances = json.listvirtualmachinesresponse.virtualmachine; var instances = json.listvirtualmachinesresponse.virtualmachine;