tidy up

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

Author: snowch

bin/cli.py

@@ -393,7 +393,8 @@ def version(debug=False):
     if debug:
         print("HPECP Bin Path:  " + os.path.dirname(os.path.abspath(__file__)))
         print(
-            "HPECP Lib Path:  " + os.path.dirname(os.path.abspath(hpecp.__file__))
+            "HPECP Lib Path:  "
+            + os.path.dirname(os.path.abspath(hpecp.__file__))
         )
         print("Python Version:  " + sys.version.replace("\n", ""))
         print("Python Exe Path: " + sys.executable)

hpecp/cli/k8scluster.py

@@ -368,18 +368,26 @@ def import_generic_cluster_with_json(
         ------
         APIException
         """
-        # assert (
-        #     json_file_path is not None or json_content is not None
-        # ), "Either --json-file-path or --json-content must be provided."
+        assert (
+            json_file_path is not None or json_content is not None
+        ), "Either --json-file-path or --json-content must be provided"
 
-        # assert (
-        #     json_file_path is None and json_content is None
-        # ), "Either --json-file-path or --json-content must be provided."
+        assert (
+            json_file_path is None or json_content is None
+        ), "Either --json-file-path or --json-content must be provided."
 
         if json_file_path:
-            # TODO verify file exist, etc
-            with open(json_file_path, "r") as f:
-                json_content = f.read()
+            try:
+                with open(json_file_path, "r") as f:
+                    json_content = f.read()
+            except OSError:
+                print(
+                    "Could not open/read json-file-path: {}".format(
+                        json_file_path
+                    ),
+                    file=sys.stderr,
+                )
+                sys.exit(1)
 
         json_content = json.loads(json_content)
 

hpecp/datatap.py

@@ -153,28 +153,23 @@ def create_hdfs_with_kerberos(
             [description]
         keytab : [type]
             [description]
-        service_id : [type]
-            [description]
         backup_host : [type]
             [description]
-        endpoint_type : [type]
+        type : [type]
             [description]
-        endpoint_port : [type]
+        port : [type]
             [description]
         read_only : [type]
             [description]
         """
         _data = {
-            "bdfs_root": {
-                #"path_from_endpoint": path_from_endpoint
-                },
+            "bdfs_root": {},
             "endpoint": {
                 "kdc_data": [
                     {
-                        "host": kdc_data_host, 
-                        #"port": kdc_data_port
-                        }
-                    ],
+                        "host": kdc_data_host,
+                    }
+                ],
                 "realm": realm,
                 "client_principal": client_principal,
                 "browse_only": browse_only,
@@ -188,16 +183,13 @@ def create_hdfs_with_kerberos(
             "flags": {"read_only": read_only},
             "label": {"name": name, "description": description},
         }
-        
+
         if path_from_endpoint != "":
             _data["bdfs_root"]["path_from_endpoint"] = path_from_endpoint
 
         if kdc_data_port != "":
             _data["endpoint"]["kdc_data"]["kdc_data_port"] = kdc_data_port
 
-        #if keytab != "":
-        #    _data["endpoint"]["keytab"] = keytab
-
         self.client._request(
             url=DatatapController.base_resource_path,
             http_method="post",