read in byon config via yaml

This commit is contained in:
Kelvin Kakugawa 2011-01-25 10:52:06 -08:00
parent 0a769ca6f5
commit ceaddcc57f
3 changed files with 75 additions and 5 deletions

View File

@ -74,6 +74,11 @@
<version>${project.version}</version> <version>${project.version}</version>
<scope>test</scope> <scope>test</scope>
</dependency> </dependency>
<dependency>
<groupId>org.yaml</groupId>
<artifactId>snakeyaml</artifactId>
<version>1.6</version>
</dependency>
</dependencies> </dependencies>
<profiles> <profiles>

View File

@ -19,9 +19,14 @@
package org.jclouds.byon.config; package org.jclouds.byon.config;
import java.io.InputStream;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
import java.net.URL;
import java.util.Map; import java.util.Map;
import javax.annotation.Resource;
import javax.inject.Singleton; import javax.inject.Singleton;
import org.jclouds.byon.Node; import org.jclouds.byon.Node;
@ -29,11 +34,18 @@ import org.jclouds.byon.internal.BYONComputeServiceAdapter;
import org.jclouds.compute.config.JCloudsNativeComputeServiceAdapterContextModule; import org.jclouds.compute.config.JCloudsNativeComputeServiceAdapterContextModule;
import org.jclouds.concurrent.SingleThreaded; import org.jclouds.concurrent.SingleThreaded;
import org.jclouds.location.Provider; import org.jclouds.location.Provider;
import org.jclouds.logging.Logger;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;
import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap;
import com.google.inject.Provides; import com.google.inject.Provides;
import org.yaml.snakeyaml.constructor.Constructor;
import org.yaml.snakeyaml.Loader;
import org.yaml.snakeyaml.TypeDescription;
import org.yaml.snakeyaml.Yaml;
import org.yaml.snakeyaml.error.YAMLException;
/** /**
* *
* @author Adrian Cole * @author Adrian Cole
@ -42,6 +54,8 @@ import com.google.inject.Provides;
@SingleThreaded @SingleThreaded
public class BYONComputeServiceContextModule extends public class BYONComputeServiceContextModule extends
JCloudsNativeComputeServiceAdapterContextModule<Supplier, Supplier> { JCloudsNativeComputeServiceAdapterContextModule<Supplier, Supplier> {
@Resource
protected Logger logger = Logger.NULL;
public BYONComputeServiceContextModule() { public BYONComputeServiceContextModule() {
super(Supplier.class, Supplier.class, BYONComputeServiceAdapter.class); super(Supplier.class, Supplier.class, BYONComputeServiceAdapter.class);
@ -49,15 +63,33 @@ public class BYONComputeServiceContextModule extends
@Provides @Provides
@Singleton @Singleton
Supplier<Map<String, Node>> provideNodeList(@Provider URI uri) { Supplier<Map<String, Node>> provideNodeList(@Provider final URI uri) {
return new Supplier<Map<String, Node>> (){ return new Supplier<Map<String, Node>> (){
@Override @Override
public Map<String, Node> get() { public Map<String, Node> get() {
// TODO parse uri into list, using yaml or something Constructor constructor = new Constructor(Config.class);
return ImmutableMap.<String, Node> of();
TypeDescription configDesc = new TypeDescription(Config.class);
configDesc.putMapPropertyType("nodes", String.class, Node.class);
constructor.addTypeDescription(configDesc);
Yaml yaml = new Yaml(new Loader(constructor));
Config config;
try {
URL url = uri.toURL();
InputStream input = url.openStream();
config = (Config)yaml.load(input);
} catch(MalformedURLException e) {
logger.error(e, "URI is not a URL: %s", uri);
return ImmutableMap.<String, Node> of();
} catch(IOException e) {
logger.error(e, "URI could not be read: %s", uri);
return ImmutableMap.<String, Node> of();
}
return config.nodes;
} }
}; };
} }

View File

@ -0,0 +1,33 @@
/**
*
* 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.byon.config;
import java.util.Map;
import org.jclouds.byon.Node;
/**
* Type-safe config class for YAML
*
* @author Kelvin Kakugawa
*/
public class Config {
public Map<String, Node> nodes;
}