Merge branch 'release/7.0' into release/8.0

Author: duckie

dataikuapi/dss/apideployer.py

@@ -166,6 +166,15 @@ def get_settings(self):
 
         return DSSAPIDeployerInfraSettings(self.client, self.infra_id, settings)
 
+    def delete(self):
+        """
+        Deletes this infra
+        You may only delete an infra if it has no deployments on it anymore.
+        """
+        self.client._perform_empty(
+            "DELETE", "/api-deployer/infras/%s" % (self.infra_id))
+
+
 class DSSAPIDeployerInfraSettings(object):
     """The settings of an API Deployer Infra. 
 
@@ -191,6 +200,18 @@ def add_apinode(self, url, api_key, graphite_prefix=None):
         }
         self.settings["apiNodes"].append(new_node)
 
+    def remove_apinode(self, node_url):
+        """
+        Removes a node from the list of nodes of this infra.
+        Only applicable to STATIC infrastructures
+
+        :param str node_url: URL of the node to remove
+        """
+        api_nodes = list(self.settings["apiNodes"])
+        for node in api_nodes:
+            if node.get("url") == node_url:
+                self.settings["apiNodes"].remove(node)
+
     def get_raw(self):
         """
         Gets the raw settings of this infra. This returns a reference to the raw settings, not a copy,

dataikuapi/dss/job.py

@@ -1,6 +1,6 @@
 import time
 import sys
-from dataikuapi.utils import DataikuException
+from ..utils import DataikuException
 
 class DSSJob(object):
     """

dataikuapi/dss/macro.py

@@ -1,6 +1,6 @@
 import time
 import sys, json
-from dataikuapi.utils import DataikuException
+from ..utils import DataikuException
 
 class DSSMacro(object):
     """

dataikuapi/dss/project.py

@@ -18,7 +18,7 @@
 from .analysis import DSSAnalysis
 from .flow import DSSProjectFlow
 from .app import DSSAppManifest
-from dataikuapi.utils import DataikuException
+from ..utils import DataikuException
 
 
 class DSSProject(object):

dataikuapi/dss/scenario.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 import time, warnings
-from dataikuapi.utils import DataikuException
+from ..utils import DataikuException
 from .discussion import DSSObjectDiscussions
 from .utils import DSSTaggableObjectListItem
 
@@ -637,4 +637,4 @@ def to_scenario(self):
 
     @property
     def id(self):
-        return self._data["name"]
+        return self._data["name"]

dataikuapi/dss/wiki.py

@@ -1,5 +1,5 @@
 from .discussion import DSSObjectDiscussions
-from dataikuapi.utils import DataikuException
+from ..utils import DataikuException
 import json
 import sys
 import copy

meta/main.yml

@@ -0,0 +1,9 @@
+---
+galaxy_info:
+  author: Dataiku
+  description: Dataiku API Client
+  company: Dataiku
+  license: Apache 2.0
+  min_ansible_version: 2.5
+  galaxy_tags: ["dataiku","dss","data-science-studio"]
+dependencies: []

module_utils/dataikuapi

@@ -0,0 +1 @@
+../dataikuapi