openstack/tempest
Code Issues Proposed changes

Merge "Cleanup: Add common "create security rule" method"

Browse Source
This commit is contained in:
Jenkins
2013-08-22 10:43:08 +00:00
committed by Gerrit Code Review
parent eff800ea59 3c1f51928c
commit 7395517a5f
5 changed files with 39 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
tempest/scenario/manager.py
View File

@@ -258,6 +258,40 @@ class OfficialClientTest(tempest.test.BaseTestCase):
self.fail("Timed out waiting for thing %s to become %s"
% (thing_id, expected_status))
def create_loginable_secgroup_rule(self, client=None, secgroup_id=None):
if client is None:
client = self.compute_client
if secgroup_id is None:
sgs = client.security_groups.list()
for sg in sgs:
if sg.name == 'default':
secgroup_id = sg.id
# These rules are intended to permit inbound ssh and icmp
# traffic from all sources, so no group_id is provided.
# Setting a group_id would only permit traffic from ports
# belonging to the same security group.
rulesets = [
{
# ssh
'ip_protocol': 'tcp',
'from_port': 22,
'to_port': 22,
'cidr': '0.0.0.0/0',
},
{
# ping
'ip_protocol': 'icmp',
'from_port': -1,
'to_port': -1,
'cidr': '0.0.0.0/0',
}
]
for ruleset in rulesets:
sg_rule = client.security_group_rules.create(secgroup_id,
**ruleset)
self.set_resource(sg_rule.id, sg_rule)
def create_server(self, client, name=None, image=None, flavor=None,
create_kwargs={}):
if name is None:
@@ -335,32 +369,7 @@ class NetworkScenarioTest(OfficialClientTest):
self.fail("SecurityGroup object not successfully created.")
# Add rules to the security group
# These rules are intended to permit inbound ssh and icmp
# traffic from all sources, so no group_id is provided.
# Setting a group_id would only permit traffic from ports
# belonging to the same security group.
rulesets = [
{
# ssh
'ip_protocol': 'tcp',
'from_port': 22,
'to_port': 22,
'cidr': '0.0.0.0/0',
},
{
# ping
'ip_protocol': 'icmp',
'from_port': -1,
'to_port': -1,
'cidr': '0.0.0.0/0',
}
]
for ruleset in rulesets:
try:
client.security_group_rules.create(secgroup.id, **ruleset)
except Exception:
self.fail("Failed to create rule in security group.")
self.create_loginable_secgroup_rule(client, secgroup.id)
return secgroup

21
tempest/scenario/test_minimum_basic.py
View File

@@ -139,25 +139,6 @@ class TestMinimumBasicScenario(manager.OfficialClientTest):
def nova_floating_ip_add(self):
self.server.add_floating_ip(self.floating_ip)
def nova_security_group_rule_create(self):
sgs = self.compute_client.security_groups.list()
for sg in sgs:
if sg.name == 'default':
secgroup = sg
ruleset = {
# ssh
'ip_protocol': 'tcp',
'from_port': 22,
'to_port': 22,
'cidr': '0.0.0.0/0',
'group_id': None
}
sg_rule = self.compute_client.security_group_rules.create(secgroup.id,
**ruleset)
self.addCleanup(self.compute_client.security_group_rules.delete,
sg_rule.id)
def ssh_to_server(self):
username = self.config.scenario.ssh_user
self.linux_client = RemoteClient(self.floating_ip.ip,
@@ -191,7 +172,7 @@ class TestMinimumBasicScenario(manager.OfficialClientTest):
self.nova_floating_ip_create()
self.nova_floating_ip_add()
self.nova_security_group_rule_create()
self.create_loginable_secgroup_rule()
self.ssh_to_server()
self.check_partitions()

23
tempest/scenario/test_server_basic_ops.py
View File

@@ -52,28 +52,7 @@ class TestServerBasicOps(manager.OfficialClientTest):
self.fail("SecurityGroup object not successfully created.")
# Add rules to the security group
rulesets = [
{
'ip_protocol': 'tcp',
'from_port': 1,
'to_port': 65535,
'cidr': '0.0.0.0/0',
'group_id': self.secgroup.id
},
{
'ip_protocol': 'icmp',
'from_port': -1,
'to_port': -1,
'cidr': '0.0.0.0/0',
'group_id': self.secgroup.id
}
]
for ruleset in rulesets:
try:
self.compute_client.security_group_rules.create(
self.secgroup.id, **ruleset)
except Exception:
self.fail("Failed to create rule in security group.")
self.create_loginable_secgroup_rule(secgroup_id=self.secgroup.id)
def boot_instance(self):
create_kwargs = {

21
tempest/scenario/test_snapshot_pattern.py
View File

@@ -53,25 +53,6 @@ class TestSnapshotPattern(manager.OfficialClientTest):
def _add_keypair(self):
self.keypair = self.create_keypair()
def _create_security_group_rule(self):
sgs = self.compute_client.security_groups.list()
for sg in sgs:
if sg.name == 'default':
secgroup = sg
ruleset = {
# ssh
'ip_protocol': 'tcp',
'from_port': 22,
'to_port': 22,
'cidr': '0.0.0.0/0',
'group_id': None
}
sg_rule = self.compute_client.security_group_rules.create(secgroup.id,
**ruleset)
self.addCleanup(self.compute_client.security_group_rules.delete,
sg_rule.id)
def _ssh_to_server(self, server_or_ip):
if isinstance(server_or_ip, basestring):
ip = server_or_ip
@@ -117,7 +98,7 @@ class TestSnapshotPattern(manager.OfficialClientTest):
def test_snapshot_pattern(self):
# prepare for booting a instance
self._add_keypair()
self._create_security_group_rule()
self.create_loginable_secgroup_rule()
# boot a instance and create a timestamp file in it
server = self._boot_image(self.config.compute.image_ref)

21
tempest/scenario/test_stamp_pattern.py
View File

@@ -81,25 +81,6 @@ class TestStampPattern(manager.OfficialClientTest):
def _add_floating_ip(self, server, floating_ip):
server.add_floating_ip(floating_ip)
def _create_security_group_rule(self):
sgs = self.compute_client.security_groups.list()
for sg in sgs:
if sg.name == 'default':
secgroup = sg
ruleset = {
# ssh
'ip_protocol': 'tcp',
'from_port': 22,
'to_port': 22,
'cidr': '0.0.0.0/0',
'group_id': None
}
sg_rule = self.compute_client.security_group_rules.create(secgroup.id,
**ruleset)
self.addCleanup(self.compute_client.security_group_rules.delete,
sg_rule.id)
def _remote_client_to_server(self, server_or_ip):
if isinstance(server_or_ip, basestring):
ip = server_or_ip
@@ -211,7 +192,7 @@ class TestStampPattern(manager.OfficialClientTest):
def test_stamp_pattern(self):
# prepare for booting a instance
self._add_keypair()
self._create_security_group_rule()
self.create_loginable_secgroup_rule()
# boot an instance and create a timestamp file in it
volume = self._create_volume()