ONOS-2088: Lazy id block allocation

Change-Id: Ie99d2ba017f45f1ca99b04da05cdb06b41202d3a

@@ -15,6 +15,8 @@
  */
  */
 package org.onosproject.core.impl;
 package org.onosproject.core.impl;
 
 
+import java.util.concurrent.atomic.AtomicBoolean;
+
 import org.onosproject.core.IdBlock;
 import org.onosproject.core.IdBlock;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.core.IdGenerator;
 import org.onosproject.core.UnavailableIdException;
 import org.onosproject.core.UnavailableIdException;
@@ -26,6 +28,8 @@ import org.onosproject.core.UnavailableIdException;
 public class BlockAllocatorBasedIdGenerator implements IdGenerator {
 public class BlockAllocatorBasedIdGenerator implements IdGenerator {
     protected final IdBlockAllocator allocator;
     protected final IdBlockAllocator allocator;
     protected IdBlock idBlock;
     protected IdBlock idBlock;
+    protected AtomicBoolean initialized;
+
 
 
     /**
     /**
      * Constructs an ID generator which use {@link IdBlockAllocator} as backend.
      * Constructs an ID generator which use {@link IdBlockAllocator} as backend.
@@ -34,18 +38,26 @@ public class BlockAllocatorBasedIdGenerator implements IdGenerator {
      */
      */
     protected BlockAllocatorBasedIdGenerator(IdBlockAllocator allocator) {
     protected BlockAllocatorBasedIdGenerator(IdBlockAllocator allocator) {
         this.allocator = allocator;
         this.allocator = allocator;
-        this.idBlock = allocator.allocateUniqueIdBlock();
+        this.initialized = new AtomicBoolean(false);
     }
     }
 
 
     @Override
     @Override
     public long getNewId() {
     public long getNewId() {
         try {
         try {
+            if (!initialized.get()) {
+                synchronized (allocator) {
+                    if (!initialized.get()) {
+                        idBlock = allocator.allocateUniqueIdBlock();
+                        initialized.set(true);
+                    }
+                }
+            }
             return idBlock.getNextId();
             return idBlock.getNextId();
         } catch (UnavailableIdException e) {
         } catch (UnavailableIdException e) {
             synchronized (allocator) {
             synchronized (allocator) {
                 idBlock = allocator.allocateUniqueIdBlock();
                 idBlock = allocator.allocateUniqueIdBlock();
-                return idBlock.getNextId();
             }
             }
+            return idBlock.getNextId();
         }
         }
     }
     }
 }
 }