You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2017/02/21 22:03:59 UTC
jclouds-labs git commit: Better create rules and explicit test for
the ALL protocols
Repository: jclouds-labs
Updated Branches:
refs/heads/2.0.x 82cad92e3 -> 98de6eaab
Better create rules and explicit test for the ALL protocols
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/98de6eaa
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/98de6eaa
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/98de6eaa
Branch: refs/heads/2.0.x
Commit: 98de6eaaba6d12683a812ed303e3020843bd1f01
Parents: 82cad92
Author: Ignasi Barrera <na...@apache.org>
Authored: Tue Feb 21 22:45:46 2017 +0100
Committer: Ignasi Barrera <na...@apache.org>
Committed: Tue Feb 21 23:02:25 2017 +0100
----------------------------------------------------------------------
.../AzureComputeSecurityGroupExtension.java | 4 ++--
.../NetworkSecurityRuleToIpPermission.java | 2 +-
...AzureComputeSecurityGroupExtensionLiveTest.java | 17 +++++++++++++++++
3 files changed, 20 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/98de6eaa/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java
----------------------------------------------------------------------
diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java
index e312b6a..f23cfd8 100644
--- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java
+++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtension.java
@@ -193,7 +193,7 @@ public class AzureComputeSecurityGroupExtension implements SecurityGroupExtensio
Multimap<String, String> tenantIdGroupNamePairs, Iterable<String> ipRanges, Iterable<String> groupIds,
SecurityGroup group) {
String portRange = startPort + "-" + endPort;
- String ruleName = protocol + "-" + portRange;
+ String ruleName = "ingress-" + protocol.name().toLowerCase() + "-" + portRange;
logger.debug(">> adding ip permission [%s] to %s...", ruleName, group.getName());
@@ -240,7 +240,7 @@ public class AzureComputeSecurityGroupExtension implements SecurityGroupExtensio
Multimap<String, String> tenantIdGroupNamePairs, final Iterable<String> ipRanges, Iterable<String> groupIds,
SecurityGroup group) {
final String portRange = startPort + "-" + endPort;
- String ruleName = protocol + "-" + portRange;
+ String ruleName = "ingress-" + protocol.name().toLowerCase() + "-" + portRange;
logger.debug(">> deleting ip permissions matching [%s] from %s...", ruleName, group.getName());
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/98de6eaa/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java
----------------------------------------------------------------------
diff --git a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java
index 50a0954..10b3174 100644
--- a/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java
+++ b/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/functions/NetworkSecurityRuleToIpPermission.java
@@ -52,7 +52,7 @@ public class NetworkSecurityRuleToIpPermission implements Function<NetworkSecuri
@Override
public IpPermission apply(final NetworkSecurityRule rule) {
if (!InboundRule.apply(rule)) {
- logger.warn(">> ignoring non-inbound networks ecurity rule %s...", rule.name());
+ logger.warn(">> ignoring non-inbound network security rule %s...", rule.name());
return null;
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/98de6eaa/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtensionLiveTest.java
----------------------------------------------------------------------
diff --git a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtensionLiveTest.java b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtensionLiveTest.java
index 2aa012a..9296d69 100644
--- a/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtensionLiveTest.java
+++ b/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/compute/extensions/AzureComputeSecurityGroupExtensionLiveTest.java
@@ -23,6 +23,7 @@ import static org.jclouds.compute.options.TemplateOptions.Builder.securityGroups
import static org.jclouds.compute.predicates.NodePredicates.inGroup;
import static org.jclouds.net.domain.IpProtocol.TCP;
import static org.testng.Assert.assertEquals;
+import static org.testng.Assert.assertNotNull;
import static org.testng.Assert.assertTrue;
import java.util.Properties;
@@ -40,6 +41,7 @@ import org.jclouds.compute.domain.SecurityGroup;
import org.jclouds.compute.extensions.SecurityGroupExtension;
import org.jclouds.compute.extensions.internal.BaseSecurityGroupExtensionLiveTest;
import org.jclouds.domain.Location;
+import org.jclouds.net.domain.IpPermission;
import org.jclouds.net.util.IpPermissions;
import org.jclouds.providers.ProviderMetadata;
import org.testng.annotations.AfterClass;
@@ -74,6 +76,21 @@ public class AzureComputeSecurityGroupExtensionLiveTest extends BaseSecurityGrou
createResourceGroup();
}
+ @Test(groups = { "integration", "live" }, singleThreaded = true, dependsOnMethods = "testAddIpPermissionsFromSpec")
+ public void testAddIpPermissionForAnyProtocol() {
+ ComputeService computeService = view.getComputeService();
+ Optional<SecurityGroupExtension> securityGroupExtension = computeService.getSecurityGroupExtension();
+ assertTrue(securityGroupExtension.isPresent(), "security group extension was not present");
+
+ SecurityGroup group = securityGroupExtension.get().getSecurityGroupById(groupId);
+ assertNotNull(group, "No security group was found with id: " + groupId);
+
+ IpPermission openAll = IpPermissions.permitAnyProtocol();
+ SecurityGroup allOpenSecurityGroup = securityGroupExtension.get().addIpPermission(openAll, group);
+
+ assertTrue(allOpenSecurityGroup.getIpPermissions().contains(openAll));
+ }
+
@Test(groups = { "integration", "live" }, dependsOnMethods = "testCreateSecurityGroup")
public void testCreateNodeWithSecurityGroup() throws RunNodesException, InterruptedException, ExecutionException {
ComputeService computeService = view.getComputeService();