Update plugin kubeconfig handling

Removed the return of the kubeconfig filepath from the `create_cluster`
method as we do not use this handling.

Signed-off-by: Toni Finger <toni.finger@cloudandheat.com>

Author: tonifinger

Tests/kaas/plugin/interface.py

@@ -8,6 +8,9 @@ class KubernetesClusterPlugin():
 
     To implement fill the methods `create_cluster` and `delete_cluster` with
     api provider-specific functionalities for creating and deleting clusters.
+    The `create_cluster` method must ensure that the kubeconfigfile is provided
+    at the position in the file system defined by the parameter
+    `kubeconfig_filepath`
 
     - Implement `create_cluster` and `delete_cluster` methods
     - Create `__init__(self, config_file=None)` method to handle api specific
@@ -24,31 +27,29 @@ class PluginX(KubernetesClusterPlugin):
               def __init__(self, config_file=None):
                   self.config = config_file
 
-              def create_cluster(self):
-                  self.cluster = ClusterAPI(name=cluster_name, image=cluster_image)
+              def create_cluster(self, cluster_name="scs-cluster", version=None, kubeconfig_filepath=None):
+                  self.cluster = ClusterAPI(name=cluster_name, image=cluster_image, kubeconfig_filepath)
                   self.cluster.create(self.config)
-                  kubeconfig_filepath = str(self.cluster.kubeconfig_path.resolve())
-                  return self.kubeconfig_filepath
 
-              def delete_cluster(self):
+              def delete_cluster(self, cluster_name=None, version=None):
                   self.cluster = ClusterAPI(cluster_name)
                   self.cluster.delete()
         ..
     """
 
-    def create_cluster(self, cluster_name="scs-cluster", version=None, kubeconfig_filepath=None) -> (str):
+    def create_cluster(self, cluster_name="scs-cluster", version=None, kubeconfig_filepath=None):
         """
         This method is to be called to create a k8s cluster
         :param: cluster_name:
         :param: version:
         :param: kubeconfig_filepath:
-        :return: kubeconfig_filepath
         """
         raise NotImplementedError
 
-    def delete_cluster(self, cluster_name=None):
+    def delete_cluster(self, cluster_name=None, version=None):
         """
         This method is to be called in order to unprovision a cluster
         :param: cluster_name:
+        :param: version:
         """
         raise NotImplementedError

Tests/kaas/plugin/plugin_kind.py

@@ -15,7 +15,7 @@ class PluginKind(KubernetesClusterPlugin):
     conformance testing purpose with the use of Kind
     """
     def __init__(self, config_file=None):
-        logger.info(f"Init provider plug-in of type {self.__class__.__name__}")
+        logger.info(f"Init PluginKind")
         self.config = config_file
         logger.debug(self.config)
         self.working_directory = os.getcwd()
@@ -44,8 +44,7 @@ def create_cluster(self, cluster_name="scs-cluster", version=None, kubeconfig=No
             self.cluster.create()
         else:
             self.cluster.create(self.config)
-        return str(self.cluster.kubeconfig_path.resolve())
 
-    def delete_cluster(self, cluster_name=None):
+    def delete_cluster(self, cluster_name=None, version=None):
         self.cluster = KindCluster(cluster_name)
         self.cluster.delete()

Tests/kaas/plugin/run_plugin.py

@@ -21,17 +21,6 @@ def init_plugin(plugin_kind, config=None):
     return plugin_maker(config)
 
 
-def run_plugin_create(plugin_kind, plugin_config, clusterspec_cluster, clusterspec):
-    plugin = init_plugin(plugin_kind, plugin_config)
-    clusterinfo = clusterspec[clusterspec_cluster]
-    plugin.create_cluster(clusterspec_cluster, clusterinfo['branch'], os.path.abspath(clusterinfo['kubeconfig']))
-
-
-def run_plugin_delete(plugin_kind, plugin_config, clusterspec_cluster, clusterspec):
-    plugin = init_plugin(plugin_kind, plugin_config)
-    plugin.delete_cluster(clusterspec_cluster)
-
-
 def load_spec(clusterspec_path):
     with open(clusterspec_path, "rb") as fileobj:
         return yaml.load(fileobj, Loader=yaml.SafeLoader)
@@ -49,7 +38,10 @@ def cli():
 @click.argument('clusterspec_cluster', type=str, default="default")
 def create(plugin_kind, plugin_config, clusterspec_path, clusterspec_cluster):
     clusterspec = load_spec(clusterspec_path)['clusters']
-    run_plugin_create(plugin_kind, plugin_config, clusterspec_cluster, clusterspec)
+    plugin = init_plugin(plugin_kind, plugin_config)
+    clusterinfo = clusterspec[clusterspec_cluster]
+    cluster_id = clusterspec_cluster
+    plugin.create_cluster(cluster_id, clusterinfo['branch'], os.path.abspath(clusterinfo['kubeconfig']))
 
 
 @cli.command()
@@ -59,7 +51,10 @@ def create(plugin_kind, plugin_config, clusterspec_path, clusterspec_cluster):
 @click.argument('clusterspec_cluster', type=str, default="default")
 def delete(plugin_kind, plugin_config, clusterspec_path, clusterspec_cluster):
     clusterspec = load_spec(clusterspec_path)['clusters']
-    run_plugin_delete(plugin_kind, plugin_config, clusterspec_cluster, clusterspec)
+    clusterinfo = clusterspec[clusterspec_cluster]
+    cluster_id = clusterspec_cluster
+    plugin = init_plugin(plugin_kind, plugin_config)
+    plugin.delete_cluster(cluster_id, clusterinfo['branch'])
 
 
 if __name__ == '__main__':