vpc vr: fix Conflicting device id on private gw nic

Author: ustcweizhou

api/src/main/java/com/cloud/vm/NicProfile.java

@@ -173,6 +173,10 @@ public void setDeviceId(int deviceId) {
         this.deviceId = deviceId;
     }
 
+    public void setDeviceId(Integer deviceId) {
+        this.deviceId = deviceId;
+    }
+
     public String getName() {
         return name;
     }

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

@@ -85,6 +85,7 @@ public NicProfile createPrivateNicProfileForGateway(final VpcGateway privateGate
                     new NicProfile(privateNic, privateNetwork, privateNic.getBroadcastUri(), privateNic.getIsolationUri(), _networkModel.getNetworkRate(
                             privateNetwork.getId(), router.getId()), _networkModel.isSecurityGroupSupportedInNetwork(privateNetwork), _networkModel.getNetworkTag(
                                     router.getHypervisorType(), privateNetwork));
+            privateNicProfile.setDeviceId(null);
 
             if (router.getIsRedundantRouter()) {
               String newMacAddress = NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ipVO.getMacAddress(), NetworkModel.MACIdentifier.value()));
@@ -137,4 +138,4 @@ public String acquireGuestIpAddressForVrouterRedundant(Network network) {
         return _ipAddrMgr.acquireGuestIpAddressByPlacement(network, null);
     }
 
-}
+}

test/integration/component/test_multiple_subnets_in_isolated_network.py

@@ -753,7 +753,8 @@ def test_01_acquire_public_ips_in_isolated_network_with_single_vr(self):
         # 20. reboot router
         #   verify the available nics in VR should be "eth0,eth1,eth2,eth3,"
         #   verify the IPs in VR. eth0 -> guest nic, eth2 -> source nat IP, eth3 -> new ip 6
-        for router in routers:
+        if len(routers) > 0:
+            router = routers[0]
             cmd = rebootRouter.rebootRouterCmd()
             cmd.id = router.id
             self.apiclient.rebootRouter(cmd)

test/integration/component/test_multiple_subnets_in_isolated_network_rvr.py

@@ -753,7 +753,8 @@ def test_02_acquire_public_ips_in_isolated_network_with_redundant_vrs(self):
         # 20. reboot router
         #   verify the available nics in VR should be "eth0,eth1,eth2,eth3,"
         #   verify the IPs in VR. eth0 -> guest nic, eth2 -> source nat IP, eth3 -> new ip 6
-        for router in routers:
+        if len(routers) > 0:
+            router = routers[0]
             cmd = rebootRouter.rebootRouterCmd()
             cmd.id = router.id
             self.apiclient.rebootRouter(cmd)

test/integration/component/test_multiple_subnets_in_vpc.py

@@ -902,7 +902,8 @@ def test_03_acquire_public_ips_in_vpc_with_single_vr(self):
         #   verify the available nics in VR should be "eth0,eth1,eth2,eth3,eth4,eth5,"
         #   verify the IPs in VR. eth1 -> source nat IP, eth2 -> new ip 6, eth3 -> tier 1, eth4 -> private gateway, eth5 -> tier 2
         routers = self.get_vpc_routers(self.vpc1.id)
-        for router in routers:
+        if len(routers) > 0:
+            router = routers[0]
             cmd = rebootRouter.rebootRouterCmd()
             cmd.id = router.id
             self.apiclient.rebootRouter(cmd)

test/integration/component/test_multiple_subnets_in_vpc_rvr.py

@@ -902,7 +902,8 @@ def test_04_acquire_public_ips_in_vpc_with_redundant_vrs(self):
         #   verify the available nics in VR should be "eth0,eth1,eth2,eth3,eth4,eth5,"
         #   verify the IPs in VR. eth1 -> source nat IP, eth2 -> new ip 6, eth3 -> tier 1, eth4 -> private gateway, eth5 -> tier 2
         routers = self.get_vpc_routers(self.vpc1.id)
-        for router in routers:
+        if len(routers) > 0:
+            router = routers[0]
             cmd = rebootRouter.rebootRouterCmd()
             cmd.id = router.id
             self.apiclient.rebootRouter(cmd)