Issue 190: penciled in compute integration, tests first

chef/compute/pom.xml

@@ -40,7 +40,7 @@
                 <jclouds.compute.identity>YOUR_ACCOUNT</jclouds.compute.identity>
                 <jclouds.compute.credential>YOUR_CREDENTIAL</jclouds.compute.credential>
                 <jclouds.chef.identity>YOUR_USER</jclouds.chef.identity>
-                <jclouds.chef.identity.pem>${user.home}/.chef/${jclouds.chef.identity}.pem</jclouds.chef.identity.pem>
+                <jclouds.chef.credential.pem>${user.home}/.chef/${jclouds.chef.identity}.pem</jclouds.chef.credential.pem>
                 <jclouds.opscodeplatform.org>YOUR_ORG</jclouds.opscodeplatform.org>
                 <jclouds.chef.endpoint>https://api.opscode.com/organizations/${jclouds.opscodeplatform.org}</jclouds.chef.endpoint>
         </properties>
@@ -71,6 +71,25 @@
                         <artifactId>jclouds-compute</artifactId>
                         <version>${project.version}</version>
                 </dependency>
+                <dependency>
+                        <groupId>${project.groupId}</groupId>
+                        <artifactId>jclouds-log4j</artifactId>
+                        <version>${project.version}</version>
+                        <scope>test</scope>
+                </dependency>
+                <dependency>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                        <version>1.2.14</version>
+                        <scope>test</scope>
+                </dependency>
+                <dependency>
+                        <groupId>${project.groupId}</groupId>
+                        <artifactId>jclouds-core</artifactId>
+                        <version>${project.version}</version>
+                        <type>test-jar</type>
+                        <scope>test</scope>
+                </dependency>
                 <dependency>
                         <groupId>${project.groupId}</groupId>
                         <artifactId>jclouds-compute</artifactId>
@@ -130,8 +149,8 @@
                                                                                         <value>${jclouds.chef.identity}</value>
                                                                                 </property>
                                                                                 <property>
-                                                                                        <name>jclouds.chef.identity.pem</name>
+                                                                                        <name>jclouds.chef.credential.pem</name>
-                                                                                        <value>${jclouds.chef.identity.pem}</value>
+                                                                                        <value>${jclouds.chef.credential.pem}</value>
                                                                                 </property>
                                                                                 <property>
                                                                                         <name>jclouds.chef.endpoint</name>

chef/compute/src/test/java/org/jclouds/chef/compute/ChefComputeServiceLiveTest.java

@@ -0,0 +1,96 @@
+/**
+ *
+ * Copyright (C) 2010 Cloud Conscious, LLC. <info@cloudconscious.com>
+ *
+ * ====================================================================
+ * Licensed 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.chef.compute;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Properties;
+
+import org.jclouds.chef.ChefContext;
+import org.jclouds.chef.ChefContextFactory;
+import org.jclouds.compute.ComputeServiceContext;
+import org.jclouds.compute.ComputeServiceContextFactory;
+import org.jclouds.logging.log4j.config.Log4JLoggingModule;
+import org.testng.annotations.AfterGroups;
+import org.testng.annotations.BeforeGroups;
+import org.testng.annotations.Test;
+
+import com.google.common.base.Charsets;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.io.Files;
+import com.google.inject.Module;
+
+/**
+ * 
+ * @author Adrian Cole
+ */
+@Test(groups = "live", testName = "chef.ChefComputeServiceLiveTest")
+public class ChefComputeServiceLiveTest {
+
+   private ComputeServiceContext computeContext;
+   private ChefContext chefContext;
+
+   @BeforeGroups(groups = { "live" })
+   public void setupCompute() {
+      String computeProvider = checkNotNull(System.getProperty("jclouds.compute.provider"), "jclouds.compute.provider");
+      String computeEndpoint = System.getProperty("jclouds.compute.endpoint");
+      Properties props = new Properties();
+      if (computeEndpoint != null && !computeEndpoint.trim().equals(""))
+         props.setProperty(computeProvider + ".endpoint", computeEndpoint);
+      String computeIdentity = checkNotNull(System.getProperty("jclouds.compute.identity"), "jclouds.compute.identity");
+      String computeCredential = checkNotNull(System.getProperty("jclouds.compute.credential"),
+               "jclouds.compute.credential");
+      computeContext = new ComputeServiceContextFactory().createContext(computeProvider, computeIdentity,
+               computeCredential, ImmutableSet.of(new Log4JLoggingModule()), props);
+   }
+
+   @BeforeGroups(groups = { "live" })
+   public void setupChef() throws IOException {
+      String chefEndpoint = checkNotNull(System.getProperty("jclouds.chef.endpoint"), "jclouds.chef.endpoint");
+      String chefIdentity = checkNotNull(System.getProperty("jclouds.chef.identity"), "jclouds.chef.identity");
+      String chefCredentialFile = System.getProperty("jclouds.chef.credential.pem");
+      if (chefCredentialFile == null || chefCredentialFile.equals(""))
+         chefCredentialFile = System.getProperty("user.home") + "/.chef/" + chefIdentity + ".pem";
+      Properties props = new Properties();
+      props.setProperty("chef.endpoint", chefEndpoint);
+      chefContext = new ChefContextFactory().createContext(chefIdentity, Files.toString(new File(chefCredentialFile),
+               Charsets.UTF_8), ImmutableSet.<Module> of(new Log4JLoggingModule()), props);
+   }
+
+   @Test
+   public void test() {
+      computeContext.getComputeService().listNodes();
+      chefContext.getChefService().listNodesDetails();
+   }
+
+   @AfterGroups(groups = { "live" })
+   public void teardownCompute() {
+      if (computeContext != null)
+         computeContext.close();
+   }
+
+   @AfterGroups(groups = { "live" })
+   public void teardownChef() {
+      if (chefContext != null)
+         chefContext.close();
+   }
+}

chef/compute/src/test/resources/log4j.xml

@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="UTF-8"?>
+    <!--
+
+
+        Copyright (C) 2009 Cloud Conscious, LLC.
+        <info@cloudconscious.com>
+
+        ====================================================================
+        Licensed 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.
+        ====================================================================
+    -->
+<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
+    <!--
+        For more configuration infromation and examples see the Apache
+        Log4j website: http://logging.apache.org/log4j/
+    -->
+<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/"
+    debug="false">
+
+    <!-- A time/date based rolling appender -->
+    <appender name="SSHFILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds-ssh.log" />
+        <param name="Append" value="true" />
+
+        <!-- Rollover at midnight each day -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+
+        <param name="Threshold" value="TRACE" />
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+
+            <!--
+                The full pattern: Date MS Priority [Category]
+                (Thread:NDC) Message\n <param name="ConversionPattern"
+                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+            -->
+        </layout>
+    </appender>
+    <!-- A time/date based rolling appender -->
+    <appender name="CHEFFILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds-chef.log" />
+        <param name="Append" value="true" />
+
+        <!-- Rollover at midnight each day -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+
+        <param name="Threshold" value="TRACE" />
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+
+            <!--
+                The full pattern: Date MS Priority [Category]
+                (Thread:NDC) Message\n <param name="ConversionPattern"
+                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+            -->
+        </layout>
+    </appender>
+
+
+    <!-- A time/date based rolling appender -->
+    <appender name="WIREFILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds-wire.log" />
+        <param name="Append" value="true" />
+
+        <!-- Rollover at midnight each day -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+
+        <param name="Threshold" value="TRACE" />
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+
+            <!--
+                The full pattern: Date MS Priority [Category]
+                (Thread:NDC) Message\n <param name="ConversionPattern"
+                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+            -->
+        </layout>
+    </appender>
+
+    <!-- A time/date based rolling appender -->
+    <appender name="FILE" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="target/test-data/jclouds.log" />
+        <param name="Append" value="true" />
+
+        <!-- Rollover at midnight each day -->
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+
+        <param name="Threshold" value="TRACE" />
+
+        <layout class="org.apache.log4j.PatternLayout">
+            <!-- The default pattern: Date Priority [Category] Message\n -->
+            <param name="ConversionPattern" value="%d %-5p [%c] (%t) %m%n" />
+
+            <!--
+                The full pattern: Date MS Priority [Category]
+                (Thread:NDC) Message\n <param name="ConversionPattern"
+                value="%d %-5r %-5p [%c] (%t:%x) %m%n"/>
+            -->
+        </layout>
+    </appender>
+    <appender name="ASYNCCHEF" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="CHEFFILE" />
+    </appender>
+    <appender name="ASYNCSSH" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="SSHFILE" />
+    </appender>
+
+    <appender name="ASYNC" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="FILE" />
+    </appender>
+
+    <appender name="ASYNCWIRE" class="org.apache.log4j.AsyncAppender">
+        <appender-ref ref="WIREFILE" />
+    </appender>
+
+    <!-- ================ -->
+    <!-- Limit categories -->
+    <!-- ================ -->
+
+    <category name="org.jclouds">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNC" />
+    </category>
+
+    <category name="jclouds.headers">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNCWIRE" />
+    </category>
+
+    <category name="jclouds.wire">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNCWIRE" />
+    </category>
+
+    <category name="jclouds.chef">
+        <priority value="TRACE" />
+        <appender-ref ref="ASYNCCHEF" />
+    </category>
+
+    <category name="jclouds.ssh">
+        <priority value="DEBUG" />
+        <appender-ref ref="ASYNCSSH" />
+    </category>
+    <!--
+
+        <category name="jclouds.wire"> <priority value="DEBUG" />
+        <appender-ref ref="ASYNCWIRE" /> </category> <category
+        name="jclouds.signature"> <priority value="DEBUG" />
+        <appender-ref ref="ASYNCWIRE" /> </category>
+    -->
+
+    <!-- ======================= -->
+    <!-- Setup the Root category -->
+    <!-- ======================= -->
+
+    <root>
+        <priority value="WARN" />
+    </root>
+
+</log4j:configuration>