shwstppr commented on PR #6282:
URL: https://github.com/apache/cloudstack/pull/6282#issuecomment-1196425835
@SadiJr can you please fix the conflicts
```
diff --cc
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
index e562d4dae6,70e068e76b..0000000000
---
a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
+++
b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/guru/VMwareGuru.java
@@@ -851,13 -856,9 +855,17 @@@ public class VMwareGuru extends Hypervi
String tag = parts[parts.length - 1];
String[] tagSplit = tag.split("-");
tag = tagSplit[tagSplit.length - 1];
++<<<<<<< HEAD
+
+ s_logger.debug(String.format("Trying to find network with vlan:
[%s].", vlan));
+ NetworkVO networkVO = _networkDao.findByVlan(vlan);
++=======
+ NetworkVO networkVO = networkDao.findByVlan(vlan);
++>>>>>>> main
if (networkVO == null) {
networkVO = createNetworkRecord(zoneId, tag, vlan, accountId,
domainId);
+ s_logger.debug(String.format("Created new network record [id:
%s] with details [zoneId: %s, tag: %s, vlan: %s, accountId: %s and domainId:
%s].",
+ networkVO.getUuid(), zoneId, tag, vlan, accountId,
domainId));
}
return networkVO;
}
@@@ -904,15 -904,9 +912,19 @@@
String macAddress = pair.first();
String networkName = pair.second();
NetworkVO networkVO = networksMapping.get(networkName);
++<<<<<<< HEAD
+ NicVO nicVO =
_nicDao.findByNetworkIdAndMacAddressIncludingRemoved(networkVO.getId(),
macAddress);
++=======
+ NicVO nicVO =
nicDao.findByNetworkIdAndMacAddress(networkVO.getId(), macAddress);
++>>>>>>> main
if (nicVO != null) {
+ s_logger.warn(String.format("Find NIC in DB with networkId
[%s] and MAC Address [%s], so this NIC will be removed from list of unmapped
NICs of VM [id: %s, name: %s].",
+ networkVO.getId(), macAddress, vm.getUuid(),
vm.getInstanceName()));
allNics.remove(nicVO);
+
+ if (nicVO.getRemoved() != null) {
+ _nicDao.unremove(nicVO.getId());
+ }
}
}
for (final NicVO unMappedNic : allNics) {
```
Also, PR is marked for 4.17.1 milestone while it is based on main branch.
Do we need to change the milestone for it?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
