From 214782cc8ca643fa099f5651d31e60e7f7c0879f Mon Sep 17 00:00:00 2001
From: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date: Mon, 18 Jun 2012 15:30:20 -0700
Subject: [PATCH] Don't send public/guest nic info when start VR in VPC

Conflicts:

	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
---
 .../VirtualNetworkApplianceManagerImpl.java   |  2 +-
 ...VpcVirtualNetworkApplianceManagerImpl.java | 38 ++++++++++---------
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index 47158537096..93211c7b0dd 100755
--- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -1683,7 +1683,7 @@ public class VirtualNetworkApplianceManagerImpl implements VirtualNetworkApplian
                 publicNetwork = true;
             }
         }
-        
+
         if (controlNic == null) {
             throw new CloudRuntimeException("Didn't start a control port");
         }
diff --git a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
index bc7d3e00213..899faf78704 100644
--- a/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
+++ b/server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
@@ -15,6 +15,7 @@ package com.cloud.network.router;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
@@ -363,8 +364,6 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
     public boolean finalizeStart(VirtualMachineProfile<DomainRouterVO> profile, long hostId, Commands cmds,
             ReservationContext context) {
         
-
-        
         if (!super.finalizeStart(profile, hostId, cmds, context)) {
             return false;
         } else if (profile.getVirtualMachine().getVpcId() == null) {
@@ -686,20 +685,23 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
     }
     
     
-//    @Override
-//    public boolean finalizeVirtualMachineProfile(VirtualMachineProfile<DomainRouterVO> profile, DeployDestination dest, 
-//            ReservationContext context) {
-//        //remove public and guest nics as we will plug them later
-//        Iterator<NicProfile> it = profile.getNics().iterator();
-//        while (it.hasNext()) {
-//            NicProfile nic = it.next();
-//            if (nic.getTrafficType() == TrafficType.Public || nic.getTrafficType() == TrafficType.Guest) {
-//                s_logger.debug("Removing nic of type " + nic.getTrafficType() + " from the nics passed on vm start. " +
-//                		"The nic will be plugged later");
-//                it.remove();
-//            }
-//        }
-//        
-//        return super.finalizeVirtualMachineProfile(profile, dest, context);
-//    }
+    @Override
+    public boolean finalizeVirtualMachineProfile(VirtualMachineProfile<DomainRouterVO> profile, DeployDestination dest, 
+            ReservationContext context) {
+        
+        if (profile.getVirtualMachine().getVpcId() != null) {
+          //remove public and guest nics as we will plug them later
+            Iterator<NicProfile> it = profile.getNics().iterator();
+            while (it.hasNext()) {
+                NicProfile nic = it.next();
+                if (nic.getTrafficType() == TrafficType.Public || nic.getTrafficType() == TrafficType.Guest) {
+                    s_logger.debug("Removing nic of type " + nic.getTrafficType() + " from the nics passed on vm start. " +
+                            "The nic will be plugged later");
+                    it.remove();
+                }
+            }
+        }
+        
+        return super.finalizeVirtualMachineProfile(profile, dest, context);
+    }
 }