Pārlūkot izejas kodu

HUE-8555 [jb] Support killing data warehouse cluster

Romain Rigaux 7 gadi atpakaļ
vecāks
revīzija
ca2da8b

+ 14 - 16
apps/jobbrowser/src/jobbrowser/templates/job_browser.mako

@@ -2664,7 +2664,7 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
       };
 
       self.createCluster = function() {
-        if (self.interface().indexOf('dataeng') != -1) {
+        if (vm.interface().indexOf('dataeng') != -1) {
           $.post("/metadata/api/dataeng/create_cluster/", {
             "cluster_name": "cluster_name",
             "cdh_version": "CDH515",
@@ -2679,21 +2679,19 @@ ${ commonheader("Job Browser", "jobbrowser", user, request) | n,unicode }
             self.updateJobs();
           });
         } else {
-          self.createDataWarehouseCluster = function() {
-            $.post("/metadata/api/analytic_db/create_cluster/", {
-              "cluster_name": "cluster_name",
-              "cdh_version": "CDH515",
-              "public_key": "public_key",
-              "instance_type": "m4.xlarge",
-              "environment_name": "crn:altus:environments:us-west-1:12a0079b-1591-4ca0-b721-a446bda74e67:environment:jheyming-secure/b4e6d99a-261f-4ada-9b4a-576aa0af8979",
-              "workers_group_size": "3",
-              "namespace_name": "crn:altus:sdx:us-west-1:12a0079b-1591-4ca0-b721-a446bda74e67:namespace:analytics/7ea35fe5-dbc9-4b17-92b1-97a1ab32e410"
-            }, function(data) {
-              console.log(ko.mapping.toJSON(data));
-              $(document).trigger("info", ko.mapping.toJSON(data));
-              self.updateJobs();
-            });
-          }
+          $.post("/metadata/api/analytic_db/create_cluster/", {
+            "cluster_name": "Analytics",
+            "cdh_version": "CDH515",
+            "public_key": "public_key",
+            "instance_type": "m4.xlarge",
+            "environment_name": "crn:altus:environments:us-west-1:12a0079b-1591-4ca0-b721-a446bda74e67:environment:jheyming-secure/b4e6d99a-261f-4ada-9b4a-576aa0af8979",
+            "workers_group_size": "3",
+            "namespace_name": "crn:altus:sdx:us-west-1:12a0079b-1591-4ca0-b721-a446bda74e67:namespace:analytics/7ea35fe5-dbc9-4b17-92b1-97a1ab32e410"
+          }, function(data) {
+            console.log(ko.mapping.toJSON(data));
+            $(document).trigger("info", ko.mapping.toJSON(data));
+            self.updateJobs();
+          });
         }
       }
 

+ 4 - 1
desktop/libs/notebook/src/notebook/connectors/altus.py

@@ -238,7 +238,7 @@ class AnalyticDbApi():
     params = {
       'clusterName': cluster_name,
       'cdhVersion': cdh_version,
-      'publicKey': public_key,
+      'publicKey': u'ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDuTEfNIW8LEcVgprUrourbYjoW1RaTLhfzPnnBjJrg14koQrosl+s9phrpBBLTWmQuQdvy9iC2ma//gY5nz/7e+QuaeENhhoEiZn1PDBbFakD/AOjZXIu6DTEgCrOeXsQauFZKOkcFvrBGJC0qigYU3b8Eys4cun3RQ4S9WkDW6538wOSnsm6sXcL84KqbH+ay5gTk+lz3bi/6plALZMItbRz9IulXnLM4QfCwMxXTU/IjtnT+ltZVvKsWpfvDQ3Oyu/a6gK369iXcSP0e07KAzWiv2WYX46sNzZ8+de9ho1/VMaXnI4WrooV9lxByKWD+WsXkqtctT16VfxpX8CeR romain@unreal\n',
       'instanceType': instance_type,
       'environmentName': environment_name,
       'workersGroupSize': workers_group_size,
@@ -263,3 +263,6 @@ class AnalyticDbApi():
 
   def submit_hue_query(self, cluster_crn, payload):
     return _exec('dataware', 'submitHueQuery', {'clusterCrn': cluster_crn, 'payload': payload})
+
+  def delete_cluster(self, cluster_id):
+    return _exec('dataware', 'deleteCluster', {'clusterName': cluster_id})