etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge from 2.1.x 782b81218b 

don't unplug PIF
This commit is contained in:
anthony 2010-11-10 15:16:57 -08:00
parent 4e7870aea1
commit e533ed41d7
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
View File

@ -3718,23 +3718,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR
return vlanNetwork;
}
protected void disableVlanNetwork(Network network) throws InternalErrorException {
try {
Connection conn = getConnection();
if (network.getVIFs(conn).isEmpty()) {
Iterator<PIF> pifs = network.getPIFs(conn).iterator();
while (pifs.hasNext()) {
PIF pif = pifs.next();
pif.unplug(conn);
}
}
} catch (XenAPIException e) {
String msg = "Unable to disable VLAN network due to " + e.toString();
s_logger.warn(msg, e);
} catch (Exception e) {
String msg = "Unable to disable VLAN network due to " + e.getMessage();
s_logger.warn(msg, e);
}
protected void disableVlanNetwork(Network network) {
}
protected SR getLocalLVMSR() {