Repository: incubator-stratos Updated Branches: refs/heads/master a09a572ea -> a1e1f3baa
fixing https://issues.apache.org/jira/browse/STRATOS-557 - by not creating security groups if the user has provided them via jclouds Project: http://git-wip-us.apache.org/repos/asf/incubator-stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-stratos/commit/a9e31788 Tree: http://git-wip-us.apache.org/repos/asf/incubator-stratos/tree/a9e31788 Diff: http://git-wip-us.apache.org/repos/asf/incubator-stratos/diff/a9e31788 Branch: refs/heads/master Commit: a9e31788d870e73a0816d1dee5e5bcb070325329 Parents: c171724 Author: Nirmal Fernando <[email protected]> Authored: Wed Apr 2 17:23:52 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Wed Apr 2 17:23:52 2014 +0530 ---------------------------------------------------------------------- ...curityGroupsAsNeededAndReturnRunOptions.java | 37 ++++++++++---------- ...tyGroupsAsNeededAndReturnRunOptionsTest.java | 12 +++---- 2 files changed, 25 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a9e31788/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java index c54d983..675396f 100644 --- a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java +++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/main/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions.java @@ -166,24 +166,25 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions { public Set<String> getSecurityGroupsForTagAndOptions(String region, @Nullable String group, TemplateOptions options) { Builder<String> groups = ImmutableSet.builder(); - if (group != null) { - String markerGroup = namingConvention.create().sharedNameForGroup(group); - - groups.add(markerGroup); - - RegionNameAndIngressRules regionNameAndIngressRulesForMarkerGroup; - - if (userSpecifiedTheirOwnGroups(options)) { - regionNameAndIngressRulesForMarkerGroup = new RegionNameAndIngressRules(region, markerGroup, new int[] {}, - false); - groups.addAll(EC2TemplateOptions.class.cast(options).getGroups()); - } else { - regionNameAndIngressRulesForMarkerGroup = new RegionNameAndIngressRules(region, markerGroup, options - .getInboundPorts(), true); - } - // this will create if not yet exists. - securityGroupMap.getUnchecked(regionNameAndIngressRulesForMarkerGroup); - } + if (group != null) { + + if (userSpecifiedTheirOwnGroups(options)) { + groups.addAll(EC2TemplateOptions.class.cast(options) + .getGroups()); + } else { + String markerGroup = namingConvention.create() + .sharedNameForGroup(group); + + groups.add(markerGroup); + + RegionNameAndIngressRules regionNameAndIngressRulesForMarkerGroup; + regionNameAndIngressRulesForMarkerGroup = new RegionNameAndIngressRules( + region, markerGroup, options.getInboundPorts(), true); + // this will create if not yet exists. + securityGroupMap + .getUnchecked(regionNameAndIngressRulesForMarkerGroup); + } + } return groups.build(); } http://git-wip-us.apache.org/repos/asf/incubator-stratos/blob/a9e31788/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java ---------------------------------------------------------------------- diff --git a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java index 2babb8d..d437e42 100644 --- a/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java +++ b/dependencies/jclouds/apis/ec2/1.7.1-stratos/src/test/java/org/jclouds/ec2/compute/strategy/CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest.java @@ -520,7 +520,7 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest { int[] ports = {}; boolean shouldAuthorizeSelf = true; boolean groupExisted = true; - Set<String> returnVal = ImmutableSet.<String> of(generatedMarkerGroup, "group1", "group2"); + Set<String> returnVal = ImmutableSet.<String> of("group1", "group2"); // create mocks CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptions strategy = setupStrategy(); @@ -528,11 +528,11 @@ public class CreateKeyPairAndSecurityGroupsAsNeededAndReturnRunOptionsTest { // setup expectations expect(options.getGroups()).andReturn(groupIds).atLeastOnce(); - RegionNameAndIngressRules regionNameAndIngressRules = new RegionNameAndIngressRules(region, generatedMarkerGroup, - ports, shouldAuthorizeSelf); - - expect(strategy.securityGroupMap.getUnchecked(regionNameAndIngressRules)) - .andReturn(groupExisted ? "group" : null); +// RegionNameAndIngressRules regionNameAndIngressRules = new RegionNameAndIngressRules(region, generatedMarkerGroup, +// ports, shouldAuthorizeSelf); +// +// expect(strategy.securityGroupMap.getUnchecked(regionNameAndIngressRules)) +// .andReturn(groupExisted ? "group" : null); // replay mocks replay(options);
