Forráskód Böngészése

AMBARI-8992 Pass target stack version info when making a call for pre-upgrade checks. (atkach)

Andrii Tkach 10 éve
szülő
commit
01e2af6ce9

+ 5 - 2
ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js

@@ -298,7 +298,10 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
       App.ajax.send({
         name: "admin.rolling_upgrade.pre_upgrade_check",
         sender: this,
-        data: version,
+        data: {
+          version: version.value,
+          label: version.label
+        },
         success: "runPreUpgradeCheckSuccess"
       });
     } else {
@@ -368,4 +371,4 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
   openUpgradeDialog: function () {
     App.router.transitionTo('admin.stackUpgrade');
   }
-});
+});

+ 1 - 1
ambari-web/app/utils/ajax/ajax.js

@@ -1379,7 +1379,7 @@ var urls = {
     'mock': ''
   },
   'admin.rolling_upgrade.pre_upgrade_check': {
-    'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*',
+    'real': '/clusters/{clusterName}/rolling_upgrades_check?fields=*&UpgradeChecks/repository_version={version}',
     'mock': '/data/stack_versions/pre_upgrade_check.json'
   },
 

+ 13 - 2
ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js

@@ -238,8 +238,19 @@ describe('App.MainAdminStackAndUpgradeController', function() {
       App.ajax.send.restore();
     });
     it("make ajax call", function() {
-      controller.runPreUpgradeCheck("2.2.1");
-      expect(App.ajax.send.calledOnce).to.be.true;
+      controller.runPreUpgradeCheck({
+        value: '2.2',
+        label: 'HDP-2.2'
+      });
+      expect(App.ajax.send.getCall(0).args[0]).to.eql({
+        name: "admin.rolling_upgrade.pre_upgrade_check",
+        sender: controller,
+        data: {
+          version: '2.2',
+          label: 'HDP-2.2'
+        },
+        success: "runPreUpgradeCheckSuccess"
+      });
     });
   });