Enables live tests for neutron security groups. Makes tests more robust.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0128e91d Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0128e91d Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0128e91d Branch: refs/heads/master Commit: 0128e91dc055f17302be4b3160999c4419e74d24 Parents: 44c5053 Author: Zack Shoylev <[email protected]> Authored: Fri Feb 27 07:00:59 2015 -0600 Committer: Zack Shoylev <[email protected]> Committed: Fri Apr 3 13:53:14 2015 -0500 ---------------------------------------------------------------------- .../v2/extensions/SecurityGroupApiLiveTest.java | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/0128e91d/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java index a7ef1a6..c02ed49 100644 --- a/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java +++ b/apis/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java @@ -53,7 +53,7 @@ public class SecurityGroupApiLiveTest extends BaseNeutronApiLiveTest { assertNotNull(securityGroup); rule = sgApi.create( - Rule.createBuilder(RuleDirection.EGRESS, securityGroup.getId()) + Rule.createBuilder(RuleDirection.INGRESS, securityGroup.getId()) .ethertype(RuleEthertype.IPV6) .portRangeMax(90) .portRangeMin(80) @@ -68,7 +68,7 @@ public class SecurityGroupApiLiveTest extends BaseNeutronApiLiveTest { assertEquals(securityGroup.getName(), "jclouds-test"); assertEquals(securityGroup.getDescription(), "jclouds test security group"); - assertEquals(securityGroup.getRules().size(), 3); + assertEquals(securityGroup.getRules().size(), 1); Rule newSecGroupRule = null; @@ -86,12 +86,16 @@ public class SecurityGroupApiLiveTest extends BaseNeutronApiLiveTest { assertEquals(rule.getProtocol(), RuleProtocol.TCP); assertEquals(rule.getPortRangeMax().intValue(), 90); assertEquals(rule.getPortRangeMin().intValue(), 80); - assertEquals(rule.getDirection(), RuleDirection.EGRESS); + assertEquals(rule.getDirection(), RuleDirection.INGRESS); } finally { - try { - assertTrue(sgApi.deleteRule(rule.getId())); - } finally { - assertTrue(sgApi.deleteSecurityGroup(securityGroup.getId())); + if (sgApi != null) { + try { + if (rule != null) { + assertTrue(sgApi.deleteRule(rule.getId())); + } + } finally { + assertTrue(sgApi.deleteSecurityGroup(securityGroup.getId())); + } } } }
