You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/11/25 13:17:57 UTC
[12/13] incubator-brooklyn git commit: MariaDB: support disabling
direct connection
MariaDB: support disabling direct connection
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/1cb1d44e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/1cb1d44e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/1cb1d44e
Branch: refs/heads/master
Commit: 1cb1d44e5e45518b0e5425150901f9ba2533afc6
Parents: 571de2d
Author: Aled Sage <al...@gmail.com>
Authored: Tue Nov 24 13:26:29 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Tue Nov 24 13:53:49 2015 +0000
----------------------------------------------------------------------
.../database/mariadb/MariaDbLiveEc2Test.java | 32 +++++++++++++++++---
1 file changed, 28 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/1cb1d44e/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java
index 222998a..362e966 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveEc2Test.java
@@ -18,15 +18,22 @@
*/
package org.apache.brooklyn.entity.database.mariadb;
+import static org.testng.Assert.assertNotNull;
+
import org.apache.brooklyn.api.entity.EntitySpec;
import org.apache.brooklyn.api.location.Location;
-import org.testng.annotations.Test;
+import org.apache.brooklyn.core.entity.Attributes;
+import org.apache.brooklyn.core.entity.EntityAsserts;
+import org.apache.brooklyn.core.entity.lifecycle.Lifecycle;
+import org.apache.brooklyn.core.location.cloud.CloudLocationConfig;
import org.apache.brooklyn.entity.AbstractEc2LiveTest;
import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon;
import org.apache.brooklyn.entity.database.VogellaExampleAccess;
import org.apache.brooklyn.location.jclouds.JcloudsLocation;
+import org.testng.annotations.Test;
import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
@Test(groups = { "Live" })
public class MariaDbLiveEc2Test extends AbstractEc2LiveTest {
@@ -48,8 +55,25 @@ public class MariaDbLiveEc2Test extends AbstractEc2LiveTest {
@Test(enabled=false, groups = "Live")
public void test_Debian_7_2() throws Exception { } // Disabled because MariaDB not available
- @Test(enabled=false)
- public void testDummy() {} // Convince testng IDE integration that this really does have test methods
+ @Test(groups = {"Live"})
+ public void testWithOnlyPort22() throws Exception {
+ // CentOS-6.3-x86_64-GA-EBS-02-85586466-5b6c-4495-b580-14f72b4bcf51-ami-bb9af1d2.1
+ jcloudsLocation = mgmt.getLocationRegistry().resolve(LOCATION_SPEC, ImmutableMap.of(
+ "tags", ImmutableList.of(getClass().getName()),
+ "imageId", "us-east-1/ami-a96b01c0",
+ "hardwareId", SMALL_HARDWARE_ID));
+ MariaDbNode server = app.createAndManageChild(EntitySpec.create(MariaDbNode.class)
+ .configure(MariaDbNode.PROVISIONING_PROPERTIES.subKey(CloudLocationConfig.INBOUND_PORTS.getName()), ImmutableList.of(22)));
+
+ app.start(ImmutableList.of(jcloudsLocation));
+
+ EntityAsserts.assertAttributeEqualsEventually(server, Attributes.SERVICE_UP, true);
+ EntityAsserts.assertAttributeEqualsEventually(server, Attributes.SERVICE_STATE_ACTUAL, Lifecycle.RUNNING);
+
+ Integer port = server.getAttribute(MariaDbNode.MARIADB_PORT);
+ assertNotNull(port);
+
+ assertViaSshLocalPortListeningEventually(server, port);
+ }
}
-