From 36649ae1fc60832eff8d7077be5722385297d4a5 Mon Sep 17 00:00:00 2001 From: cameron-r Date: Thu, 6 Nov 2014 10:27:53 -0600 Subject: [PATCH] Cameron & Ed | Delete more unused rule EC2 rule args in EC2RuleTransformer, fix TestOpenstackRuleTransformer class name --- ec2_rule_transformer.py | 5 ++++- tests/unit/fake_ec2_rule_builder.py | 8 ++++++-- tests/unit/test_openstack_rule_transformer.py | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ec2_rule_transformer.py b/ec2_rule_transformer.py index a2e57ea..a83c63c 100644 --- a/ec2_rule_transformer.py +++ b/ec2_rule_transformer.py @@ -21,4 +21,7 @@ class EC2RuleTransformer: def _delete_unused_rule_args(self, rule_args): del rule_args['grants'] - del rule_args['parent'] \ No newline at end of file + del rule_args['parent'] + del rule_args['item'] + del rule_args['ipRanges'] + del rule_args['groups'] \ No newline at end of file diff --git a/tests/unit/fake_ec2_rule_builder.py b/tests/unit/fake_ec2_rule_builder.py index bf6ccb1..c0a0fdd 100644 --- a/tests/unit/fake_ec2_rule_builder.py +++ b/tests/unit/fake_ec2_rule_builder.py @@ -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) diff --git a/tests/unit/test_openstack_rule_transformer.py b/tests/unit/test_openstack_rule_transformer.py index 6256455..887a3b2 100644 --- a/tests/unit/test_openstack_rule_transformer.py +++ b/tests/unit/test_openstack_rule_transformer.py @@ -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()