allow providing addons at cluster creation

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

Author: snowch

bin/cli.py

@@ -735,6 +735,7 @@ def create(
         pod_dns_domain="cluster.local",
         persistent_storage_local=False,
         persistent_storage_nimble_csi=False,
+        addons=[],
     ):
         """Create a K8s Cluster.
 
@@ -750,7 +751,10 @@ def create(
         :param pod_dns_domain: the pod dns domain, default='cluster.local'
         :param persistent_storage_local: True/False
         :param persistent_storage_nimble_csi: True/False
+        :param addons: list of required addons. See:
+            `hpecp k8scluster get-available-addons`
         """
+
         host_config = [
             K8sClusterHostConfig.create_from_list(h.split(":"))
             for h in k8shosts_config.split(",")
@@ -767,6 +771,7 @@ def create(
                 persistent_storage_local=persistent_storage_local,
                 persistent_storage_nimble_csi=persistent_storage_nimble_csi,
                 k8shosts_config=host_config,
+                addons=addons,
             )
         )
 
@@ -804,14 +809,25 @@ def dashboard_token(
         else:
             print(base64.b64decode(token.encode()).decode("utf-8"))
 
-    def get_installed_addons(self, id):
+    def get_installed_addons(self, id, k8s_version):
         """Retrieve the installed addons on the cluster.
 
-        :param id: the cluster ID
+        :param id: get available addons for a specific cluster (opt)
+        :param k8s_version: get available addons for a cluster version (opt)
         """
+        if id is not None or k8s_version is not None:
+            print(
+                "Either 'id' or 'k8s_version' parameter must be provided",
+                file=sys.stdout,
+            )
+        if id is None or k8s_version is None:
+            print(
+                "Either 'id' or 'k8s_version' parameter must be provided",
+                file=sys.stdout,
+            )
         print(get_client().k8s_cluster.get(id=id).addons)
 
-    def get_available_addons(self, id):
+    def get_available_addons(self, id, k8s_version):
         """Retrieve the available addons for a cluster.
 
         :param id: the cluster ID

hpecp/k8s_cluster.py

@@ -290,6 +290,7 @@ def create(
         persistent_storage_local=False,
         persistent_storage_nimble_csi=False,
         k8shosts_config=[],
+        addons=[],
     ):
         """Send an API request to create a K8s Cluster.  The cluster creation
         will be asynchronous - use the :py:meth:`wait_for_status` method to
@@ -310,6 +311,8 @@ def create(
         pod_network_range: str
             Network range to be used for kubernetes pods. Defaults to
             `10.192.0.0/12`
+        addons: list
+            Addons - See :py:method:`get_available_addons`.
         service_network_range: str
             Network range to be used for kubernetes services that are
             exposed with Cluster IP. Defaults to `10.96.0.0/12`
@@ -371,12 +374,14 @@ def create(
                 "'k8shosts_config' item '{}' is not of"
                 " type K8sClusterHostConfig"
             ).format(i)
+        assert isinstance(addons, list), "'addons' must be a list"
 
         data = {
             "label": {"name": name},
             "pod_network_range": pod_network_range,
             "service_network_range": service_network_range,
             "pod_dns_domain": pod_dns_domain,
+            "addons": addons,
             "persistent_storage": {
                 "local": persistent_storage_local,
                 "nimble_csi": persistent_storage_nimble_csi,
@@ -428,7 +433,7 @@ def k8s_supported_versions(self):
         )
         return response.json()["supported_versions"]
 
-    def get_available_addons(self, id):
+    def get_available_addons(self, id=None, k8s_version=None):
         """Retrieve list of K8S Supported Versions.
 
         Parameters
@@ -445,14 +450,20 @@ def get_available_addons(self, id):
         ------
         APIException
         """
-        current_cluster_k8s_version = self.get(id).k8s_version
+        assert (
+            id is not None or k8s_version is not None
+        ), "Either 'id' or 'k8s_version' parameter must be provided"
+        assert (
+            id is None or k8s_version is None
+        ), "Either 'id' or 'k8s_version' parameter must be provided"
+
+        if id:
+            k8s_version = self.get(id).k8s_version
 
         response = self.client._request(
             url="/api/v2/k8smanifest",
             http_method="get",
             description="k8s_cluster/get_available_addons",
         )
-        addons = response.json()["version_info"][current_cluster_k8s_version][
-            "addons"
-        ]
+        addons = response.json()["version_info"][k8s_version]["addons"]
         return addons