review changes

Author: sureshanaparti

api/src/main/java/com/cloud/network/NetworkModel.java

@@ -125,9 +125,9 @@ public interface NetworkModel {
      */
     String getNextAvailableMacAddressInNetwork(long networkConfigurationId) throws InsufficientAddressCapacityException;
 
-    default boolean isMACUnique(String mac, long networkId) {
-        return true;
-    }
+    String getUniqueMacAddress(long macAddress, long networkId, long datacenterId) throws InsufficientAddressCapacityException;
+
+    boolean isMACUnique(String mac, long networkId);
 
     PublicIpAddress getPublicIpAddress(long ipAddressId);
 

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

@@ -608,8 +608,19 @@ public String getNextAvailableMacAddressInNetwork(long networkId) throws Insuffi
         return mac;
     }
 
+    @Override
+    public String getUniqueMacAddress(long macAddress, long networkId, long datacenterId) throws InsufficientAddressCapacityException {
+        String macAddressStr = NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(macAddress, getMacIdentifier(datacenterId)));
+        if (!isMACUnique(macAddressStr, networkId)) {
+            macAddressStr = getNextAvailableMacAddressInNetwork(networkId);
+        }
+        return macAddressStr;
+    }
+
+    @Override
     public boolean isMACUnique(String mac, long networkId) {
         return (_nicDao.findByMacAddress(mac, networkId) == null);
+
     }
 
     @Override

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

@@ -133,10 +133,7 @@ public void reserve(NicProfile nic, Network config, VirtualMachineProfile vm, De
         Integer vlan = result.getVlan();
 
         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());
-        }
+        String macAddress = _networkModel.getUniqueMacAddress(result.getMacAddress(), config.getId(), dest.getDataCenter().getId());
         nic.setMacAddress(macAddress);
         nic.setIPv4Gateway(pod.getGateway());
         nic.setFormat(AddressFormat.Ip4);

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

@@ -37,7 +37,6 @@
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.user.Account;
-import com.cloud.utils.net.NetUtils;
 import com.cloud.vm.Nic.ReservationStrategy;
 import com.cloud.vm.NicProfile;
 import com.cloud.vm.ReservationContext;
@@ -132,10 +131,7 @@ public void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, D
 
         vlan = ip.getVlan();
         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());
-        }
+        String macAddress = _networkModel.getUniqueMacAddress(ip.getMac(), network.getId(), dest.getDataCenter().getId());
         nic.setMacAddress(macAddress);
         nic.setFormat(AddressFormat.Ip4);
         nic.setIPv4Netmask(ip.getNetmask());

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

@@ -91,18 +91,12 @@ public NicProfile createPrivateNicProfileForGateway(final VpcGateway privateGate
             privateNicProfile.setDeviceId(null);
 
             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());
-              }
-              privateNicProfile.setMacAddress(newMacAddress);
+                String newMacAddress = _networkModel.getUniqueMacAddress(ipVO.getMacAddress(), privateNetwork.getId(), privateNetwork.getDataCenterId());
+                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());
-            }
+            String newMacAddress = _networkModel.getUniqueMacAddress(ipVO.getMacAddress(), privateNetwork.getId(), privateNetwork.getDataCenterId());
             final PrivateIpAddress ip =
                     new PrivateIpAddress(ipVO, privateNetwork.getBroadcastUri().toString(), privateNetwork.getGateway(), netmask, newMacAddress);
 

server/src/test/java/com/cloud/network/MockNetworkModelImpl.java

@@ -129,6 +129,24 @@ public String getNextAvailableMacAddressInNetwork(long networkConfigurationId) t
         return null;
     }
 
+    /* (non-Javadoc)
+     * @see com.cloud.network.NetworkModel#getUniqueMacAddress(long, long, long)
+     */
+    @Override
+    public String getUniqueMacAddress(long macAddress, long networkId, long datacenterId) throws InsufficientAddressCapacityException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see com.cloud.network.NetworkModel#isMACUnique(String, long)
+     */
+    @Override
+    public boolean isMACUnique(String mac, long networkId) {
+        // TODO Auto-generated method stub
+        return true;
+    }
+
     /* (non-Javadoc)
      * @see com.cloud.network.NetworkModel#getPublicIpAddress(long)
      */

server/src/test/java/com/cloud/vpc/MockNetworkModelImpl.java

@@ -141,6 +141,24 @@ public String getNextAvailableMacAddressInNetwork(long networkConfigurationId) t
         return null;
     }
 
+    /* (non-Javadoc)
+     * @see com.cloud.network.NetworkModel#getUniqueMacAddress(long, long, long)
+     */
+    @Override
+    public String getUniqueMacAddress(long macAddress, long networkId, long datacenterId) throws InsufficientAddressCapacityException {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    /* (non-Javadoc)
+     * @see com.cloud.network.NetworkModel#isMACUnique(String, long)
+     */
+    @Override
+    public boolean isMACUnique(String mac, long networkId) {
+        // TODO Auto-generated method stub
+        return true;
+    }
+
     /* (non-Javadoc)
      * @see com.cloud.network.NetworkModel#getPublicIpAddress(long)
      */