openstack
/
python-novaclient
Code Issues Proposed changes

Convert security group rules tests to httpretty 

Change-Id: I7b68712b05764661d3e7c3dcac7fce041e88e293
blueprint: httpretty-testing
This commit is contained in:
Jamie Lennox 2014-05-26 13:01:36 +10:00
parent 48ba2f5ab2
commit d6f59a3016
2 changed files with 78 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
novaclient/tests/fixture_data/security_group_rules.py Normal file
View File

@ -0,0 +1,57 @@
# Licensed 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.
import httpretty
from novaclient.openstack.common import jsonutils
from novaclient.tests import fakes
from novaclient.tests.fixture_data import base
class Fixture(base.Fixture):
base_url = 'os-security-group-rules'
def setUp(self):
super(Fixture, self).setUp()
rule = {
'id': 1,
'parent_group_id': 1,
'group_id': 2,
'ip_protocol': 'TCP',
'from_port': '22',
'to_port': 22,
'cidr': '10.0.0.0/8'
}
get_rules = {'security_group_rules': [rule]}
httpretty.register_uri(httpretty.GET, self.url(),
body=jsonutils.dumps(get_rules),
content_type='application/json')
for u in (1, 11, 12):
httpretty.register_uri(httpretty.DELETE, self.url(u), status=202)
def post_rules(request, url, headers):
body = jsonutils.loads(request.body.decode('utf-8'))
assert list(body) == ['security_group_rule']
fakes.assert_has_keys(body['security_group_rule'],
required=['parent_group_id'],
optional=['group_id', 'ip_protocol',
'from_port', 'to_port', 'cidr'])
return 202, headers, jsonutils.dumps({'security_group_rule': rule})
httpretty.register_uri(httpretty.POST, self.url(),
body=post_rules,
content_type='application/json')

37
novaclient/tests/v1_1/test_security_group_rules.py
View File

@ -12,21 +12,24 @@
# under the License.
from novaclient import exceptions
from novaclient.tests.fixture_data import client
from novaclient.tests.fixture_data import security_group_rules as data
from novaclient.tests import utils
from novaclient.tests.v1_1 import fakes
from novaclient.v1_1 import security_group_rules
cs = fakes.FakeClient()
class SecurityGroupRulesTest(utils.FixturedTestCase):
client_fixture_class = client.V1
data_fixture_class = data.Fixture
class SecurityGroupRulesTest(utils.TestCase):
def test_delete_security_group_rule(self):
cs.security_group_rules.delete(1)
cs.assert_called('DELETE', '/os-security-group-rules/1')
self.cs.security_group_rules.delete(1)
self.assert_called('DELETE', '/os-security-group-rules/1')
def test_create_security_group_rule(self):
sg = cs.security_group_rules.create(1, "tcp", 1, 65535, "10.0.0.0/16")
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,
"10.0.0.0/16")
body = {
"security_group_rule": {
@ -39,12 +42,12 @@ class SecurityGroupRulesTest(utils.TestCase):
}
}
cs.assert_called('POST', '/os-security-group-rules', body)
self.assert_called('POST', '/os-security-group-rules', body)
self.assertTrue(isinstance(sg, security_group_rules.SecurityGroupRule))
def test_create_security_group_group_rule(self):
sg = cs.security_group_rules.create(1, "tcp", 1, 65535, "10.0.0.0/16",
101)
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,
"10.0.0.0/16", 101)
body = {
"security_group_rule": {
@ -57,25 +60,27 @@ class SecurityGroupRulesTest(utils.TestCase):
}
}
cs.assert_called('POST', '/os-security-group-rules', body)
self.assert_called('POST', '/os-security-group-rules', body)
self.assertTrue(isinstance(sg, security_group_rules.SecurityGroupRule))
def test_invalid_parameters_create(self):
self.assertRaises(exceptions.CommandError,
cs.security_group_rules.create,
self.cs.security_group_rules.create,
1, "invalid_ip_protocol", 1, 65535, "10.0.0.0/16", 101)
self.assertRaises(exceptions.CommandError,
cs.security_group_rules.create,
self.cs.security_group_rules.create,
1, "tcp", "invalid_from_port", 65535, "10.0.0.0/16", 101)
self.assertRaises(exceptions.CommandError,
cs.security_group_rules.create,
self.cs.security_group_rules.create,
1, "tcp", 1, "invalid_to_port", "10.0.0.0/16", 101)
def test_security_group_rule_str(self):
sg = cs.security_group_rules.create(1, "tcp", 1, 65535, "10.0.0.0/16")
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,
"10.0.0.0/16")
self.assertEqual('1', str(sg))
def test_security_group_rule_del(self):
sg = cs.security_group_rules.create(1, "tcp", 1, 65535, "10.0.0.0/16")
sg = self.cs.security_group_rules.create(1, "tcp", 1, 65535,
"10.0.0.0/16")
sg.delete()
cs.assert_called('DELETE', '/os-security-group-rules/1')
self.assert_called('DELETE', '/os-security-group-rules/1')