mirror of
				https://github.com/apache/cloudstack.git
				synced 2025-11-04 00:02:37 +01:00 
			
		
		
		
	merge from 2.1.x 782b81218ba4b6fe13678c5f36c6323465a4255f
don't unplug PIF
This commit is contained in:
		
							parent
							
								
									4e7870aea1
								
							
						
					
					
						commit
						e533ed41d7
					
				@ -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() {
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user