review comments

Author: sureshanaparti

engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java

@@ -432,7 +432,7 @@ public List<NetworkVO> getAllPersistentNetworksFromZone(long dataCenterId) {
     public String getNextAvailableMacAddress(final long networkConfigId, Integer zoneMacIdentifier) {
         final SequenceFetcher fetch = SequenceFetcher.getInstance();
         long seq = fetch.getNextSequence(Long.class, _tgMacAddress, networkConfigId);
-        if (zoneMacIdentifier != null && zoneMacIdentifier != 0 ) {
+        if (zoneMacIdentifier != null && zoneMacIdentifier != 0) {
             seq = seq | _prefix << 40 | (long)zoneMacIdentifier << 32 | networkConfigId << 16 & 0x00000000ffff0000L;
         }
         return NetUtils.long2Mac(seq);

engine/schema/src/main/java/com/cloud/vm/dao/NicDaoImpl.java

@@ -403,7 +403,7 @@ public List<NicVO> listByVmIdAndKeyword(long instanceId, String keyword) {
     public NicVO findByMacAddress(String macAddress, long networkId) {
         SearchCriteria<NicVO> sc = AllFieldsSearch.create();
         sc.setParameters("macAddress", macAddress);
-        sc.setParameters("networkId", networkId);
+        sc.setParameters("network", networkId);
         return findOneBy(sc);
     }
 

server/src/main/java/com/cloud/network/NetworkModelImpl.java

@@ -604,7 +604,7 @@ public String getNextAvailableMacAddressInNetwork(long networkId) throws Insuffi
             if (mac == null) {
                 throw new InsufficientAddressCapacityException("Unable to create another mac address", Network.class, networkId);
             }
-        } while(! isMACUnique(mac, networkId));
+        } while (!isMACUnique(mac, networkId));
         return mac;
     }
 

server/src/main/java/com/cloud/network/guru/PodBasedNetworkGuru.java

@@ -135,7 +135,7 @@ public void reserve(NicProfile nic, Network config, VirtualMachineProfile vm, De
         nic.setIPv4Address(result.getIpAddress());
         String macAddress = NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(result.getMacAddress(), _networkModel.getMacIdentifier(dest.getDataCenter().getId())));
         if (!_networkModel.isMACUnique(macAddress, config.getId())) {
-            macAddress =  _networkModel.getNextAvailableMacAddressInNetwork(config.getId());
+            macAddress = _networkModel.getNextAvailableMacAddressInNetwork(config.getId());
         }
         nic.setMacAddress(macAddress);
         nic.setIPv4Gateway(pod.getGateway());

server/src/main/java/com/cloud/network/guru/PrivateNetworkGuru.java

@@ -191,7 +191,7 @@ protected void getIp(NicProfile nic, DataCenter dc, Network network) throws Insu
             String netmask = NetUtils.getCidrNetmask(network.getCidr());
             String macAddress = NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ipVO.getMacAddress(), networkModel.getMacIdentifier(network.getDataCenterId())));
             if (!networkModel.isMACUnique(macAddress, network.getId())) {
-                macAddress =  networkModel.getNextAvailableMacAddressInNetwork(network.getId());
+                macAddress = networkModel.getNextAvailableMacAddressInNetwork(network.getId());
             }
             PrivateIpAddress ip =
                 new PrivateIpAddress(ipVO, vlanTag, network.getGateway(), netmask, macAddress);

server/src/main/java/com/cloud/network/guru/StorageNetworkGuru.java

@@ -134,7 +134,7 @@ public void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, D
         nic.setIPv4Address(ip.getIpAddress());
         String macAddress = NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ip.getMac(), _networkModel.getMacIdentifier(dest.getDataCenter().getId())));
         if (!_networkModel.isMACUnique(macAddress, network.getId())) {
-            macAddress =  _networkModel.getNextAvailableMacAddressInNetwork(network.getId());
+            macAddress = _networkModel.getNextAvailableMacAddressInNetwork(network.getId());
         }
         nic.setMacAddress(macAddress);
         nic.setFormat(AddressFormat.Ip4);

server/src/main/java/com/cloud/network/router/NicProfileHelperImpl.java

@@ -93,15 +93,15 @@ public NicProfile createPrivateNicProfileForGateway(final VpcGateway privateGate
             if (router.getIsRedundantRouter()) {
               String newMacAddress = NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ipVO.getMacAddress(), _networkModel.getMacIdentifier(privateNetwork.getDataCenterId())));
               if (!_networkModel.isMACUnique(newMacAddress, privateNetwork.getId())) {
-                  newMacAddress =  _networkModel.getNextAvailableMacAddressInNetwork(privateNetwork.getId());
+                  newMacAddress = _networkModel.getNextAvailableMacAddressInNetwork(privateNetwork.getId());
               }
               privateNicProfile.setMacAddress(newMacAddress);
             }
         } else {
             final String netmask = NetUtils.getCidrNetmask(privateNetwork.getCidr());
             String newMacAddress = NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ipVO.getMacAddress(), _networkModel.getMacIdentifier(privateNetwork.getDataCenterId())));
             if (!_networkModel.isMACUnique(newMacAddress, privateNetwork.getId())) {
-                newMacAddress =  _networkModel.getNextAvailableMacAddressInNetwork(privateNetwork.getId());
+                newMacAddress = _networkModel.getNextAvailableMacAddressInNetwork(privateNetwork.getId());
             }
             final PrivateIpAddress ip =
                     new PrivateIpAddress(ipVO, privateNetwork.getBroadcastUri().toString(), privateNetwork.getGateway(), netmask, newMacAddress);