Merge "Move security_groups mock definition to FakeComputev2Client"

3 files changed, 18 insertions, 6 deletions

diff --git a/openstackclient/tests/compute/v2/fakes.py b/openstackclient/tests/compute/v2/fakes.py
index 1a876a22..051d8d54 100644
--- a/openstackclient/tests/compute/v2/fakes.py
+++ b/openstackclient/tests/compute/v2/fakes.py
@@ -90,25 +90,39 @@ class FakeComputev2Client(object):
     def __init__(self, **kwargs):
         self.availability_zones = mock.Mock()
         self.availability_zones.resource_class = fakes.FakeResource(None, {})
+
         self.images = mock.Mock()
         self.images.resource_class = fakes.FakeResource(None, {})
+
         self.servers = mock.Mock()
         self.servers.resource_class = fakes.FakeResource(None, {})
+
         self.services = mock.Mock()
         self.services.resource_class = fakes.FakeResource(None, {})
+
         self.extensions = mock.Mock()
         self.extensions.resource_class = fakes.FakeResource(None, {})
+
         self.flavors = mock.Mock()
         self.flavors.resource_class = fakes.FakeResource(None, {})
+
         self.quotas = mock.Mock()
         self.quotas.resource_class = fakes.FakeResource(None, {})
+
         self.quota_classes = mock.Mock()
         self.quota_classes.resource_class = fakes.FakeResource(None, {})
+
         self.volumes = mock.Mock()
         self.volumes.resource_class = fakes.FakeResource(None, {})
+
         self.hypervisors = mock.Mock()
         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.management_url = kwargs['endpoint']
 
 
diff --git a/openstackclient/tests/compute/v2/test_security_group.py b/openstackclient/tests/compute/v2/test_security_group.py
index 87cc4870..a3f7dcb6 100644
--- a/openstackclient/tests/compute/v2/test_security_group.py
+++ b/openstackclient/tests/compute/v2/test_security_group.py
@@ -43,9 +43,8 @@ class TestSecurityGroup(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestSecurityGroup, self).setUp()
 
-        self.secgroups_mock = mock.Mock()
-        self.secgroups_mock.resource_class = fakes.FakeResource(None, {})
-        self.app.client_manager.compute.security_groups = self.secgroups_mock
+        # Get a shortcut compute client security_groups mock
+        self.secgroups_mock = self.app.client_manager.compute.security_groups
         self.secgroups_mock.reset_mock()
 
         self.projects_mock = mock.Mock()
diff --git a/openstackclient/tests/compute/v2/test_security_group_rule.py b/openstackclient/tests/compute/v2/test_security_group_rule.py
index a2f9b108..37eed333 100644
--- a/openstackclient/tests/compute/v2/test_security_group_rule.py
+++ b/openstackclient/tests/compute/v2/test_security_group_rule.py
@@ -102,9 +102,8 @@ class TestSecurityGroupRule(compute_fakes.TestComputev2):
     def setUp(self):
         super(TestSecurityGroupRule, self).setUp()
 
-        self.secgroups_mock = mock.Mock()
-        self.secgroups_mock.resource_class = fakes.FakeResource(None, {})
-        self.app.client_manager.compute.security_groups = self.secgroups_mock
+        # Get a shortcut compute client security_groups mock
+        self.secgroups_mock = self.app.client_manager.compute.security_groups
         self.secgroups_mock.reset_mock()
 
         self.sg_rules_mock = mock.Mock()