From 54ec6598bbee21bfc27435769c911655463d9e88 Mon Sep 17 00:00:00 2001
From: prachi <prachi@cloud.com>
Date: Mon, 21 Nov 2011 17:24:20 -0800
Subject: [PATCH] Bug 12103 - Adding host without labelling guest network fails

Removing check for storage network for XenServer, since Xen resource does not use storage traffic type.
---
 .../hypervisor/xen/resource/CitrixResourceBase.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
index 857b3aa484e..5e4437f1ff6 100755
--- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
+++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
@@ -4273,19 +4273,20 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
                     break;
                 }
                 if(!isNetworkSetupByName(info.getPrivateNetworkName())){
-                    msg = "For Physical Network id:"+ info.getPhysicalNetworkId() + ", Private Network is not configured on the backend by name " + info.getGuestNetworkName();
+                    msg = "For Physical Network id:"+ info.getPhysicalNetworkId() + ", Private Network is not configured on the backend by name " + info.getPrivateNetworkName();
                     errorout = true;
-                    break;                }
+                    break;               
+                }
                 if(!isNetworkSetupByName(info.getPublicNetworkName())){
-                    msg = "For Physical Network id:"+ info.getPhysicalNetworkId() + ", Public Network is not configured on the backend by name " + info.getGuestNetworkName();
+                    msg = "For Physical Network id:"+ info.getPhysicalNetworkId() + ", Public Network is not configured on the backend by name " + info.getPublicNetworkName();
                     errorout = true;
                     break;
                 }
-                if(!isNetworkSetupByName(info.getStorageNetworkName())){
-                    msg = "For Physical Network id:"+ info.getPhysicalNetworkId() + ", Storage Network is not configured on the backend by name " + info.getGuestNetworkName();
+                /*if(!isNetworkSetupByName(info.getStorageNetworkName())){
+                    msg = "For Physical Network id:"+ info.getPhysicalNetworkId() + ", Storage Network is not configured on the backend by name " + info.getStorageNetworkName();
                     errorout = true;
                     break;
-                }
+                }*/
             }
             if(errorout){
                 s_logger.error(msg);