Repository: gora Updated Branches: refs/heads/master 356c1f8a8 -> e56eebb9d
GORA-452 Upgrade goraci prior to Chef and the ComputeService implementations Project: http://git-wip-us.apache.org/repos/asf/gora/repo Commit: http://git-wip-us.apache.org/repos/asf/gora/commit/a11bf622 Tree: http://git-wip-us.apache.org/repos/asf/gora/tree/a11bf622 Diff: http://git-wip-us.apache.org/repos/asf/gora/diff/a11bf622 Branch: refs/heads/master Commit: a11bf622685c55908b2a46ec7ec38870cd664824 Parents: 356c1f8 Author: Lewis John McGibbney <[email protected]> Authored: Tue Nov 24 18:11:05 2015 -0800 Committer: Lewis John McGibbney <[email protected]> Committed: Tue Nov 24 18:11:05 2015 -0800 ---------------------------------------------------------------------- gora-goraci/goraci.sh | 22 +++++++------- .../libext/gora-core-tests-0.5-SNAPSHOT.jar | Bin 128135 -> 0 bytes gora-goraci/pom.xml | 29 +++++++++---------- .../rackspace/RackspaceOrchestration.java | 29 +++++++++++-------- gora-goraci/src/main/resources/gora.properties | 9 +++--- 5 files changed, 47 insertions(+), 42 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/gora/blob/a11bf622/gora-goraci/goraci.sh ---------------------------------------------------------------------- diff --git a/gora-goraci/goraci.sh b/gora-goraci/goraci.sh index 085fe3c..9de4dfb 100755 --- a/gora-goraci/goraci.sh +++ b/gora-goraci/goraci.sh @@ -31,17 +31,17 @@ if [ $# = 0 ]; then echo " Generator A map only job that generates data." echo " Verify A map reduce job that looks for holes. Look at the counts after running. - REFERENCED and UNREFERENCED are ok, - any UNDEFINED counts are bad. Do not - run at the same time as the Generator." - echo " Walker A standalong program that starts - following a linked list and emits - timing info." + REFERENCED and UNREFERENCED are ok, + any UNDEFINED counts are bad. Do not + run at the same time as the Generator." + echo " Walker A standalone program that starts + following a linked list and emits + timing info." echo " Print A standalone program that prints nodes - in the linked list." - echo " Delete A standalone program that deletes a - single node." - echo " Loop A program to Loop through Generator and + in the linked list." + echo " Delete A standalone program that deletes a + single node." + echo " Loop A program to Loop through Generator and Verify steps" echo " or" echo " CLASSNAME run the class named CLASSNAME" @@ -99,6 +99,6 @@ done #run it export HADOOP_CLASSPATH="$CLASSPATH" LIBJARS=`echo $HADOOP_CLASSPATH | tr : ,` -hadoop jar "$GORACI_HOME/lib/org.apache.gora.goraci-0.0.1-SNAPSHOT.jar" $CLASS -libjars "$LIBJARS" "$@" +hadoop jar "$GORACI_HOME/lib/gora-goraci-0.7-SNAPSHOT.jar" $CLASS -libjars "$LIBJARS" "$@" http://git-wip-us.apache.org/repos/asf/gora/blob/a11bf622/gora-goraci/libext/gora-core-tests-0.5-SNAPSHOT.jar ---------------------------------------------------------------------- diff --git a/gora-goraci/libext/gora-core-tests-0.5-SNAPSHOT.jar b/gora-goraci/libext/gora-core-tests-0.5-SNAPSHOT.jar deleted file mode 100755 index 48f0bb5..0000000 Binary files a/gora-goraci/libext/gora-core-tests-0.5-SNAPSHOT.jar and /dev/null differ http://git-wip-us.apache.org/repos/asf/gora/blob/a11bf622/gora-goraci/pom.xml ---------------------------------------------------------------------- diff --git a/gora-goraci/pom.xml b/gora-goraci/pom.xml index 9ad2a2b..177abd0 100644 --- a/gora-goraci/pom.xml +++ b/gora-goraci/pom.xml @@ -48,7 +48,7 @@ </ciManagement> <properties> - <jclouds.version>1.8.0</jclouds.version> + <jclouds.version>1.9.0</jclouds.version> </properties> <build> @@ -137,23 +137,24 @@ <profiles> <profile> <!-- this profile contains the runtime deps for accumulo-1.4 --> - <id>accumulo-1.4</id> + <id>accumulo-1.6.4</id> <dependencies> <dependency> <groupId>org.apache.gora</groupId> <artifactId>gora-accumulo</artifactId> + <version>${project.version}</version> <scope>runtime</scope> </dependency> <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> - <version>1.4.0</version> + <version>1.6.4</version> <scope>runtime</scope> </dependency> - <dependency> + <!-- dependency> <groupId>org.apache.accumulo</groupId> <artifactId>cloudtrace</artifactId> - <version>1.4.0</version> + <version>1.6.4</version> <scope>runtime</scope> </dependency> <dependency> @@ -161,11 +162,10 @@ <artifactId>libthrift</artifactId> <version>0.6.1</version> <scope>runtime</scope> - </dependency> + </dependency--> <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.3.1</version> <scope>runtime</scope> </dependency> </dependencies> @@ -194,7 +194,6 @@ <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> - <version>3.4.3</version> <scope>runtime</scope> </dependency> </dependencies> @@ -262,13 +261,6 @@ <groupId>org.apache.gora</groupId> <artifactId>gora-core</artifactId> </dependency> - <dependency> - <groupId>org.apache.gora</groupId> - <artifactId>gora-core-tests</artifactId> - <version>0.5-SNAPSHOT</version> - <scope>system</scope> - <systemPath>${project.basedir}/libext/gora-core-tests-0.5-SNAPSHOT.jar</systemPath> - </dependency> <dependency> <groupId>org.apache.hadoop</groupId> @@ -381,6 +373,13 @@ <artifactId>rackspace-clouddns-uk</artifactId> <version>${jclouds.version}</version> </dependency> + + <!-- JClouds Chef Dependencies --> + <dependency> + <groupId>org.apache.jclouds.api</groupId> + <artifactId>chef</artifactId> + <version>${jclouds.version}</version> + </dependency> <!-- Logging Dependencies --> <dependency> http://git-wip-us.apache.org/repos/asf/gora/blob/a11bf622/gora-goraci/src/main/java/org/apache/gora/goraci/rackspace/RackspaceOrchestration.java ---------------------------------------------------------------------- diff --git a/gora-goraci/src/main/java/org/apache/gora/goraci/rackspace/RackspaceOrchestration.java b/gora-goraci/src/main/java/org/apache/gora/goraci/rackspace/RackspaceOrchestration.java index 338708a..aea05ea 100644 --- a/gora-goraci/src/main/java/org/apache/gora/goraci/rackspace/RackspaceOrchestration.java +++ b/gora-goraci/src/main/java/org/apache/gora/goraci/rackspace/RackspaceOrchestration.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.util.NoSuchElementException; import java.util.Properties; -import org.apache.gora.mock.store.MockDataStore; +import org.apache.gora.memory.store.MemStore; import org.apache.gora.store.DataStoreFactory; import org.jclouds.ContextBuilder; import org.jclouds.openstack.nova.v2_0.NovaApi; @@ -42,8 +42,13 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; /** - * This is the main class for initiating Rackspace cloud - * topography for use within the GoraCI job. + * <p>This is the main class for initiating Rackspace cloud + * topography for use within the GoraCI job. A wealth of settings + * are configurable from within <code>gora.properties</code>.</p> + * <p>For + * further documentation on the Rackspace Orchestration please see the + * <a href="http://gora.apache.org/current/index.html#goraci-integration-testsing-suite";> + * current documentation</a>.</p> * @param <K> * */ @@ -79,15 +84,15 @@ public class RackspaceOrchestration<K> { */ public static void main(String[] args) throws NoSuchElementException, InstantiationException, IllegalAccessException, IOException { Properties properties = DataStoreFactory.createProps(); - String rsContinent = DataStoreFactory.findProperty(properties, MockDataStore.class.newInstance(), + String rsContinent = DataStoreFactory.findProperty(properties, MemStore.class.newInstance(), RS_CONTINENT, "rackspace-cloudservers-us"); - String rsUser = DataStoreFactory.findProperty(properties, MockDataStore.class.newInstance(), RS_USERNAME, "asf-gora"); - String rsApiKey = DataStoreFactory.findProperty(properties, MockDataStore.class.newInstance(), RS_APIKEY, null); - String rs_region = DataStoreFactory.findProperty(properties, MockDataStore.class.newInstance(), RS_REGION, "DFW"); - String rs_flavourId = DataStoreFactory.findProperty(properties, MockDataStore.class.newInstance(), RS_FLAVORID, null); - String rs_imageId = DataStoreFactory.findProperty(properties, MockDataStore.class.newInstance(), RS_IMAGEID, null); - int num_servers = Integer.parseInt(DataStoreFactory.findProperty(properties, MockDataStore.class.newInstance(), RS_NUM_SERVERS, "10")); - String serverName = DataStoreFactory.findProperty(properties, MockDataStore.class.newInstance(), RS_SERVERNAME, "goraci_test_server"); + String rsUser = DataStoreFactory.findProperty(properties, MemStore.class.newInstance(), RS_USERNAME, "asf-gora"); + String rsApiKey = DataStoreFactory.findProperty(properties, MemStore.class.newInstance(), RS_APIKEY, null); + String rs_region = DataStoreFactory.findProperty(properties, MemStore.class.newInstance(), RS_REGION, "DFW"); + String rs_flavourId = DataStoreFactory.findProperty(properties, MemStore.class.newInstance(), RS_FLAVORID, null); + String rs_imageId = DataStoreFactory.findProperty(properties, MemStore.class.newInstance(), RS_IMAGEID, null); + int num_servers = Integer.parseInt(DataStoreFactory.findProperty(properties, MemStore.class.newInstance(), RS_NUM_SERVERS, "10")); + String serverName = DataStoreFactory.findProperty(properties, MemStore.class.newInstance(), RS_SERVERNAME, "goraci_test_server"); NovaApi novaApi = ContextBuilder.newBuilder(rsContinent).credentials(rsUser, rsApiKey).buildApi(NovaApi.class); LOG.info("Defining Rackspace cloudserver continent as: {}, and region: {}.", rsContinent, rs_region); @@ -106,7 +111,7 @@ public class RackspaceOrchestration<K> { File keyPairFile = null; String publicKey = null; //Use your own .pub key which should be on CP - if (DataStoreFactory.findBooleanProperty(properties, MockDataStore.class.newInstance(), RS_PUBKEY, "true")) { + if (DataStoreFactory.findBooleanProperty(properties, MemStore.class.newInstance(), RS_PUBKEY, "true")) { keyPairFile = new File("~/.ssh/id_rsa.pub"); LOG.info("Uploading local public key from ~/.ssh/id_rsa.pub to Rackspace..."); } else { http://git-wip-us.apache.org/repos/asf/gora/blob/a11bf622/gora-goraci/src/main/resources/gora.properties ---------------------------------------------------------------------- diff --git a/gora-goraci/src/main/resources/gora.properties b/gora-goraci/src/main/resources/gora.properties index 8d6fbf3..a6ba5be 100644 --- a/gora-goraci/src/main/resources/gora.properties +++ b/gora-goraci/src/main/resources/gora.properties @@ -62,11 +62,12 @@ gora.datastore.rackspace.uploadpubkey=false ############################### # Default Accumulo properties # ############################### -gora.datastore.default=org.apache.gora.goraci.accumulo.store.AccumuloStore -gora.datastore.accumulo.instance=test14 -gora.datastore.accumulo.zookeepers=localhost +gora.datastore.default=org.apache.gora.accumulo.store.AccumuloStore +gora.datastore.accumulo.mock=false +gora.datastore.accumulo.instance=goraCITest +gora.datastore.accumulo.zookeepers=localhost:56321 gora.datastore.accumulo.user=root -gora.datastore.accumulo.password=secret +gora.datastore.accumulo.password=drowssap ################################ # Default AvroStore properties #
