Projects information

Chunk

Conflicting content
import com.eucalyptus.records.EventRecord; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; <<<<<<< HEAD ======= import edu.ucsb.eucalyptus.msgs.DescribeBundleTasksResponseType; import edu.ucsb.eucalyptus.msgs.DescribeBundleTasksType; import edu.ucsb.eucalyptus.msgs.GetConsoleOutputResponseType; >>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6 import edu.ucsb.eucalyptus.msgs.GetConsoleOutputType; import edu.ucsb.eucalyptus.msgs.GetPasswordDataResponseType; import edu.ucsb.eucalyptus.msgs.GetPasswordDataType;

Conflicting content

import com.eucalyptus.records.EventRecord;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
<<<<<<< HEAD
=======
import edu.ucsb.eucalyptus.msgs.DescribeBundleTasksResponseType;
import edu.ucsb.eucalyptus.msgs.DescribeBundleTasksType;
import edu.ucsb.eucalyptus.msgs.GetConsoleOutputResponseType;
>>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6
import edu.ucsb.eucalyptus.msgs.GetConsoleOutputType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataResponseType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataType;

Solution content
import com.eucalyptus.records.EventRecord; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import edu.ucsb.eucalyptus.msgs.GetConsoleOutputType; import edu.ucsb.eucalyptus.msgs.GetPasswordDataResponseType; import edu.ucsb.eucalyptus.msgs.GetPasswordDataType;

Solution content

import com.eucalyptus.records.EventRecord;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
import edu.ucsb.eucalyptus.msgs.GetConsoleOutputType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataResponseType;
import edu.ucsb.eucalyptus.msgs.GetPasswordDataType;

File
VmControl.java

Developer's decision
Version 1

Kind of conflict
Import

Chunk

Conflicting content
} else { } } <<<<<<< HEAD public DescribeBundleTasksResponseType describeBundleTasks( DescribeBundleTasksType request ) throws EucalyptusCloudException { DescribeBundleTasksResponseType reply = request.getReply( ); if ( request.getBundleIds( ).isEmpty( ) ) { for ( VmInstance v : VmInstances.getInstance( ).listValues( ) ) { if ( v.isBundling( ) && ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) ) { reply.getBundleTasks( ).add( v.getBundleTask( ) ); } } for ( VmInstance v : VmInstances.getInstance( ).listDisabledValues( ) ) { if ( v.isBundling( ) && ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) ) { reply.getBundleTasks( ).add( v.getBundleTask( ) ); } } } else { for ( String bundleId : request.getBundleIds( ) ) { try { VmInstance v = VmInstances.getInstance( ).lookupByBundleId( bundleId ); if ( v.isBundling( ) && ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) ) { reply.getBundleTasks( ).add( v.getBundleTask( ) ); } } catch ( NoSuchElementException e ) {} } } return reply; } public CancelBundleTaskResponseType cancelBundleTask( CancelBundleTaskType request ) throws EucalyptusCloudException { CancelBundleTaskResponseType reply = request.getReply( ); reply.set_return( true ); try { VmInstance v = VmInstances.getInstance( ).lookupByBundleId( request.getBundleId( ) ); if ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) { v.getBundleTask( ).setState( "canceling" ); LOG.info( EventRecord.here( BundleCallback.class, EventType.BUNDLE_CANCELING, request.getUserId( ), v.getBundleTask( ).getBundleId( ), v.getInstanceId( ) ) ); Cluster cluster = Clusters.getInstance( ).lookup( v.getPlacement( ) ); request.setInstanceId( v.getInstanceId( ) ); reply.setTask( v.getBundleTask( ) ); Callbacks.newClusterRequest( new CancelBundleCallback( request ) ).dispatch( cluster.getServiceEndpoint( ) ); return reply; throw new EucalyptusCloudException( "Failed to find bundle task: " + request.getBundleId( ) ); } } catch ( NoSuchElementException e ) { throw new EucalyptusCloudException( "Failed to find bundle task: " + request.getBundleId( ) ); } } public BundleInstanceResponseType bundleInstance( BundleInstanceType request ) throws EucalyptusCloudException { BundleInstanceResponseType reply = request.getReply( );//TODO: check if the instance has platform windows. reply.set_return( true ); String walrusUrl = SystemConfiguration.getWalrusUrl( ); String instanceId = request.getInstanceId( ); User user = null; try { user = Users.lookupUser( request.getUserId( ) ); } catch ( NoSuchUserException e1 ) { throw new EucalyptusCloudException( "Failed to lookup the specified user's information: " + request.getUserId( ) ); } try { VmInstance v = VmInstances.getInstance( ).lookup( instanceId ); if ( v.isBundling( ) ) { reply.setTask( v.getBundleTask( ) ); return reply; } else if ( !"windows".equals( v.getPlatform( ) ) ) { throw new EucalyptusCloudException( "Failed to bundle requested vm because the platform is not 'windows': " + request.getInstanceId( ) ); } else if ( !VmState.RUNNING.equals( v.getState( ) ) ) { throw new EucalyptusCloudException( "Failed to bundle requested vm because it is not currently 'running': " + request.getInstanceId( ) ); } else if ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) { BundleTask bundleTask = new BundleTask( v.getInstanceId( ).replaceFirst( "i-", "bun-" ), v.getInstanceId( ), request.getBucket( ), request.getPrefix( ) ); if ( v.startBundleTask( bundleTask ) ) { reply.setTask( bundleTask ); } else if ( v.getBundleTask( ) == null ) { v.resetBundleTask( ); v.startBundleTask( bundleTask ); reply.setTask( bundleTask ); } else { throw new EucalyptusCloudException( "Instance is already being bundled: " + v.getBundleTask( ).getBundleId( ) ); } LOG .info( EventRecord .here( BundleCallback.class, EventType.BUNDLE_PENDING, request.getUserId( ), v.getBundleTask( ).getBundleId( ), v.getInstanceId( ) ) ); BundleCallback callback = new BundleCallback( request ); request.setUrl( walrusUrl ); request.setAwsAccessKeyId( user.getQueryId( ) ); Callbacks.newClusterRequest( callback ).dispatch( v.getPlacement( ) ); return reply; } else { throw new EucalyptusCloudException( "Failed to find instance: " + request.getInstanceId( ) ); } } catch ( NoSuchElementException e ) { throw new EucalyptusCloudException( "Failed to find instance: " + request.getInstanceId( ) ); } } public void getPasswordData( GetPasswordDataType request ) throws Exception { try { Cluster cluster = null; VmInstance v = VmInstances.getInstance( ).lookup( request.getInstanceId( ) ); if ( !VmState.RUNNING.equals( v.getState( ) ) ) { throw new NoSuchElementException( "Instance " + request.getInstanceId( ) + " is not in a running state." ); } if ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) { cluster = Clusters.getInstance( ).lookup( v.getPlacement( ) ); } else { throw new NoSuchElementException( "Instance " + request.getInstanceId( ) + " does not exist." ); } RequestContext.getEventContext( ).setStopFurtherProcessing( true ); if ( v.getPasswordData( ) == null ) { Callbacks.newClusterRequest( new PasswordDataCallback( request ) ).dispatch( cluster.getServiceEndpoint( ) ); } else { GetPasswordDataResponseType reply = request.getReply( ); reply.set_return( true ); reply.setOutput( v.getPasswordData( ) ); reply.setTimestamp( new Date( ) ); reply.setInstanceId( v.getInstanceId( ) ); ServiceContext.dispatch( "ReplyQueue", reply ); } } catch ( NoSuchElementException e ) { ServiceContext.dispatch( "ReplyQueue", new EucalyptusErrorMessageType( RequestContext.getEventContext( ).getService( ).getComponent( ).getClass( ) .getSimpleName( ), request, e.getMessage( ) ) ); } } } ======= public DescribeBundleTasksResponseType describeBundleTasks( DescribeBundleTasksType request ) { DescribeBundleTasksResponseType reply = request.getReply( ); return reply; } } >>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6

Conflicting content

        
      } else {
    }
  }
  
<<<<<<< HEAD
  public DescribeBundleTasksResponseType describeBundleTasks( DescribeBundleTasksType request ) throws EucalyptusCloudException {
    DescribeBundleTasksResponseType reply = request.getReply( );
    if ( request.getBundleIds( ).isEmpty( ) ) {
      for ( VmInstance v : VmInstances.getInstance( ).listValues( ) ) {
        if ( v.isBundling( ) && ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) ) {
          reply.getBundleTasks( ).add( v.getBundleTask( ) );
        }
      }
      for ( VmInstance v : VmInstances.getInstance( ).listDisabledValues( ) ) {
        if ( v.isBundling( ) && ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) ) {
          reply.getBundleTasks( ).add( v.getBundleTask( ) );
        }
      }
    } else {
      for ( String bundleId : request.getBundleIds( ) ) {
        try {
          VmInstance v = VmInstances.getInstance( ).lookupByBundleId( bundleId );
          if ( v.isBundling( ) && ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) ) {
            reply.getBundleTasks( ).add( v.getBundleTask( ) );
          }
        } catch ( NoSuchElementException e ) {}
      }
    }
    return reply;
  }
  
  public CancelBundleTaskResponseType cancelBundleTask( CancelBundleTaskType request ) throws EucalyptusCloudException {
    CancelBundleTaskResponseType reply = request.getReply( );
    reply.set_return( true );
    
    try {
      VmInstance v = VmInstances.getInstance( ).lookupByBundleId( request.getBundleId( ) );
      if ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) {
        v.getBundleTask( ).setState( "canceling" );
        LOG.info( EventRecord.here( BundleCallback.class, EventType.BUNDLE_CANCELING, request.getUserId( ), v.getBundleTask( ).getBundleId( ),
                                    v.getInstanceId( ) ) );
        
        Cluster cluster = Clusters.getInstance( ).lookup( v.getPlacement( ) );
        request.setInstanceId( v.getInstanceId( ) );
        reply.setTask( v.getBundleTask( ) );
        Callbacks.newClusterRequest( new CancelBundleCallback( request ) ).dispatch( cluster.getServiceEndpoint( ) );
        return reply;
        throw new EucalyptusCloudException( "Failed to find bundle task: " + request.getBundleId( ) );
      }
    } catch ( NoSuchElementException e ) {
      throw new EucalyptusCloudException( "Failed to find bundle task: " + request.getBundleId( ) );
    }
  }
  
  public BundleInstanceResponseType bundleInstance( BundleInstanceType request ) throws EucalyptusCloudException {
    BundleInstanceResponseType reply = request.getReply( );//TODO: check if the instance has platform windows.
    reply.set_return( true );
    String walrusUrl = SystemConfiguration.getWalrusUrl( );
    String instanceId = request.getInstanceId( );
    User user = null;
    try {
      user = Users.lookupUser( request.getUserId( ) );
    } catch ( NoSuchUserException e1 ) {
      throw new EucalyptusCloudException( "Failed to lookup the specified user's information: " + request.getUserId( ) );
    }
    try {
      VmInstance v = VmInstances.getInstance( ).lookup( instanceId );
      if ( v.isBundling( ) ) {
        reply.setTask( v.getBundleTask( ) );
        return reply;
      } else if ( !"windows".equals( v.getPlatform( ) ) ) {
        throw new EucalyptusCloudException( "Failed to bundle requested vm because the platform is not 'windows': " + request.getInstanceId( ) );
      } else if ( !VmState.RUNNING.equals( v.getState( ) ) ) {
        throw new EucalyptusCloudException( "Failed to bundle requested vm because it is not currently 'running': " + request.getInstanceId( ) );
      } else if ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) {
        BundleTask bundleTask = new BundleTask( v.getInstanceId( ).replaceFirst( "i-", "bun-" ), v.getInstanceId( ), request.getBucket( ), request.getPrefix( ) );
        if ( v.startBundleTask( bundleTask ) ) {
          reply.setTask( bundleTask );
        } else if ( v.getBundleTask( ) == null ) {
          v.resetBundleTask( );
          v.startBundleTask( bundleTask );
          reply.setTask( bundleTask );
        } else {
          throw new EucalyptusCloudException( "Instance is already being bundled: " + v.getBundleTask( ).getBundleId( ) );
        }
        LOG
           .info( EventRecord
                             .here( BundleCallback.class, EventType.BUNDLE_PENDING, request.getUserId( ), v.getBundleTask( ).getBundleId( ), v.getInstanceId( ) ) );
        BundleCallback callback = new BundleCallback( request );
        request.setUrl( walrusUrl );
        request.setAwsAccessKeyId( user.getQueryId( ) );
        Callbacks.newClusterRequest( callback ).dispatch( v.getPlacement( ) );
        return reply;
      } else {
        throw new EucalyptusCloudException( "Failed to find instance: " + request.getInstanceId( ) );
      }
    } catch ( NoSuchElementException e ) {
      throw new EucalyptusCloudException( "Failed to find instance: " + request.getInstanceId( ) );
    }
  }
  
  public void getPasswordData( GetPasswordDataType request ) throws Exception {
    try {
      Cluster cluster = null;
      VmInstance v = VmInstances.getInstance( ).lookup( request.getInstanceId( ) );
      if ( !VmState.RUNNING.equals( v.getState( ) ) ) {
        throw new NoSuchElementException( "Instance " + request.getInstanceId( ) + " is not in a running state." );
      }
      if ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) {
        cluster = Clusters.getInstance( ).lookup( v.getPlacement( ) );
      } else {
        throw new NoSuchElementException( "Instance " + request.getInstanceId( ) + " does not exist." );
      }
      RequestContext.getEventContext( ).setStopFurtherProcessing( true );
      if ( v.getPasswordData( ) == null ) {
        Callbacks.newClusterRequest( new PasswordDataCallback( request ) ).dispatch( cluster.getServiceEndpoint( ) );
      } else {
        GetPasswordDataResponseType reply = request.getReply( );
        reply.set_return( true );
        reply.setOutput( v.getPasswordData( ) );
        reply.setTimestamp( new Date( ) );
        reply.setInstanceId( v.getInstanceId( ) );
        ServiceContext.dispatch( "ReplyQueue", reply );
      }
    } catch ( NoSuchElementException e ) {
      ServiceContext.dispatch( "ReplyQueue", new EucalyptusErrorMessageType( RequestContext.getEventContext( ).getService( ).getComponent( ).getClass( )
                                                                                           .getSimpleName( ), request, e.getMessage( ) ) );
    }
  }
  
}
=======
  public DescribeBundleTasksResponseType describeBundleTasks( DescribeBundleTasksType request ) {
    DescribeBundleTasksResponseType  reply = request.getReply( );
    return reply;
  }
}
>>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6

Solution content
} } public DescribeBundleTasksResponseType describeBundleTasks( DescribeBundleTasksType request ) throws EucalyptusCloudException { DescribeBundleTasksResponseType reply = request.getReply( ); if ( request.getBundleIds( ).isEmpty( ) ) { for ( VmInstance v : VmInstances.getInstance( ).listValues( ) ) { if ( v.isBundling( ) && ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) ) { reply.getBundleTasks( ).add( v.getBundleTask( ) ); } } for ( VmInstance v : VmInstances.getInstance( ).listDisabledValues( ) ) { if ( v.isBundling( ) && ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) ) { reply.getBundleTasks( ).add( v.getBundleTask( ) ); } } } else { for ( String bundleId : request.getBundleIds( ) ) { try { VmInstance v = VmInstances.getInstance( ).lookupByBundleId( bundleId ); if ( v.isBundling( ) && ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) ) { reply.getBundleTasks( ).add( v.getBundleTask( ) ); } } catch ( NoSuchElementException e ) {} } } return reply; } public CancelBundleTaskResponseType cancelBundleTask( CancelBundleTaskType request ) throws EucalyptusCloudException { CancelBundleTaskResponseType reply = request.getReply( ); reply.set_return( true ); try { VmInstance v = VmInstances.getInstance( ).lookupByBundleId( request.getBundleId( ) ); if ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) { v.getBundleTask( ).setState( "canceling" ); LOG.info( EventRecord.here( BundleCallback.class, EventType.BUNDLE_CANCELING, request.getUserId( ), v.getBundleTask( ).getBundleId( ), v.getInstanceId( ) ) ); Cluster cluster = Clusters.getInstance( ).lookup( v.getPlacement( ) ); request.setInstanceId( v.getInstanceId( ) ); reply.setTask( v.getBundleTask( ) ); Callbacks.newClusterRequest( new CancelBundleCallback( request ) ).dispatch( cluster.getServiceEndpoint( ) ); return reply; } else { throw new EucalyptusCloudException( "Failed to find bundle task: " + request.getBundleId( ) ); } } catch ( NoSuchElementException e ) { throw new EucalyptusCloudException( "Failed to find bundle task: " + request.getBundleId( ) ); } } public BundleInstanceResponseType bundleInstance( BundleInstanceType request ) throws EucalyptusCloudException { BundleInstanceResponseType reply = request.getReply( );//TODO: check if the instance has platform windows. reply.set_return( true ); String walrusUrl = SystemConfiguration.getWalrusUrl( ); String instanceId = request.getInstanceId( ); User user = null; try { user = Users.lookupUser( request.getUserId( ) ); } catch ( NoSuchUserException e1 ) { throw new EucalyptusCloudException( "Failed to lookup the specified user's information: " + request.getUserId( ) ); } try { VmInstance v = VmInstances.getInstance( ).lookup( instanceId ); if ( v.isBundling( ) ) { reply.setTask( v.getBundleTask( ) ); return reply; } else if ( !"windows".equals( v.getPlatform( ) ) ) { throw new EucalyptusCloudException( "Failed to bundle requested vm because the platform is not 'windows': " + request.getInstanceId( ) ); } else if ( !VmState.RUNNING.equals( v.getState( ) ) ) { throw new EucalyptusCloudException( "Failed to bundle requested vm because it is not currently 'running': " + request.getInstanceId( ) ); } else if ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) { BundleTask bundleTask = new BundleTask( v.getInstanceId( ).replaceFirst( "i-", "bun-" ), v.getInstanceId( ), request.getBucket( ), request.getPrefix( ) ); if ( v.startBundleTask( bundleTask ) ) { reply.setTask( bundleTask ); } else if ( v.getBundleTask( ) == null ) { v.resetBundleTask( ); v.startBundleTask( bundleTask ); reply.setTask( bundleTask ); } else { throw new EucalyptusCloudException( "Instance is already being bundled: " + v.getBundleTask( ).getBundleId( ) ); } LOG .info( EventRecord .here( BundleCallback.class, EventType.BUNDLE_PENDING, request.getUserId( ), v.getBundleTask( ).getBundleId( ), v.getInstanceId( ) ) ); BundleCallback callback = new BundleCallback( request ); request.setUrl( walrusUrl ); request.setAwsAccessKeyId( user.getQueryId( ) ); Callbacks.newClusterRequest( callback ).dispatch( v.getPlacement( ) ); return reply; } else { throw new EucalyptusCloudException( "Failed to find instance: " + request.getInstanceId( ) ); } } catch ( NoSuchElementException e ) { throw new EucalyptusCloudException( "Failed to find instance: " + request.getInstanceId( ) ); } } public void getPasswordData( GetPasswordDataType request ) throws Exception { try { Cluster cluster = null; VmInstance v = VmInstances.getInstance( ).lookup( request.getInstanceId( ) ); if ( !VmState.RUNNING.equals( v.getState( ) ) ) { throw new NoSuchElementException( "Instance " + request.getInstanceId( ) + " is not in a running state." ); } if ( request.isAdministrator( ) \|\| v.getOwnerId( ).equals( request.getUserId( ) ) ) { cluster = Clusters.getInstance( ).lookup( v.getPlacement( ) ); } else { throw new NoSuchElementException( "Instance " + request.getInstanceId( ) + " does not exist." ); } RequestContext.getEventContext( ).setStopFurtherProcessing( true ); if ( v.getPasswordData( ) == null ) { Callbacks.newClusterRequest( new PasswordDataCallback( request ) ).dispatch( cluster.getServiceEndpoint( ) ); } else { GetPasswordDataResponseType reply = request.getReply( ); reply.set_return( true ); reply.setOutput( v.getPasswordData( ) ); reply.setTimestamp( new Date( ) ); reply.setInstanceId( v.getInstanceId( ) ); ServiceContext.dispatch( "ReplyQueue", reply ); } } catch ( NoSuchElementException e ) { ServiceContext.dispatch( "ReplyQueue", new EucalyptusErrorMessageType( RequestContext.getEventContext( ).getService( ).getComponent( ).getClass( ) .getSimpleName( ), request, e.getMessage( ) ) ); } } }

Solution content

    }
  }
  
  public DescribeBundleTasksResponseType describeBundleTasks( DescribeBundleTasksType request ) throws EucalyptusCloudException {
    DescribeBundleTasksResponseType reply = request.getReply( );
    if ( request.getBundleIds( ).isEmpty( ) ) {
      for ( VmInstance v : VmInstances.getInstance( ).listValues( ) ) {
        if ( v.isBundling( ) && ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) ) {
          reply.getBundleTasks( ).add( v.getBundleTask( ) );
        }
      }
      for ( VmInstance v : VmInstances.getInstance( ).listDisabledValues( ) ) {
        if ( v.isBundling( ) && ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) ) {
          reply.getBundleTasks( ).add( v.getBundleTask( ) );
        }
      }
    } else {
      for ( String bundleId : request.getBundleIds( ) ) {
        try {
          VmInstance v = VmInstances.getInstance( ).lookupByBundleId( bundleId );
          if ( v.isBundling( ) && ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) ) {
            reply.getBundleTasks( ).add( v.getBundleTask( ) );
          }
        } catch ( NoSuchElementException e ) {}
      }
    }
    return reply;
  }
  
  public CancelBundleTaskResponseType cancelBundleTask( CancelBundleTaskType request ) throws EucalyptusCloudException {
    CancelBundleTaskResponseType reply = request.getReply( );
    reply.set_return( true );
    
    try {
      VmInstance v = VmInstances.getInstance( ).lookupByBundleId( request.getBundleId( ) );
      if ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) {
        v.getBundleTask( ).setState( "canceling" );
        LOG.info( EventRecord.here( BundleCallback.class, EventType.BUNDLE_CANCELING, request.getUserId( ), v.getBundleTask( ).getBundleId( ),
                                    v.getInstanceId( ) ) );
        
        Cluster cluster = Clusters.getInstance( ).lookup( v.getPlacement( ) );
        
        request.setInstanceId( v.getInstanceId( ) );
        reply.setTask( v.getBundleTask( ) );
        Callbacks.newClusterRequest( new CancelBundleCallback( request ) ).dispatch( cluster.getServiceEndpoint( ) );
        return reply;
      } else {
        throw new EucalyptusCloudException( "Failed to find bundle task: " + request.getBundleId( ) );
      }
    } catch ( NoSuchElementException e ) {
      throw new EucalyptusCloudException( "Failed to find bundle task: " + request.getBundleId( ) );
    }
  }
  
  public BundleInstanceResponseType bundleInstance( BundleInstanceType request ) throws EucalyptusCloudException {
    BundleInstanceResponseType reply = request.getReply( );//TODO: check if the instance has platform windows.
    reply.set_return( true );
    String walrusUrl = SystemConfiguration.getWalrusUrl( );
    String instanceId = request.getInstanceId( );
    User user = null;
    try {
      user = Users.lookupUser( request.getUserId( ) );
    } catch ( NoSuchUserException e1 ) {
      throw new EucalyptusCloudException( "Failed to lookup the specified user's information: " + request.getUserId( ) );
    }
    try {
      VmInstance v = VmInstances.getInstance( ).lookup( instanceId );
      if ( v.isBundling( ) ) {
        reply.setTask( v.getBundleTask( ) );
        return reply;
      } else if ( !"windows".equals( v.getPlatform( ) ) ) {
        throw new EucalyptusCloudException( "Failed to bundle requested vm because the platform is not 'windows': " + request.getInstanceId( ) );
      } else if ( !VmState.RUNNING.equals( v.getState( ) ) ) {
        throw new EucalyptusCloudException( "Failed to bundle requested vm because it is not currently 'running': " + request.getInstanceId( ) );
      } else if ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) {
        BundleTask bundleTask = new BundleTask( v.getInstanceId( ).replaceFirst( "i-", "bun-" ), v.getInstanceId( ), request.getBucket( ), request.getPrefix( ) );
        if ( v.startBundleTask( bundleTask ) ) {
          reply.setTask( bundleTask );
        } else if ( v.getBundleTask( ) == null ) {
          v.resetBundleTask( );
          v.startBundleTask( bundleTask );
          reply.setTask( bundleTask );
        } else {
          throw new EucalyptusCloudException( "Instance is already being bundled: " + v.getBundleTask( ).getBundleId( ) );
        }
        LOG
           .info( EventRecord
                             .here( BundleCallback.class, EventType.BUNDLE_PENDING, request.getUserId( ), v.getBundleTask( ).getBundleId( ), v.getInstanceId( ) ) );
        BundleCallback callback = new BundleCallback( request );
        request.setUrl( walrusUrl );
        request.setAwsAccessKeyId( user.getQueryId( ) );
        Callbacks.newClusterRequest( callback ).dispatch( v.getPlacement( ) );
        return reply;
      } else {
        throw new EucalyptusCloudException( "Failed to find instance: " + request.getInstanceId( ) );
      }
    } catch ( NoSuchElementException e ) {
      throw new EucalyptusCloudException( "Failed to find instance: " + request.getInstanceId( ) );
    }
  }
  
  public void getPasswordData( GetPasswordDataType request ) throws Exception {
    try {
      Cluster cluster = null;
      VmInstance v = VmInstances.getInstance( ).lookup( request.getInstanceId( ) );
      if ( !VmState.RUNNING.equals( v.getState( ) ) ) {
        throw new NoSuchElementException( "Instance " + request.getInstanceId( ) + " is not in a running state." );
      }
      if ( request.isAdministrator( ) || v.getOwnerId( ).equals( request.getUserId( ) ) ) {
        cluster = Clusters.getInstance( ).lookup( v.getPlacement( ) );
      } else {
        throw new NoSuchElementException( "Instance " + request.getInstanceId( ) + " does not exist." );
      }
      RequestContext.getEventContext( ).setStopFurtherProcessing( true );
      if ( v.getPasswordData( ) == null ) {
        Callbacks.newClusterRequest( new PasswordDataCallback( request ) ).dispatch( cluster.getServiceEndpoint( ) );
      } else {
        GetPasswordDataResponseType reply = request.getReply( );
        reply.set_return( true );
        reply.setOutput( v.getPasswordData( ) );
        reply.setTimestamp( new Date( ) );
        reply.setInstanceId( v.getInstanceId( ) );
        ServiceContext.dispatch( "ReplyQueue", reply );
      }
    } catch ( NoSuchElementException e ) {
      ServiceContext.dispatch( "ReplyQueue", new EucalyptusErrorMessageType( RequestContext.getEventContext( ).getService( ).getComponent( ).getClass( )
                                                                                           .getSimpleName( ), request, e.getMessage( ) ) );
    }
  }
  
}

File
VmControl.java

Developer's decision
Version 1

Kind of conflict
Method declaration

Chunk

Conflicting content
import org.apache.log4j.Logger; import com.eucalyptus.bootstrap.Component; <<<<<<< HEAD ======= import com.eucalyptus.component.ComponentState; >>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6 import com.eucalyptus.component.Components; import com.eucalyptus.config.Configuration; import com.eucalyptus.config.StorageControllerConfiguration;

Conflicting content

import org.apache.log4j.Logger;

import com.eucalyptus.bootstrap.Component;
<<<<<<< HEAD
=======
import com.eucalyptus.component.ComponentState;
>>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6
import com.eucalyptus.component.Components;
import com.eucalyptus.config.Configuration;
import com.eucalyptus.config.StorageControllerConfiguration;

Solution content
import org.apache.log4j.Logger; import com.eucalyptus.bootstrap.Component; import com.eucalyptus.component.ComponentState; import com.eucalyptus.component.Components; import com.eucalyptus.config.Configuration; import com.eucalyptus.config.StorageControllerConfiguration;

Solution content

import org.apache.log4j.Logger;

import com.eucalyptus.bootstrap.Component;
import com.eucalyptus.component.ComponentState;
import com.eucalyptus.component.Components;
import com.eucalyptus.config.Configuration;
import com.eucalyptus.config.StorageControllerConfiguration;

File
StorageProperties.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
static { GroovyUtil.loadConfig("storageprops.groovy"); } public static void updateName() { <<<<<<< HEAD try { ======= try { >>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6 StorageProperties.NAME = Components.lookup( Component.storage ).getLocalService( ).getServiceConfiguration( ).getName( ); } catch ( NoSuchElementException ex ) { LOG.error( ex , ex );

Conflicting content

	static { GroovyUtil.loadConfig("storageprops.groovy"); }

	public static void updateName() {
<<<<<<< HEAD
    try {
=======
	  try {
>>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6
      StorageProperties.NAME = Components.lookup( Component.storage ).getLocalService( ).getServiceConfiguration( ).getName( );
    } catch ( NoSuchElementException ex ) {
      LOG.error( ex , ex );

Solution content
static { GroovyUtil.loadConfig("storageprops.groovy"); } public static void updateName() { try { StorageProperties.NAME = Components.lookup( Component.storage ).getLocalService( ).getServiceConfiguration( ).getName( ); } catch ( NoSuchElementException ex ) { LOG.error( ex , ex );

Solution content

	static { GroovyUtil.loadConfig("storageprops.groovy"); }

	public static void updateName() {
    try {
      StorageProperties.NAME = Components.lookup( Component.storage ).getLocalService( ).getServiceConfiguration( ).getName( );
    } catch ( NoSuchElementException ex ) {
      LOG.error( ex , ex );

File
StorageProperties.java

Developer's decision
Version 1

Kind of conflict
Try statement

Chunk

Conflicting content
import com.eucalyptus.bootstrap.Bootstrap; import com.eucalyptus.bootstrap.Bootstrapper; import com.eucalyptus.bootstrap.Component; <<<<<<< HEAD ======= import com.eucalyptus.bootstrap.DependsLocal; >>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6 import com.eucalyptus.bootstrap.Provides; import com.eucalyptus.bootstrap.RunDuring;

Conflicting content

import com.eucalyptus.bootstrap.Bootstrap;
import com.eucalyptus.bootstrap.Bootstrapper;
import com.eucalyptus.bootstrap.Component;
<<<<<<< HEAD
=======
import com.eucalyptus.bootstrap.DependsLocal;
>>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6
import com.eucalyptus.bootstrap.Provides;
import com.eucalyptus.bootstrap.RunDuring;

Solution content
import com.eucalyptus.bootstrap.Bootstrap; import com.eucalyptus.bootstrap.Bootstrapper; import com.eucalyptus.bootstrap.Component; import com.eucalyptus.bootstrap.DependsLocal; import com.eucalyptus.bootstrap.Provides; import com.eucalyptus.bootstrap.RunDuring;

Solution content

import com.eucalyptus.bootstrap.Bootstrap;
import com.eucalyptus.bootstrap.Bootstrapper;
import com.eucalyptus.bootstrap.Component;
import com.eucalyptus.bootstrap.DependsLocal;
import com.eucalyptus.bootstrap.Provides;
import com.eucalyptus.bootstrap.RunDuring;

File
SystemClock.java

Developer's decision
Version 2

Kind of conflict
Import

Chunk

Conflicting content
@Override public void doStop( ) throws MuleException { <<<<<<< HEAD // server.get( ).stop( ); ======= // server.get( ).stop( ); >>>>>>> 7c9bc1c95efe637fbd056856317290259aa9c7e6 } @Override

Solution content
@Override public void doStop( ) throws MuleException { // server.get( ).stop( ); } @Override

File
NioHttpConnector.java

Developer's decision
Version 1

Kind of conflict
Comment

Projects >> eucalyptus >>ebb80e6abef99d19972d066b7141bd13bbab531d