diff --git a/kolla_cli/tests/unit/test_genconfig_cmd.py b/kolla_cli/tests/unit/test_genconfig_cmd.py
new file mode 100644
index 0000000..6e28a5f
--- /dev/null
+++ b/kolla_cli/tests/unit/test_genconfig_cmd.py
@@ -0,0 +1,82 @@
+# Copyright (c) 2018 OpenStack Foundation
+#
+#    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 mock
+
+from kolla_cli.tests.unit.common import KollaCliUnitTest
+
+
+class TestUnit(KollaCliUnitTest):
+    @mock.patch('kolla_cli.api.control_plane.ControlPlaneApi.genconfig')
+    @mock.patch('kolla_cli.common.ansible.job.AnsibleJob.get_status')
+    @mock.patch('kolla_cli.shell.KollaCli._is_inventory_present',
+                return_value=True)
+    def test_genconfig(self, _, mock_get_status, mock_genconfig):
+        mock_get_status.return_value = 0
+        mock_genconfig.return_value = self.get_fake_job()
+        ret = self.run_cli_command('action genconfig')
+        self.assertEqual(ret, 0)
+        mock_genconfig.assert_called_once_with(1, [], [])
+
+    @mock.patch('kolla_cli.api.control_plane.ControlPlaneApi.genconfig')
+    @mock.patch('kolla_cli.common.ansible.job.AnsibleJob.get_status')
+    @mock.patch('kolla_cli.shell.KollaCli._is_inventory_present',
+                return_value=True)
+    def test_genconfig_with_hosts(self,
+                                  _,
+                                  mock_get_status,
+                                  mock_genconfig):
+        mock_get_status.return_value = 0
+        mock_genconfig.return_value = self.get_fake_job()
+        hostnames = ['host1', 'host2']
+        ret = self.run_cli_command(
+            'action genconfig --hosts {hosts}'.format(
+                hosts=','.join(hostnames)))
+        self.assertEqual(ret, 0)
+        mock_genconfig.assert_called_once_with(1, hostnames, [])
+
+    @mock.patch('kolla_cli.api.control_plane.ControlPlaneApi.genconfig')
+    @mock.patch('kolla_cli.common.ansible.job.AnsibleJob.get_status')
+    @mock.patch('kolla_cli.shell.KollaCli._is_inventory_present',
+                return_value=True)
+    def test_genconfig_with_services(self,
+                                     _,
+                                     mock_get_status,
+                                     mock_genconfig):
+        mock_get_status.return_value = 0
+        mock_genconfig.return_value = self.get_fake_job()
+        services = ['service1', 'service2']
+        ret = self.run_cli_command(
+            'action genconfig --services {services}'.format(
+                services=','.join(services)))
+        self.assertEqual(ret, 0)
+        mock_genconfig.assert_called_once_with(1, [], services)
+
+    @mock.patch('kolla_cli.api.control_plane.ControlPlaneApi.genconfig')
+    @mock.patch('kolla_cli.common.ansible.job.AnsibleJob.get_status')
+    @mock.patch('kolla_cli.shell.KollaCli._is_inventory_present',
+                return_value=True)
+    def test_genconfig_with_hosts_and_services(self,
+                                               _,
+                                               mock_get_status,
+                                               mock_genconfig):
+        mock_get_status.return_value = 0
+        mock_genconfig.return_value = self.get_fake_job()
+        hostnames = ['host1', 'host2']
+        services = ['service1', 'service2']
+        ret = self.run_cli_command(
+            'action genconfig --hosts {hosts} --services {services}'.format(
+                hosts=','.join(hostnames), services=','.join(services)))
+        self.assertEqual(ret, 0)
+        mock_genconfig.assert_called_once_with(1, hostnames, services)