openstack/python-openstackclient
Code Issues Proposed changes

Merge "Move security_groups mock definition to FakeComputev2Client"

Browse Source
This commit is contained in:
Jenkins
2016-02-08 07:10:52 +00:00
committed by Gerrit Code Review
parent e3e925d2f1 553631a5d4
commit 3a93c35f34
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
openstackclient/tests/compute/v2/fakes.py
View File

@@ -90,25 +90,39 @@ class FakeComputev2Client(object):
def __init__(self, **kwargs): def __init__(self, **kwargs):
self.availability_zones = mock.Mock() self.availability_zones = mock.Mock()
self.availability_zones.resource_class = fakes.FakeResource(None, {}) self.availability_zones.resource_class = fakes.FakeResource(None, {})
self.images = mock.Mock() self.images = mock.Mock()
self.images.resource_class = fakes.FakeResource(None, {}) self.images.resource_class = fakes.FakeResource(None, {})
self.servers = mock.Mock() self.servers = mock.Mock()
self.servers.resource_class = fakes.FakeResource(None, {}) self.servers.resource_class = fakes.FakeResource(None, {})
self.services = mock.Mock() self.services = mock.Mock()
self.services.resource_class = fakes.FakeResource(None, {}) self.services.resource_class = fakes.FakeResource(None, {})
self.extensions = mock.Mock() self.extensions = mock.Mock()
self.extensions.resource_class = fakes.FakeResource(None, {}) self.extensions.resource_class = fakes.FakeResource(None, {})
self.flavors = mock.Mock() self.flavors = mock.Mock()
self.flavors.resource_class = fakes.FakeResource(None, {}) self.flavors.resource_class = fakes.FakeResource(None, {})
self.quotas = mock.Mock() self.quotas = mock.Mock()
self.quotas.resource_class = fakes.FakeResource(None, {}) self.quotas.resource_class = fakes.FakeResource(None, {})
self.quota_classes = mock.Mock() self.quota_classes = mock.Mock()
self.quota_classes.resource_class = fakes.FakeResource(None, {}) self.quota_classes.resource_class = fakes.FakeResource(None, {})
self.volumes = mock.Mock() self.volumes = mock.Mock()
self.volumes.resource_class = fakes.FakeResource(None, {}) self.volumes.resource_class = fakes.FakeResource(None, {})
self.hypervisors = mock.Mock() self.hypervisors = mock.Mock()
self.hypervisors.resource_class = fakes.FakeResource(None, {}) self.hypervisors.resource_class = fakes.FakeResource(None, {})
self.security_groups = mock.Mock()
self.security_groups.resource_class = fakes.FakeResource(None, {})
self.auth_token = kwargs['token'] self.auth_token = kwargs['token']
self.management_url = kwargs['endpoint'] self.management_url = kwargs['endpoint']

5
openstackclient/tests/compute/v2/test_security_group.py
View File

@@ -43,9 +43,8 @@ class TestSecurityGroup(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super(TestSecurityGroup, self).setUp() super(TestSecurityGroup, self).setUp()
self.secgroups_mock = mock.Mock() # Get a shortcut compute client security_groups mock
self.secgroups_mock.resource_class = fakes.FakeResource(None, {}) self.secgroups_mock = self.app.client_manager.compute.security_groups
self.app.client_manager.compute.security_groups = self.secgroups_mock
self.secgroups_mock.reset_mock() self.secgroups_mock.reset_mock()
self.projects_mock = mock.Mock() self.projects_mock = mock.Mock()

5
openstackclient/tests/compute/v2/test_security_group_rule.py
View File

@@ -102,9 +102,8 @@ class TestSecurityGroupRule(compute_fakes.TestComputev2):
def setUp(self): def setUp(self):
super(TestSecurityGroupRule, self).setUp() super(TestSecurityGroupRule, self).setUp()
self.secgroups_mock = mock.Mock() # Get a shortcut compute client security_groups mock
self.secgroups_mock.resource_class = fakes.FakeResource(None, {}) self.secgroups_mock = self.app.client_manager.compute.security_groups
self.app.client_manager.compute.security_groups = self.secgroups_mock
self.secgroups_mock.reset_mock() self.secgroups_mock.reset_mock()
self.sg_rules_mock = mock.Mock() self.sg_rules_mock = mock.Mock()