Fix VPC restart with cleanup (#12)

Author: nvazquez

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

@@ -44,6 +44,8 @@ public interface NicDao extends GenericDao<NicVO, Long> {
 
     NicVO findByNetworkIdAndType(long networkId, VirtualMachine.Type vmType);
 
+    NicVO findByNetworkIdAndTypeIncludingRemoved(long networkId, VirtualMachine.Type vmType);
+
     NicVO findByIp4AddressAndNetworkId(String ip4Address, long networkId);
 
     NicVO findByNetworkIdAndMacAddress(long networkId, String mac);

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

@@ -176,12 +176,21 @@ public NicVO findByInstanceIdAndNetworkIdIncludingRemoved(long networkId, long i
         return findOneIncludingRemovedBy(sc);
     }
 
-    @Override
-    public NicVO findByNetworkIdAndType(long networkId, VirtualMachine.Type vmType) {
+    private NicVO findByNetworkIdAndTypeInternal(long networkId, VirtualMachine.Type vmType, boolean includingRemoved) {
         SearchCriteria<NicVO> sc = AllFieldsSearch.create();
         sc.setParameters("network", networkId);
         sc.setParameters("vmType", vmType);
-        return findOneBy(sc);
+        return includingRemoved ? findOneIncludingRemovedBy(sc) : findOneBy(sc);
+    }
+
+    @Override
+    public NicVO findByNetworkIdAndType(long networkId, VirtualMachine.Type vmType) {
+        return findByNetworkIdAndTypeInternal(networkId, vmType, false);
+    }
+
+    @Override
+    public NicVO findByNetworkIdAndTypeIncludingRemoved(long networkId, VirtualMachine.Type vmType) {
+        return findByNetworkIdAndTypeInternal(networkId, vmType, true);
     }
 
     @Override

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

@@ -21,6 +21,8 @@
 
 import javax.inject.Inject;
 
+import com.cloud.vm.NicVO;
+import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.network.router.deployment.RouterDeploymentDefinition;
 
 import com.cloud.network.IpAddressManager;
@@ -118,7 +120,13 @@ public NicProfile createPrivateNicProfileForGateway(final VpcGateway privateGate
     public NicProfile createGuestNicProfileForVpcRouter(final RouterDeploymentDefinition vpcRouterDeploymentDefinition, final Network guestNetwork) {
         final NicProfile guestNic = new NicProfile();
 
-        if (vpcRouterDeploymentDefinition.isRedundant()) {
+        if (BroadcastDomainType.NSX == guestNetwork.getBroadcastDomainType()) {
+            NicVO vrNic = _nicDao.findByNetworkIdAndTypeIncludingRemoved(guestNetwork.getId(), VirtualMachine.Type.DomainRouter);
+            if (vrNic != null) {
+                guestNic.setIPv4Address(vrNic.getIPv4Address());
+                guestNic.setIPv4Gateway(vrNic.getIPv4Gateway());
+            }
+        } else if (vpcRouterDeploymentDefinition.isRedundant()) {
             guestNic.setIPv4Address(this.acquireGuestIpAddressForVrouterRedundant(guestNetwork));
         } else {
             guestNic.setIPv4Address(guestNetwork.getGateway());