You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/04/03 20:57:17 UTC
jclouds-labs-openstack git commit: Enables live tests for neutron
security groups. Makes tests more robust.
Repository: jclouds-labs-openstack
Updated Branches:
refs/heads/master 148079685 -> 9c58638ef
Enables live tests for neutron security groups. Makes tests more robust.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/commit/9c58638e
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/tree/9c58638e
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/diff/9c58638e
Branch: refs/heads/master
Commit: 9c58638efc43fa1b71bcb1f5d638d17efd2c21e3
Parents: 1480796
Author: Zack Shoylev <za...@rackspace.com>
Authored: Fri Feb 27 07:00:59 2015 -0600
Committer: Zack Shoylev <za...@rackspace.com>
Committed: Fri Apr 3 13:53:14 2015 -0500
----------------------------------------------------------------------
.../v2/extensions/SecurityGroupApiLiveTest.java | 18 ++++++++-----
...CloudNetworksUSSecurityGroupApiLiveTest.java | 27 ++++++++++++++++++++
2 files changed, 38 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/9c58638e/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java b/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java
index a7ef1a6..c02ed49 100644
--- a/openstack-neutron/src/test/java/org/jclouds/openstack/neutron/v2/extensions/SecurityGroupApiLiveTest.java
+++ b/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()));
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs-openstack/blob/9c58638e/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
----------------------------------------------------------------------
diff --git a/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java b/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
new file mode 100644
index 0000000..b53de9c
--- /dev/null
+++ b/rackspace-cloudnetworks-us/src/test/java/org/jclouds/rackspace/cloudnetworks/us/CloudNetworksUSSecurityGroupApiLiveTest.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.jclouds.rackspace.cloudnetworks.us;
+
+import org.jclouds.openstack.neutron.v2.extensions.SecurityGroupApiLiveTest;
+import org.testng.annotations.Test;
+
+@Test(groups = "live", testName = "CloudNetworksUSSecurityGroupApiLiveTest", singleThreaded = true)
+public class CloudNetworksUSSecurityGroupApiLiveTest extends SecurityGroupApiLiveTest {
+ public CloudNetworksUSSecurityGroupApiLiveTest() {
+ provider = "rackspace-cloudnetworks-us";
+ }
+}