This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-library.git
commit ada8212fedea2b54b58c2b270da58c444604b32a Author: Alex Heneveld <[email protected]> AuthorDate: Sun Jul 31 15:02:10 2022 +0100 update iptables commands usage --- .../entity/database/mariadb/MariaDbLiveRackspaceTest.java | 9 +++++---- .../brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java | 9 +++++---- .../entity/database/postgresql/PostgreSqlRackspaceLiveTest.java | 9 +++++---- .../entity/database/rubyrep/RubyRepRackspaceLiveTest.java | 9 +++++---- .../brooklyn/entity/network/bind/BindDnsServerSshDriver.java | 9 ++++----- 5 files changed, 24 insertions(+), 21 deletions(-) diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java index 5ee6986c3..31ee12c0b 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java @@ -22,15 +22,16 @@ import java.util.Arrays; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.util.ssh.BashCommandsConfigurable; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.net.Protocol; -import org.apache.brooklyn.util.ssh.IptablesCommands; -import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; -import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable.Chain; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable.Policy; import com.google.common.collect.ImmutableList; @@ -99,7 +100,7 @@ public class MariaDbLiveRackspaceTest extends MariaDbIntegrationTest { app.start(ImmutableList.of(jcloudsLocation)); SshMachineLocation l = (SshMachineLocation) mariadb.getLocations().iterator().next(); - l.execCommands("add iptables rule", ImmutableList.of(IptablesCommands.insertIptablesRule(Chain.INPUT, Protocol.TCP, 3306, Policy.ACCEPT))); + l.execCommands("add iptables rule", ImmutableList.of(new IptablesCommandsConfigurable(BashCommandsConfigurable.newInstance()).insertIptablesRule(Chain.INPUT, Protocol.TCP, 3306, Policy.ACCEPT))); new VogellaExampleAccess("com.mysql.jdbc.Driver", mariadb.getAttribute(DatastoreCommon.DATASTORE_URL)).readModifyAndRevertDataBase(); } diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java index 9b80c3a5a..e597cf81b 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java @@ -22,15 +22,16 @@ import java.util.Arrays; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.core.internal.BrooklynProperties; +import org.apache.brooklyn.util.ssh.BashCommandsConfigurable; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.net.Protocol; -import org.apache.brooklyn.util.ssh.IptablesCommands; -import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; -import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable.Chain; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable.Policy; import com.google.common.collect.ImmutableList; @@ -100,7 +101,7 @@ public class MySqlLiveRackspaceTest extends MySqlIntegrationTest { app.start(ImmutableList.of(jcloudsLocation)); SshMachineLocation l = (SshMachineLocation) mysql.getLocations().iterator().next(); - l.execCommands("add iptables rule", ImmutableList.of(IptablesCommands.insertIptablesRule(Chain.INPUT, Protocol.TCP, 3306, Policy.ACCEPT))); + l.execCommands("add iptables rule", ImmutableList.of(new IptablesCommandsConfigurable(BashCommandsConfigurable.newInstance()).insertIptablesRule(Chain.INPUT, Protocol.TCP, 3306, Policy.ACCEPT))); new VogellaExampleAccess("com.mysql.jdbc.Driver", mysql.getAttribute(DatastoreCommon.DATASTORE_URL)).readModifyAndRevertDataBase(); } diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java index ab94ed1fb..83b42d45f 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java @@ -22,15 +22,16 @@ import java.util.Arrays; import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.util.ssh.BashCommandsConfigurable; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.VogellaExampleAccess; import org.apache.brooklyn.location.jclouds.JcloudsLocation; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.net.Protocol; -import org.apache.brooklyn.util.ssh.IptablesCommands; -import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; -import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable.Chain; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable.Policy; import com.google.common.collect.ImmutableList; @@ -100,7 +101,7 @@ public class PostgreSqlRackspaceLiveTest extends PostgreSqlIntegrationTest { app.start(ImmutableList.of(jcloudsLocation)); SshMachineLocation l = (SshMachineLocation) psql.getLocations().iterator().next(); - l.execCommands("add iptables rule", ImmutableList.of(IptablesCommands.insertIptablesRule(Chain.INPUT, Protocol.TCP, 5432, Policy.ACCEPT))); + l.execCommands("add iptables rule", ImmutableList.of(new IptablesCommandsConfigurable(BashCommandsConfigurable.newInstance()).insertIptablesRule(Chain.INPUT, Protocol.TCP, 5432, Policy.ACCEPT))); String url = psql.getAttribute(DatastoreCommon.DATASTORE_URL); new VogellaExampleAccess("org.postgresql.Driver", url).readModifyAndRevertDataBase(); diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java index 3efb39fad..79562758f 100644 --- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java +++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java @@ -24,15 +24,16 @@ import org.apache.brooklyn.api.entity.EntitySpec; import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.util.ssh.BashCommandsConfigurable; import org.testng.annotations.Test; import org.apache.brooklyn.entity.database.DatastoreMixins.DatastoreCommon; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlIntegrationTest; import org.apache.brooklyn.entity.database.postgresql.PostgreSqlNode; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.net.Protocol; -import org.apache.brooklyn.util.ssh.IptablesCommands; -import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; -import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable.Chain; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable.Policy; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -103,7 +104,7 @@ public class RubyRepRackspaceLiveTest extends RubyRepIntegrationTest { //hack to get the port for mysql open; is the inbounds property not respected on rackspace?? for (DatastoreCommon node : ImmutableSet.of(db1, db2)) { SshMachineLocation l = (SshMachineLocation) node.getLocations().iterator().next(); - l.execCommands("add iptables rule", ImmutableList.of(IptablesCommands.insertIptablesRule(Chain.INPUT, Protocol.TCP, 9111, Policy.ACCEPT))); + l.execCommands("add iptables rule", ImmutableList.of(new IptablesCommandsConfigurable(BashCommandsConfigurable.newInstance()).insertIptablesRule(Chain.INPUT, Protocol.TCP, 9111, Policy.ACCEPT))); } testReplication(db1, db2); diff --git a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSshDriver.java b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSshDriver.java index e33089b23..0368e634d 100644 --- a/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSshDriver.java +++ b/software/network/src/main/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSshDriver.java @@ -22,6 +22,8 @@ import java.io.ByteArrayInputStream; import java.util.List; import java.util.Map; +import org.apache.brooklyn.util.ssh.BashCommandsConfigurable; +import org.apache.brooklyn.util.ssh.IptablesCommandsConfigurable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,9 +37,6 @@ import org.apache.brooklyn.util.net.Networking; import org.apache.brooklyn.util.net.Protocol; import org.apache.brooklyn.util.os.Os; import org.apache.brooklyn.util.ssh.BashCommands; -import org.apache.brooklyn.util.ssh.IptablesCommands; -import org.apache.brooklyn.util.ssh.IptablesCommands.Chain; -import org.apache.brooklyn.util.ssh.IptablesCommands.Policy; import org.apache.brooklyn.util.text.Strings; public class BindDnsServerSshDriver extends AbstractSoftwareProcessSshDriver implements BindDnsServerDriver { @@ -78,8 +77,8 @@ public class BindDnsServerSshDriver extends AbstractSoftwareProcessSshDriver imp BashCommands.sudo("mkdir -p " + getDataDirectory() + " " + getDynamicDirectory() + " " + getOsSupport().getConfigDirectory()), BashCommands.sudo("chown -R " + getOsSupport().getUser() + ":" + getOsSupport().getUser() + " " + getDataDirectory() + " " + getDynamicDirectory()), // TODO determine name of ethernet interface if not eth0? - IptablesCommands.insertIptablesRule(Chain.INPUT, "eth0", Protocol.UDP, dnsPort, Policy.ACCEPT), - IptablesCommands.insertIptablesRule(Chain.INPUT, "eth0", Protocol.TCP, dnsPort, Policy.ACCEPT), + new IptablesCommandsConfigurable(BashCommandsConfigurable.newInstance()).insertIptablesRule(IptablesCommandsConfigurable.Chain.INPUT, "eth0", Protocol.UDP, dnsPort, IptablesCommandsConfigurable.Policy.ACCEPT), + new IptablesCommandsConfigurable(BashCommandsConfigurable.newInstance()).insertIptablesRule(IptablesCommandsConfigurable.Chain.INPUT, "eth0", Protocol.TCP, dnsPort, IptablesCommandsConfigurable.Policy.ACCEPT), // TODO Iptables is not a service on Ubuntu BashCommands.sudo("service iptables save"), BashCommands.sudo("service iptables restart"));
