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.
This commit is contained in:
prachi 2011-11-21 17:24:20 -08:00
parent 0dc7fb48a1
commit 54ec6598bb

View File

@ -4273,19 +4273,20 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe
break; break;
} }
if(!isNetworkSetupByName(info.getPrivateNetworkName())){ 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; errorout = true;
break; } break;
}
if(!isNetworkSetupByName(info.getPublicNetworkName())){ 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; errorout = true;
break; break;
} }
if(!isNetworkSetupByName(info.getStorageNetworkName())){ /*if(!isNetworkSetupByName(info.getStorageNetworkName())){
msg = "For Physical Network id:"+ info.getPhysicalNetworkId() + ", Storage Network is not configured on the backend by name " + info.getGuestNetworkName(); msg = "For Physical Network id:"+ info.getPhysicalNetworkId() + ", Storage Network is not configured on the backend by name " + info.getStorageNetworkName();
errorout = true; errorout = true;
break; break;
} }*/
} }
if(errorout){ if(errorout){
s_logger.error(msg); s_logger.error(msg);