honeymoose/OpenSearch
1
0
Fork 0
mirror of https://github.com/honeymoose/OpenSearch.git synced 2025-02-25 14:26:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix after merge with master

Browse Source
This commit is contained in:
David Pilato 2016-06-30 12:04:19 +02:00
parent a9e93a0da4
commit daf08ace1e
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/discovery-gce/src/main/java/org/elasticsearch/plugin/discovery/gce/GceDiscoveryPlugin.java
View File

@ -38,6 +38,7 @@ import org.elasticsearch.plugins.Plugin;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@ -46,6 +47,8 @@ import java.util.List;
public class GceDiscoveryPlugin extends Plugin {
public static final String GCE = "gce";
private final Settings settings;
protected final ESLogger logger = Loggers.getLogger(GceDiscoveryPlugin.class);
static {
/*
@ -69,6 +72,11 @@ public class GceDiscoveryPlugin extends Plugin {
});
}
public GceDiscoveryPlugin(Settings settings) {
this.settings = settings;
logger.trace("starting gce discovery plugin...");
}
@Override
public Collection<Module> nodeModules() {
return Collections.singletonList(new GceModule(settings));

6
plugins/discovery-gce/src/test/java/org/elasticsearch/discovery/gce/GceDiscoveryTests.java
View File

@ -256,10 +256,10 @@ public class GceDiscoveryTests extends ESTestCase {
*/
public void testNoRegionReturnsEmptyList() {
Settings nodeSettings = Settings.builder()
.put(GceComputeService.PROJECT_SETTING.getKey(), projectName)
.putArray(GceComputeService.ZONE_SETTING.getKey(), "europe-west1-b", "us-central1-a")
.put(GceInstancesService.PROJECT_SETTING.getKey(), projectName)
.putArray(GceInstancesService.ZONE_SETTING.getKey(), "europe-west1-b", "us-central1-a")
.build();
mock = new GceComputeServiceMock(nodeSettings, networkService);
mock = new GceInstancesServiceMock(nodeSettings);
List<DiscoveryNode> discoveryNodes = buildDynamicNodes(mock, nodeSettings);
assertThat(discoveryNodes, hasSize(1));
}