From b67af370807df5f325cf68f2cd0a74cdad5ae908 Mon Sep 17 00:00:00 2001
From: frank <frank.zhang@citrix.com>
Date: Tue, 30 Jul 2013 11:09:57 -0700
Subject: [PATCH] CLOUDSTACK-3481, CLOUDSTACK-1812: create physical network
 fails while creating basic zone

Skip baremetal provider when it's not found.
(cherry-picked: 6070a8b3704f0ef0705971cf13dd601730ad79b7)
---
 server/src/com/cloud/network/NetworkServiceImpl.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index 73c1290a0b8..6513f4395ce 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3728,7 +3728,11 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService {
         PhysicalNetworkVO pvo = _physicalNetworkDao.findById(physicalNetworkId);
         DataCenterVO dvo = _dcDao.findById(pvo.getDataCenterId());
         if (dvo.getNetworkType() == NetworkType.Basic) {
-
+            Provider provider = Network.Provider.getProvider("BaremetalDhcpProvider");
+            if (provider == null) {
+                // baremetal is not loaded
+                return null;
+            }
             addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalDhcpProvider", null, null);
             addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalPxeProvider", null, null);
             addProviderToPhysicalNetwork(physicalNetworkId, "BaremetalUserdataProvider", null, null);