From 405e629254708c56c593d2aaefeb9a2f8f871a0a Mon Sep 17 00:00:00 2001
From: Dougal Matthews <dougal@redhat.com>
Date: Thu, 1 Aug 2019 12:25:15 +0100
Subject: [PATCH] Remove _get_default_role_counts, a unused function

Change-Id: I1941da397f08ce097ace2b9e7a7599baec97d53e
---
 .../overcloud_deploy/test_overcloud_deploy.py | 34 -------------------
 tripleoclient/v1/overcloud_deploy.py          | 24 -------------
 2 files changed, 58 deletions(-)

diff --git a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
index 41fcbe831..4112fd9b7 100644
--- a/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
+++ b/tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py
@@ -980,40 +980,6 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
 
         utils_fixture.mock_deploy_tht.assert_called_with()
 
-    def test_get_default_role_counts_defaults(self):
-        parsed_args = self.check_parser(self.cmd, [], [])
-        defaults = {
-            'ControllerCount': 1,
-            'ComputeCount': 1,
-            'ObjectStorageCount': 0,
-            'BlockStorageCount': 0,
-            'CephStorageCount': 0
-        }
-        self.assertEqual(
-            defaults,
-            self.cmd._get_default_role_counts(parsed_args))
-
-    @mock.patch("tripleoclient.utils.fetch_roles_file")
-    def test_get_default_role_counts_custom_roles(self, mock_roles):
-        roles_data = [
-            {'name': 'ControllerApi', 'CountDefault': 3},
-            {'name': 'ControllerPcmk', 'CountDefault': 3},
-            {'name': 'Compute', 'CountDefault': 3},
-            {'name': 'ObjectStorage', 'CountDefault': 0},
-            {'name': 'BlockStorage'}
-        ]
-        mock_roles.return_value = roles_data
-        role_counts = {
-            'ControllerApiCount': 3,
-            'ControllerPcmkCount': 3,
-            'ComputeCount': 3,
-            'ObjectStorageCount': 0,
-            'BlockStorageCount': 0,
-        }
-        self.assertEqual(
-            role_counts,
-            self.cmd._get_default_role_counts(mock.Mock()))
-
     @mock.patch('tripleoclient.utils.check_stack_network_matches_env_files')
     @mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
                 '_create_parameters_env', autospec=True)
diff --git a/tripleoclient/v1/overcloud_deploy.py b/tripleoclient/v1/overcloud_deploy.py
index 60f29a9b8..6acc9e2c9 100644
--- a/tripleoclient/v1/overcloud_deploy.py
+++ b/tripleoclient/v1/overcloud_deploy.py
@@ -593,30 +593,6 @@ class DeployOvercloud(command.Command):
                 "Error: The following environment directories were not found"
                 ": {0}".format(", ".join(nonexisting_dirs)))
 
-    def _get_default_role_counts(self, parsed_args):
-
-        if parsed_args.roles_file:
-            roles_data = utils.fetch_roles_file(parsed_args.roles_file,
-                                                parsed_args.templates)
-        else:
-            # Assume default role counts
-            return {
-                'ControllerCount': 1,
-                'ComputeCount': 1,
-                'ObjectStorageCount': 0,
-                'BlockStorageCount': 0,
-                'CephStorageCount': 0
-            }
-
-        default_role_counts = {}
-        for r in roles_data:
-            count_default = r.get('CountDefault', 0)
-            default_role_counts.setdefault(
-                "%sCount" % r['name'],
-                count_default)
-
-        return default_role_counts
-
     def _provision_baremetal(self, parsed_args, tht_root):
 
         if not parsed_args.baremetal_deployment: