x/ec2-driver
Code Issues Proposed changes

Cameron & Ed | Delete more unused rule EC2 rule args in EC2RuleTransformer, fix TestOpenstackRuleTransformer class name

Browse Source
This commit is contained in:
cameron-r 2014-11-06 10:27:53 -06:00
parent fc3e9907e7
commit 36649ae1fc
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ec2_rule_transformer.py
View File

@ -21,4 +21,7 @@ class EC2RuleTransformer:
def _delete_unused_rule_args(self, rule_args):
del rule_args['grants']
del rule_args['parent']
del rule_args['parent']
del rule_args['item']
del rule_args['ipRanges']
del rule_args['groups']

8
tests/unit/fake_ec2_rule_builder.py
View File

@ -2,7 +2,7 @@ from collections import namedtuple
class FakeEC2RuleBuilder():
EC2Rule = namedtuple('EC2Rule', 'ip_protocol from_port to_port grants parent')
EC2Rule = namedtuple('EC2Rule', 'ip_protocol from_port to_port grants parent item ipRanges groups')
GroupOrCIDR = namedtuple('GroupOrCIDR', 'cidr_ip group_id')
def __init__(self):
@ -12,6 +12,9 @@ class FakeEC2RuleBuilder():
self.ip_range = '0.0.0.0/0'
self.allowed_security_group_id = None
self.parent = None
self.item = '\n'
self.ip_ranges = '\n'
self.groups = ''
@staticmethod
def an_ec2_rule():
@ -41,4 +44,5 @@ class FakeEC2RuleBuilder():
def build(self):
grants = [self.GroupOrCIDR(self.ip_range, self.allowed_security_group_id)]
return self.EC2Rule(self.ip_protocol, self.from_port, self.to_port, grants, self.parent)
return self.EC2Rule(self.ip_protocol, self.from_port, self.to_port, grants,
self.parent, self.item, self.ip_ranges, self.groups)

2
tests/unit/test_openstack_rule_transformer.py
View File

@ -3,7 +3,7 @@ import unittest
from nova.virt.ec2.openstack_rule_transformer import OpenstackRuleTransformer
class TestEC2RuleTransformer(unittest.TestCase):
class TestOpenstackRuleTransformer(unittest.TestCase):
def setUp(self):
self.openstack_rule_transformer = OpenstackRuleTransformer()