add cli configure tests

Signed-off-by: Chris Snow <[email protected]>

Author: snowch

bin/cli.py

@@ -31,27 +31,20 @@
 
 import fire
 import jmespath
+import six
 import yaml
 
-from hpecp.logger import Logger
-
-from hpecp.gateway import (
-    Gateway,
-    GatewayStatus,
-)
-from hpecp.k8s_cluster import (
-    K8sClusterHostConfig,
-    K8sClusterStatus,
-)
-from hpecp.user import User
-
 from hpecp import (
     APIException,
     APIItemConflictException,
     ContainerPlatformClient,
     ContainerPlatformClientException,
 )
+from hpecp.gateway import Gateway, GatewayStatus
+from hpecp.k8s_cluster import K8sClusterHostConfig, K8sClusterStatus
 from hpecp.k8s_worker import WorkerK8sStatus
+from hpecp.logger import Logger
+from hpecp.user import User
 
 if sys.version_info[0] >= 3:
     unicode = str
@@ -1117,23 +1110,20 @@ def configure_cli():
         controller_username = config_reader.username
         controller_password = config_reader.password
 
-    if sys.version_info[0] >= 3:
-        raw_input = input
-
     sys.stdout.write("Controller API Host [{}]: ".format(controller_api_host))
-    tmp = raw_input()
+    tmp = six.moves.input()
     if tmp != "":
         controller_api_host = tmp
 
     sys.stdout.write("Controller API Port [{}]: ".format(controller_api_port))
-    tmp = input()
+    tmp = six.moves.input()
     if tmp != "":
         controller_api_port = tmp
 
     sys.stdout.write(
         "Controller uses ssl (True|False) [{}]: ".format(controller_use_ssl)
     )
-    tmp = input()
+    tmp = six.moves.input()
     if tmp != "":
         controller_use_ssl = tmp
 
@@ -1142,24 +1132,24 @@ def configure_cli():
             controller_verify_ssl
         )
     )
-    tmp = input()
+    tmp = six.moves.input()
     if tmp != "":
         controller_verify_ssl = tmp
 
     sys.stdout.write(
         "Controller warn ssl (True|False) [{}]: ".format(controller_warn_ssl)
     )
-    tmp = input()
+    tmp = six.moves.input()
     if tmp != "":
         controller_warn_ssl = tmp
 
     sys.stdout.write("Controller Username [{}]: ".format(controller_username))
-    tmp = raw_input()
+    tmp = six.moves.input()
     if tmp != "":
         controller_username = tmp
 
     sys.stdout.write("Controller Password [{}]: ".format(controller_password))
-    tmp = raw_input()
+    tmp = six.moves.input()
     if tmp != "":
         controller_password = tmp
 

tests/cli/cli_test.py

@@ -26,6 +26,7 @@
 
 import requests
 import six
+from mock import MagicMock, mock, mock_open, patch
 
 if six.PY2:
     from io import BytesIO as StringIO  # noqa: F811
@@ -63,13 +64,13 @@ class TestCLI(TestCase):
     def setUp(self):
         file_data = dedent(
             """[default]
-                        api_host = 127.0.0.1
-                        api_port = 8080
-                        use_ssl = True
-                        verify_ssl = False
-                        warn_ssl = True
-                        username = admin
-                        password = admin123"""
+                api_host = 127.0.0.1
+                api_port = 8080
+                use_ssl = True
+                verify_ssl = False
+                warn_ssl = True
+                username = admin
+                password = admin123"""
         )
 
         self.tmpFile = tempfile.NamedTemporaryFile(delete=True)
@@ -103,6 +104,49 @@ def test_config_file_missing(self):
             "Could not find configuration file 'this_file_should_not_exist'\n",
         )
 
+    def test_configure_cli_with_existing_hpecp_conf(self):
+
+        mock_data = dedent(
+            """[default]
+                api_host = 127.0.0.1
+                api_port = 8080
+                use_ssl = True
+                verify_ssl = False
+                warn_ssl = True
+                username = admin
+                password = admin123"""
+        )
+
+        if six.PY2:
+            builtins_name = "__builtin__.open"
+        else:
+            builtins_name = "builtins.open"
+
+        m = mock_open(read_data=mock_data)
+        with patch(builtins_name, m) as mock_file:
+
+            # mock the input capture to simulate user input
+            # TODO: we want to send different data for each parameter
+            six.moves.input = lambda *args: ("1234")
+
+            hpecp = self.cli.CLI()
+            hpecp.configure_cli()
+
+            handle = m()
+            handle.write.assert_has_calls(
+                [
+                    mock.call("[default]\n"),
+                    mock.call("api_host = 1234\n"),
+                    mock.call("api_port = 1234\n"),
+                    mock.call("use_ssl = 1234\n"),
+                    mock.call("verify_ssl = 1234\n"),
+                    mock.call("warn_ssl = 1234\n"),
+                    mock.call("username = 1234\n"),
+                    mock.call("password = 1234\n"),
+                    mock.call("\n"),
+                ]
+            )
+
     def test_autocomplete_bash(self):
 
         try: