Skip networkrate when copying network details on migration

The copy already gets its own networkrate from its offering, and the
migrated network updates it when it moves to the new offering.

Author: sudo87

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

@@ -247,10 +247,14 @@ public class NetworkMigrationManagerImpl implements NetworkMigrationManager {
     }
 
     @DB
-    private void copyNetworkDetails(long srcNetworkId, long dstNetworkId) {
+    protected void copyNetworkDetails(long srcNetworkId, long dstNetworkId) {
         List<NetworkDetailVO> networkDetails = _networkDetailsDao.listDetails(srcNetworkId);
 
         for (NetworkDetailVO networkDetail : networkDetails) {
+            // the network rate of the copy is already set from its offering, and it is updated when the migrated network moves to the new offering
+            if (ApiConstants.NETWORKRATE.equals(networkDetail.getName())) {
+                continue;
+            }
             _networkDetailsDao.persist(new NetworkDetailVO(dstNetworkId, networkDetail.getName(), networkDetail.getValue(), networkDetail.isDisplay()));
         }
     }

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

@@ -23,19 +23,27 @@
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.resourcedetail.VpcDetailVO;
 import org.apache.cloudstack.resourcedetail.dao.VpcDetailsDao;
+import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import com.cloud.network.dao.NetworkDetailVO;
+import com.cloud.network.dao.NetworkDetailsDao;
+
 @RunWith(MockitoJUnitRunner.class)
 public class NetworkMigrationManagerImplTest {
 
     @Mock
     private VpcDetailsDao vpcDetailsDao;
 
+    @Mock
+    private NetworkDetailsDao networkDetailsDao;
+
     @InjectMocks
     private NetworkMigrationManagerImpl networkMigrationManager;
 
@@ -53,4 +61,20 @@ public void testCopyVpcDetailsSkipsPublicNetworkRate() {
                 Mockito.anyString(), Mockito.anyBoolean());
         Mockito.verify(vpcDetailsDao).addDetail(dstVpcId, "someKey", "someValue", false);
     }
+
+    @Test
+    public void testCopyNetworkDetailsSkipsNetworkRate() {
+        final long srcNetworkId = 20L;
+        final long dstNetworkId = 21L;
+        Mockito.when(networkDetailsDao.listDetails(srcNetworkId)).thenReturn(Arrays.asList(
+                new NetworkDetailVO(srcNetworkId, ApiConstants.NETWORKRATE, "100", true),
+                new NetworkDetailVO(srcNetworkId, "someKey", "someValue", false)));
+
+        networkMigrationManager.copyNetworkDetails(srcNetworkId, dstNetworkId);
+
+        ArgumentCaptor<NetworkDetailVO> captor = ArgumentCaptor.forClass(NetworkDetailVO.class);
+        Mockito.verify(networkDetailsDao, Mockito.times(1)).persist(captor.capture());
+        Assert.assertEquals("someKey", captor.getValue().getName());
+        Assert.assertEquals(dstNetworkId, captor.getValue().getResourceId());
+    }
 }