From 9ea905b620ef1b8f361d8e5229cc707fe0ddf089 Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Mon, 9 Jul 2012 15:01:03 -0700
Subject: [PATCH] CS-15404 [2.2.14 to 3.0.4 upgrade] After upgrade
 cloud.physical_network.id starts from 200 which is not the case with fresh
 installation

Reviewed-By: Alena

Changes:
- We need to set the id while creating physical network entry.
---
 server/src/com/cloud/network/NetworkManagerImpl.java | 4 +++-
 server/src/com/cloud/network/PhysicalNetworkVO.java  | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java
index b8237c95884..f6c8184e370 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -4701,7 +4701,9 @@ public class NetworkManagerImpl implements NetworkManager, NetworkService, Manag
         try {
             txn.start();
             // Create the new physical network in the database
-            PhysicalNetworkVO pNetwork = new PhysicalNetworkVO(zoneId, vnetRange, networkSpeed, domainId, broadcastDomainRange, name);
+            long id = _physicalNetworkDao.getNextInSequence(Long.class, "id");
+            
+            PhysicalNetworkVO pNetwork = new PhysicalNetworkVO(id, zoneId, vnetRange, networkSpeed, domainId, broadcastDomainRange, name);
             pNetwork.setTags(tags);
             pNetwork.setIsolationMethods(isolationMethods);
 
diff --git a/server/src/com/cloud/network/PhysicalNetworkVO.java b/server/src/com/cloud/network/PhysicalNetworkVO.java
index c93b9e9692d..a2cbadecec5 100644
--- a/server/src/com/cloud/network/PhysicalNetworkVO.java
+++ b/server/src/com/cloud/network/PhysicalNetworkVO.java
@@ -90,7 +90,7 @@ public class PhysicalNetworkVO implements PhysicalNetwork {
         
     }
     
-    public PhysicalNetworkVO(long dataCenterId, String vnet, String speed, Long domainId, BroadcastDomainRange broadcastDomainRange, String name) {
+    public PhysicalNetworkVO(long id, long dataCenterId, String vnet, String speed, Long domainId, BroadcastDomainRange broadcastDomainRange, String name) {
         this.dataCenterId = dataCenterId;
         this.setVnet(vnet);
         this.setSpeed(speed);
@@ -103,6 +103,7 @@ public class PhysicalNetworkVO implements PhysicalNetwork {
         this.state = State.Disabled;
         this.uuid = UUID.randomUUID().toString();
         this.name = name;
+        this.id = id;
     }
 
     @Override