Merge "Define security_group_rules mock in FakeComputev2Client"

This commit is contained in:
Jenkins 2016-02-08 07:10:58 +00:00 committed by Gerrit Code Review
commit f0f9b5096c
2 changed files with 6 additions and 5 deletions
openstackclient/tests/compute/v2

@ -121,6 +121,9 @@ class FakeComputev2Client(object):
self.security_groups = mock.Mock()
self.security_groups.resource_class = fakes.FakeResource(None, {})
self.security_group_rules = mock.Mock()
self.security_group_rules.resource_class = fakes.FakeResource(None, {})
self.auth_token = kwargs['token']
self.management_url = kwargs['endpoint']

@ -12,7 +12,6 @@
#
import copy
import mock
from openstackclient.compute.v2 import security_group
from openstackclient.tests.compute.v2 import fakes as compute_fakes
@ -106,10 +105,9 @@ class TestSecurityGroupRule(compute_fakes.TestComputev2):
self.secgroups_mock = self.app.client_manager.compute.security_groups
self.secgroups_mock.reset_mock()
self.sg_rules_mock = mock.Mock()
self.sg_rules_mock.resource_class = fakes.FakeResource(None, {})
self.app.client_manager.compute.security_group_rules = \
self.sg_rules_mock
# Get a shortcut compute client security_group_rules mock
self.sg_rules_mock = \
self.app.client_manager.compute.security_group_rules
self.sg_rules_mock.reset_mock()