added a computeservicecontext provider for the vbox host (byon)

labs/virtualbox/src/main/java/org/jclouds/virtualbox/Host.java

@@ -0,0 +1,40 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.jclouds.virtualbox;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import javax.inject.Qualifier;
+
+/**
+ * Signals the annotated target pertains to the vbox host and not to one of the nodes.
+ * 
+ * @author dralves
+ * 
+ */
+@Retention(value = RetentionPolicy.RUNTIME)
+@Target(value = { ElementType.TYPE, ElementType.FIELD, ElementType.PARAMETER, ElementType.METHOD })
+@Qualifier
+public @interface Host {
+
+}

labs/virtualbox/src/main/java/org/jclouds/virtualbox/config/VirtualBoxComputeServiceContextModule.java

@@ -20,6 +20,9 @@
 package org.jclouds.virtualbox.config;
 
 import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_PRECONFIGURATION_URL;
+import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_PROVIDER;
+import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_WEBSERVER_CREDENTIAL;
+import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_WEBSERVER_IDENTITY;
 
 import java.io.InputStream;
 import java.net.URI;
@@ -32,10 +35,13 @@ import javax.inject.Singleton;
 
 import org.eclipse.jetty.server.Server;
 import org.jclouds.byon.Node;
+import org.jclouds.byon.config.CacheNodeStoreModule;
 import org.jclouds.byon.functions.NodeToNodeMetadata;
 import org.jclouds.byon.suppliers.SupplyFromProviderURIOrNodesProperty;
 import org.jclouds.compute.ComputeServiceAdapter;
 import org.jclouds.compute.ComputeServiceAdapter.NodeAndInitialCredentials;
+import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.compute.ComputeServiceContextFactory;
 import org.jclouds.compute.config.ComputeServiceAdapterContextModule;
 import org.jclouds.compute.domain.Hardware;
 import org.jclouds.compute.domain.HardwareBuilder;
@@ -47,8 +53,11 @@ import org.jclouds.compute.domain.TemplateBuilder;
 import org.jclouds.compute.reference.ComputeServiceConstants.Timeouts;
 import org.jclouds.domain.Location;
 import org.jclouds.functions.IdentityFunction;
+import org.jclouds.logging.slf4j.config.SLF4JLoggingModule;
 import org.jclouds.predicates.RetryablePredicate;
 import org.jclouds.ssh.SshClient;
+import org.jclouds.sshj.config.SshjSshClientModule;
+import org.jclouds.virtualbox.Host;
 import org.jclouds.virtualbox.Preconfiguration;
 import org.jclouds.virtualbox.compute.VirtualBoxComputeServiceAdapter;
 import org.jclouds.virtualbox.domain.ExecutionType;
@@ -82,7 +91,9 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
 import com.google.inject.Injector;
+import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.TypeLiteral;
 
@@ -150,6 +161,23 @@ public class VirtualBoxComputeServiceContextModule extends
     return CacheBuilder.newBuilder().build(cacheLoader);
   }
 
+  @Provides
+  @Host
+  @Singleton
+  protected ComputeServiceContext provideHostController() {
+    String provider = "byon";
+    String identity = "";
+    String credential = "";
+    CacheNodeStoreModule hostModule = new CacheNodeStoreModule(ImmutableMap.of(
+        "host",
+        Node.builder().id("host").name("host installing virtualbox").hostname("localhost")
+            .osFamily(OsFamily.LINUX.toString()).osDescription(System.getProperty("os.name"))
+            .osVersion(System.getProperty("os.version")).group("ssh").username(System.getProperty("user.name"))
+            .credentialUrl(URI.create("file://" + System.getProperty("user.home") + "/.ssh/id_rsa")).build()));
+    return new ComputeServiceContextFactory().createContext(provider, identity, credential,
+        ImmutableSet.<Module> of(new SLF4JLoggingModule(), new SshjSshClientModule(), hostModule));
+  }
+
   @Provides
   @Singleton
   protected Server providesJettyServer(@Named(VIRTUALBOX_PRECONFIGURATION_URL) String preconfigurationUrl) {

labs/virtualbox/src/main/java/org/jclouds/virtualbox/config/VirtualBoxConstants.java

@@ -58,4 +58,6 @@ public interface VirtualBoxConstants {
    public static final String VIRTUALBOX_DEFAULT_DIR = System.getProperty("user.home")
        + File.separator +".jclouds-vbox";
    
+   public static final String VIRTUALBOX_PROVIDER = "virtualbox";
+
 }

labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java

@@ -35,6 +35,7 @@ import org.jclouds.compute.options.RunScriptOptions;
 import org.jclouds.compute.reference.ComputeServiceConstants;
 import org.jclouds.logging.Logger;
 import org.jclouds.ssh.SshClient;
+import org.jclouds.virtualbox.Host;
 import org.jclouds.virtualbox.Preconfiguration;
 import org.jclouds.virtualbox.domain.ExecutionType;
 import org.jclouds.virtualbox.domain.IsoSpec;
@@ -64,7 +65,7 @@ public class CreateAndInstallVm implements Function<MasterSpec, IMachine> {
   @Named(ComputeServiceConstants.COMPUTE_LOGGER)
   protected Logger                                                logger = Logger.NULL;
 
-   private final ComputeServiceContext context;
+  private final ComputeServiceContext                             vboxHostContext;
   private final Supplier<VirtualBoxManager>                       manager;
   private final CreateAndRegisterMachineFromIsoIfNotAlreadyExists createAndRegisterMachineFromIsoIfNotAlreadyExists;
 
@@ -78,11 +79,12 @@ public class CreateAndInstallVm implements Function<MasterSpec, IMachine> {
   private final MachineUtils                                      machineUtils;
 
   @Inject
-   public CreateAndInstallVm(ComputeServiceContext context, Supplier<VirtualBoxManager> manager,
+  public CreateAndInstallVm(@Host ComputeServiceContext vboxHostContext, Supplier<VirtualBoxManager> manager,
       CreateAndRegisterMachineFromIsoIfNotAlreadyExists CreateAndRegisterMachineFromIsoIfNotAlreadyExists,
       Predicate<SshClient> sshResponds, Function<IMachine, SshClient> sshClientForIMachine,
-         ExecutionType executionType, MachineUtils machineUtils, @Preconfiguration LoadingCache<IsoSpec, URI> preConfiguration) {
-      this.context = context;
+      ExecutionType executionType, MachineUtils machineUtils,
+      @Preconfiguration LoadingCache<IsoSpec, URI> preConfiguration) {
+    this.vboxHostContext = vboxHostContext;
     this.manager = manager;
     this.createAndRegisterMachineFromIsoIfNotAlreadyExists = CreateAndRegisterMachineFromIsoIfNotAlreadyExists;
     this.sshResponds = sshResponds;
@@ -115,10 +117,10 @@ public class CreateAndInstallVm implements Function<MasterSpec, IMachine> {
     checkState(sshResponds.apply(client), "timed out waiting for guest %s to be accessible via ssh", vmName);
 
     logger.debug(">> awaiting installation of guest additions on vm: %s", vmName);
-      checkState(new GuestAdditionsInstaller(context).apply(vmName));
+    checkState(new GuestAdditionsInstaller(vboxHostContext).apply(vmName));
 
     logger.debug(">> awaiting post-installation actions on vm: %s", vmName);
-      ListenableFuture<ExecResponse> execFuture = context.getComputeService().submitScriptOnNode(vmName,
+    ListenableFuture<ExecResponse> execFuture = vboxHostContext.getComputeService().submitScriptOnNode(vmName,
         call("cleanupUdevIfNeeded"), RunScriptOptions.NONE);
     ExecResponse execResponse = Futures.getUnchecked(execFuture);
     checkState(execResponse.getExitCode() == 0);
@@ -129,8 +131,8 @@ public class CreateAndInstallVm implements Function<MasterSpec, IMachine> {
   }
 
   private void configureOsInstallationWithKeyboardSequence(String vmName, String installationKeySequence) {
-      Iterable<List<Integer>> scancodelist =
-            transform(Splitter.on(" ").split(installationKeySequence), new StringToKeyCode());
+    Iterable<List<Integer>> scancodelist = transform(Splitter.on(" ").split(installationKeySequence),
+        new StringToKeyCode());
 
     for (List<Integer> scancodes : scancodelist) {
       machineUtils.lockSessionOnMachineAndApply(vmName, LockType.Shared, new SendScancodes(scancodes));

labs/virtualbox/src/main/java/org/jclouds/virtualbox/predicates/GuestAdditionsInstaller.java

@@ -25,18 +25,19 @@ public class GuestAdditionsInstaller implements Predicate<String> {
   @Named(ComputeServiceConstants.COMPUTE_LOGGER)
   protected Logger                    logger = Logger.NULL;
 
-   private final ComputeServiceContext context;
+  private final ComputeServiceContext vboxHostContext;
   private String                      vboxVersion;
 
   @Inject
-   public GuestAdditionsInstaller(ComputeServiceContext context) {
-      this.context = context;
+  public GuestAdditionsInstaller(ComputeServiceContext vboxHostContext) {
+    this.vboxHostContext = vboxHostContext;
   }
 
   @Override
   public boolean apply(String vmName) {
-      vboxVersion = Iterables.get(Splitter.on('r').split(context.getProviderSpecificContext().getBuildVersion()), 0);
-      ListenableFuture<ExecResponse> execFuture = context.getComputeService().submitScriptOnNode(vmName,
+    vboxVersion = Iterables.get(Splitter.on('r').split(vboxHostContext.getProviderSpecificContext().getBuildVersion()),
+        0);
+    ListenableFuture<ExecResponse> execFuture = vboxHostContext.getComputeService().submitScriptOnNode(vmName,
         new InstallGuestAdditions(vboxVersion), RunScriptOptions.NONE);
     ExecResponse execResponse = Futures.getUnchecked(execFuture);
     return execResponse == null ? false : execResponse.getExitStatus() == 0;

labs/virtualbox/src/main/java/org/jclouds/virtualbox/predicates/SshResponds.java

@@ -45,8 +45,10 @@ public class SshResponds implements Predicate<SshClient> {
       } catch (SshException e) {
          logger.trace("No response from ssh daemon connecting to %s: %s", client, e.getMessage());
       } finally {
+        if (client != null) {
          client.disconnect();
         }
+      }
       return false;
    }
 }