From 978d811333f6b9a1af1f273d24ff55a06733770d Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Thu, 30 Jun 2011 13:14:56 +0530 Subject: [PATCH] bug 10489: adding object name to response so that the front end displays it properly --- .../src/com/cloud/api/ApiResponseHelper.java | 1 + .../src/com/cloud/vm/dao/UserVmDaoImpl.java | 41 ++++++++++--------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index c90e3a14e4b..413e6b5470e 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -1066,6 +1066,7 @@ public class ApiResponseHelper implements ResponseGenerator { Double networkKbWrite = Double.valueOf(vmStats.getNetworkWriteKBs()); userVmResponse.setNetworkKbsWrite(networkKbWrite.longValue()); } + userVmResponse.setObjectName(objectName); vmResponses.add(userVmResponse); } return vmResponses; diff --git a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java index f4723caf24b..2aacfc0841c 100755 --- a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -423,26 +423,29 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use //nics.id, nics.ip4_address, nics.gateway, nics.network_id, nics.netmask, nics. mac_address, nics.broadcast_uri, nics.isolation_uri, " + //"networks.traffic_type, networks.guest_type, networks.is_default from vm_instance, " - NicResponse nicResponse = new NicResponse(); - nicResponse.setId(rs.getLong("nics.id")); - nicResponse.setIpaddress(rs.getString("nics.ip4_address")); - nicResponse.setGateway(rs.getString("nics.gateway")); - nicResponse.setNetmask(rs.getString("nics.netmask")); - nicResponse.setNetworkid(rs.getLong("nics.network_id")); - nicResponse.setMacAddress(rs.getString("nics.mac_address")); - - int account_type = rs.getInt("account.type"); - if (account_type == Account.ACCOUNT_TYPE_ADMIN) { - nicResponse.setBroadcastUri(rs.getString("nics.broadcast_uri")); - nicResponse.setIsolationUri(rs.getString("nics.isolation_uri")); + long nic_id = rs.getLong("nics.id"); + if (nic_id > 0){ + NicResponse nicResponse = new NicResponse(); + nicResponse.setId(nic_id); + nicResponse.setIpaddress(rs.getString("nics.ip4_address")); + nicResponse.setGateway(rs.getString("nics.gateway")); + nicResponse.setNetmask(rs.getString("nics.netmask")); + nicResponse.setNetworkid(rs.getLong("nics.network_id")); + nicResponse.setMacAddress(rs.getString("nics.mac_address")); + + int account_type = rs.getInt("account.type"); + if (account_type == Account.ACCOUNT_TYPE_ADMIN) { + nicResponse.setBroadcastUri(rs.getString("nics.broadcast_uri")); + nicResponse.setIsolationUri(rs.getString("nics.isolation_uri")); + } + + + nicResponse.setTrafficType(rs.getString("networks.traffic_type")); + nicResponse.setType(rs.getString("networks.guest_type")); + nicResponse.setIsDefault(rs.getBoolean("networks.is_default")); + nicResponse.setObjectName("nic"); + nicResponses.add(nicResponse); } - - - nicResponse.setTrafficType(rs.getString("networks.traffic_type")); - nicResponse.setType(rs.getString("networks.guest_type")); - nicResponse.setIsDefault(rs.getBoolean("networks.is_default")); - nicResponse.setObjectName("nic"); - nicResponses.add(nicResponse); } userVmResponse.setSecurityGroupList(new ArrayList(securityGroupResponse));