You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ro...@apache.org on 2021/03/11 07:37:40 UTC
[cloudstack] branch 4.14 updated: server: use network details from
nic network (#4772)
This is an automated email from the ASF dual-hosted git repository.
rohit pushed a commit to branch 4.14
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/4.14 by this push:
new 025b654 server: use network details from nic network (#4772)
025b654 is described below
commit 025b654b5df3a0eecb797e6a969b11bbba24ad5a
Author: Abhishek Kumar <ab...@gmail.com>
AuthorDate: Thu Mar 11 13:06:44 2021 +0530
server: use network details from nic network (#4772)
Signed-off-by: Abhishek Kumar <ab...@gmail.com>
---
.../main/java/com/cloud/api/ApiResponseHelper.java | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
index c2d912b..da4de8f 100644
--- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/main/java/com/cloud/api/ApiResponseHelper.java
@@ -3922,7 +3922,6 @@ public class ApiResponseHelper implements ResponseGenerator {
NicResponse response = new NicResponse();
NetworkVO network = _entityMgr.findById(NetworkVO.class, result.getNetworkId());
VMInstanceVO vm = _entityMgr.findById(VMInstanceVO.class, result.getInstanceId());
- UserVmJoinVO userVm = _entityMgr.findById(UserVmJoinVO.class, result.getInstanceId());
List<NicExtraDhcpOptionVO> nicExtraDhcpOptionVOs = _nicExtraDhcpOptionDao.listByNicId(result.getId());
// The numbered comments are to keep track of the data returned from here and UserVmJoinDaoImpl.setUserVmResponse()
@@ -3936,15 +3935,13 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setVmId(vm.getUuid());
}
- if (userVm != null){
- if (userVm.getTrafficType() != null) {
- /*4: trafficType*/
- response.setTrafficType(userVm.getTrafficType().toString());
- }
- if (userVm.getGuestType() != null) {
- /*5: guestType*/
- response.setType(userVm.getGuestType().toString());
- }
+ if (network.getTrafficType() != null) {
+ /*4: trafficType*/
+ response.setTrafficType(network.getTrafficType().toString());
+ }
+ if (network.getGuestType() != null) {
+ /*5: guestType*/
+ response.setType(network.getGuestType().toString());
}
/*6: ipAddress*/
response.setIpaddress(result.getIPv4Address());
@@ -3953,9 +3950,7 @@ public class ApiResponseHelper implements ResponseGenerator {
/*8: netmask*/
response.setNetmask(result.getIPv4Netmask());
/*9: networkName*/
- if(userVm != null && userVm.getNetworkName() != null) {
- response.setNetworkName(userVm.getNetworkName());
- }
+ response.setNetworkName(network.getName());
/*10: macAddress*/
response.setMacAddress(result.getMacAddress());
/*11: IPv6Address*/