You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/06/22 01:59:28 UTC

svn commit: r1495641 - in /incubator/ambari/trunk/ambari-web/app: ./ assets/data/wizard/reassign/step14PolledData/ controllers/wizard/ data/mock/ data/mock/step14PolledData/ data/mock/step9PolledData/ models/ templates/wizard/ utils/

Author: yusaku
Date: Fri Jun 21 23:59:26 2013
New Revision: 1495641

URL: http://svn.apache.org/r1495641
Log:
AMBARI-2449. Remove unnecessary mock data files. (Andrii Tkach via yusaku)

Added:
    incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/
    incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll1.json
    incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll2.json
    incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll3.json
    incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll4.json
    incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll5.json
Removed:
    incubator/ambari/trunk/ambari-web/app/data/mock/hosts.js
    incubator/ambari/trunk/ambari-web/app/data/mock/master_component_hosts.js
    incubator/ambari/trunk/ambari-web/app/data/mock/slave_component_hosts.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step14PolledData/tasks_poll1.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step14PolledData/tasks_poll2.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step14PolledData/tasks_poll3.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step14PolledData/tasks_poll4.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step14PolledData/tasks_poll5.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step3_hosts.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step3_pollData.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step3_single_host.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9PolledData/pollData_1.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9PolledData/pollData_2.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9PolledData/pollData_3.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9PolledData/pollData_4.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9PolledData/pollData_5.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9PolledData/pollData_6.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9PolledData/pollData_7.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9PolledData/pollData_8.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9PolledData/pollData_9.js
    incubator/ambari/trunk/ambari-web/app/data/mock/step9_hosts.js
Modified:
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
    incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
    incubator/ambari/trunk/ambari-web/app/messages.js
    incubator/ambari/trunk/ambari-web/app/models/cluster_states.js
    incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs
    incubator/ambari/trunk/ambari-web/app/utils/ajax.js

Added: incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll1.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll1.json?rev=1495641&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll1.json (added)
+++ incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll1.json Fri Jun 21 23:59:26 2013
@@ -0,0 +1,56 @@
+{
+  "href": "http://localhost:8080/api/clusters/mycluster/requests/1",
+  "Requests": {
+    "id": 1
+  },
+  "tasks": [
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/1",
+      "Tasks": {
+        "id": "1",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "QUEUED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "DATANODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/2",
+      "Tasks": {
+        "id": "2",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "QUEUED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "NAMENODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/3",
+      "Tasks": {
+        "id": "3",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "QUEUED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "SECONDARY_NAMENODE",
+        "stderr": "",
+        "host_name": "host2",
+        "stage_id": "1"
+      }
+    }
+  ]
+}

Added: incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll2.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll2.json?rev=1495641&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll2.json (added)
+++ incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll2.json Fri Jun 21 23:59:26 2013
@@ -0,0 +1,56 @@
+{
+  "href": "http://localhost:8080/api/clusters/mycluster/requests/1",
+  "Requests": {
+    "id": 1
+  },
+  "tasks": [
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/1",
+      "Tasks": {
+        "id": "1",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "IN_PROGRESS",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "DATANODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/2",
+      "Tasks": {
+        "id": "2",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "QUEUED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "NAMENODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/3",
+      "Tasks": {
+        "id": "3",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "QUEUED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "SECONDARY_NAMENODE",
+        "stderr": "",
+        "host_name": "host2",
+        "stage_id": "1"
+      }
+    }
+  ]
+}

Added: incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll3.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll3.json?rev=1495641&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll3.json (added)
+++ incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll3.json Fri Jun 21 23:59:26 2013
@@ -0,0 +1,56 @@
+{
+  "href": "http://localhost:8080/api/clusters/mycluster/requests/1",
+  "Requests": {
+    "id": 1
+  },
+  "tasks": [
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/1",
+      "Tasks": {
+        "id": "1",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "COMPLETED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "DATANODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/2",
+      "Tasks": {
+        "id": "2",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "IN_PROGRESS",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "NAMENODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/3",
+      "Tasks": {
+        "id": "3",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "QUEUED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "SECONDARY_NAMENODE",
+        "stderr": "",
+        "host_name": "host2",
+        "stage_id": "1"
+      }
+    }
+  ]
+}

Added: incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll4.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll4.json?rev=1495641&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll4.json (added)
+++ incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll4.json Fri Jun 21 23:59:26 2013
@@ -0,0 +1,56 @@
+{
+  "href": "http://localhost:8080/api/clusters/mycluster/requests/1",
+  "Requests": {
+    "id": 1
+  },
+  "tasks": [
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/1",
+      "Tasks": {
+        "id": "1",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "COMPLETED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "DATANODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/2",
+      "Tasks": {
+        "id": "2",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "COMPLETED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "NAMENODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/3",
+      "Tasks": {
+        "id": "3",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "IN_PROGRESS",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "SECONDARY_NAMENODE",
+        "stderr": "",
+        "host_name": "host2",
+        "stage_id": "1"
+      }
+    }
+  ]
+}

Added: incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll5.json
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll5.json?rev=1495641&view=auto
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll5.json (added)
+++ incubator/ambari/trunk/ambari-web/app/assets/data/wizard/reassign/step14PolledData/tasks_poll5.json Fri Jun 21 23:59:26 2013
@@ -0,0 +1,56 @@
+{
+  "href": "http://localhost:8080/api/clusters/mycluster/requests/1",
+  "Requests": {
+    "id": 1
+  },
+  "tasks": [
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/1",
+      "Tasks": {
+        "id": "1",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "COMPLETED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "DATANODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/2",
+      "Tasks": {
+        "id": "2",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "COMPLETED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "NAMENODE",
+        "stderr": "",
+        "host_name": "localhost.localdomain",
+        "stage_id": "1"
+      }
+    },
+    {
+      "href": "http://localhost:8080/api/clusters/mycluster/requests/1/tasks/3",
+      "Tasks": {
+        "id": "3",
+        "attempt_cnt": "0",
+        "exit_code": "999",
+        "stdout": "",
+        "status": "COMPLETED",
+        "command": "INSTALL",
+        "start_time": "-1",
+        "role": "SECONDARY_NAMENODE",
+        "stderr": "",
+        "host_name": "host2",
+        "stage_id": "1"
+      }
+    }
+  ]
+}

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js?rev=1495641&r1=1495640&r2=1495641&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step14_controller.js Fri Jun 21 23:59:26 2013
@@ -775,38 +775,37 @@ App.WizardStep14Controller = Em.Controll
   },
 
   POLL_INTERVAL: 4000,
-  dataPollCounter: 1,
+  dataPollCounter: 0,
 
   getLogsByRequest: function () {
     this.set('logs', []);
-    if (App.testMode) {
-      var data = require('data/mock/step14PolledData/tasks_poll' + this.get('dataPollCounter'));
-      this.set('dataPollCounter', this.get('dataPollCounter') + 1);
-      if (this.get('dataPollCounter') == 6) {
-        this.set('dataPollCounter', 1);
-      }
-      this.onGetLogsByRequestSuccess(data);
-    } else {
-      var requestIds = this.get('currentRequestId');
-      requestIds.forEach(function (requestId) {
-        App.ajax.send({
-          name: 'reassign.get_logs',
-          sender: this,
-          data: {
-            requestId: requestId
-          },
-          success: 'onGetLogsByRequestSuccess',
-          error: 'onGetLogsByRequestError'
-        });
-      }, this);
+    var requestIds = this.get('currentRequestId');
+
+    if (this.get('dataPollCounter') == 5) {
+      this.set('dataPollCounter', 0);
     }
+    this.set('dataPollCounter', this.get('dataPollCounter') + 1);
+
+    requestIds.forEach(function (requestId) {
+      App.ajax.send({
+        name: 'reassign.get_logs',
+        sender: this,
+        data: {
+          requestId: requestId,
+          pollCounter: this.get('dataPollCounter')
+        },
+        success: 'onGetLogsByRequestSuccess',
+        error: 'onGetLogsByRequestError'
+      });
+    }, this);
+
   },
 
   logs: [],
 
   onGetLogsByRequestSuccess: function (data) {
     this.get('logs').push(data);
-    if (this.get('logs.length') == this.get('currentRequestId.length') || App.testMode) {
+    if (this.get('logs.length') == this.get('currentRequestId.length')) {
       this.parseLogs(this.get('logs'))
     }
   },

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js?rev=1495641&r1=1495640&r2=1495641&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step3_controller.js Fri Jun 21 23:59:26 2013
@@ -94,9 +94,6 @@ App.WizardStep3Controller = Em.Controlle
 
   isRetryDisabled: true,
 
-  mockData: require('data/mock/step3_hosts'),
-  mockRetryData: require('data/mock/step3_pollData'),
-
   navigateStep: function () {
     this.loadStep();
     if (this.get('content.installOptions.manualInstall') !== true) {
@@ -938,33 +935,6 @@ App.WizardStep3Controller = Em.Controlle
     })
   },
 
-  // TODO: dummy button. Remove this after the hook up with actual REST API.
-  mockBtn: function () {
-    this.set('isSubmitDisabled', false);
-    this.hosts.clear();
-    var hostInfo = this.mockData;
-    this.renderHosts(hostInfo);
-  },
-
-  pollBtn: function () {
-    if (this.get('isSubmitDisabled')) {
-      return;
-    }
-    var hosts = this.get('visibleHosts');
-    var selectedHosts = hosts.filterProperty('isChecked', true);
-    selectedHosts.forEach(function (_host) {
-      console.log('Retrying:  ' + _host.name);
-    });
-
-    var mockHosts = this.mockRetryData;
-    mockHosts.forEach(function (_host) {
-      console.log('Retrying:  ' + _host.name);
-    });
-    if (this.parseHostInfo(mockHosts, selectedHosts)) {
-      // this.saveHostInfoToDb();
-    }
-  },
-
   back: function () {
     if (this.get('isInstallInProgress')) {
       return;

Modified: incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js?rev=1495641&r1=1495640&r2=1495641&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/wizard/step9_controller.js Fri Jun 21 23:59:26 2013
@@ -38,7 +38,6 @@ App.WizardStep9Controller = Em.Controlle
     }
   }.observes('content.cluster.status', 'content.controllerName'),
 
-  mockHostData: require('data/mock/step9_hosts'),
   mockDataPrefix: '/data/wizard/deploy/5_hosts',
   pollDataCounter: 0,
   polledData: [],
@@ -186,7 +185,7 @@ App.WizardStep9Controller = Em.Controlle
     this.set('status', 'info');
     this.set('progress', '0');
     this.set('isStepCompleted', false);
-    this.numPolls = 0;
+    this.numPolls = 1;
   },
 
   loadStep: function () {
@@ -667,7 +666,7 @@ App.WizardStep9Controller = Em.Controlle
     this.doPolling();
   },
 
-  numPolls: 0,
+  numPolls: 1,
 
   getUrl: function (requestId) {
     var clusterName = this.get('content.cluster.name');

Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1495641&r1=1495640&r2=1495641&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Fri Jun 21 23:59:26 2013
@@ -214,8 +214,6 @@ Em.I18n.translations = {
   'installer.header':'Cluster Install Wizard',
   'installer.navigation.warning.header':'Navigation Warning',
 
-  'installer.mockData':'mockData',
-  'installer.pollData':'pollData',
   'installer.noHostsAssigned':'No host assigned',
   'installer.slaveComponentHosts.selectHosts':'select hosts for this group',
   'installer.slaveComponentHostsPopup.header':'Select which hosts should belong to which {0} group',

Modified: incubator/ambari/trunk/ambari-web/app/models/cluster_states.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/models/cluster_states.js?rev=1495641&r1=1495640&r2=1495641&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/models/cluster_states.js (original)
+++ incubator/ambari/trunk/ambari-web/app/models/cluster_states.js Fri Jun 21 23:59:26 2013
@@ -73,6 +73,7 @@ App.clusterStatus = Ember.Object.create(
    * @return {*}
    */
   setClusterStatus: function(newValue){
+    if(App.testMode) return false;
     if (newValue) {
       //setter
       if (newValue.clusterState) {

Modified: incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs?rev=1495641&r1=1495640&r2=1495641&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs (original)
+++ incubator/ambari/trunk/ambari-web/app/templates/wizard/step3.hbs Fri Jun 21 23:59:26 2013
@@ -35,16 +35,6 @@
           {{t installer.step3.retryFailed}}
         </a>
         {{/unless}}
-        {{#if App.testMode}}
-            <a class="btn btn-info"
-               href="#" {{action mockBtn target="controller"}}>
-              {{t installer.mockData}}
-            </a>
-            <a class="btn btn-info"
-               href="#" {{action pollBtn target="controller"}}>
-                {{t installer.pollData}}
-            </a>
-        {{/if}}
 
         <div id="host-filter" class="pull-right">
           <ul class="clearfix">

Modified: incubator/ambari/trunk/ambari-web/app/utils/ajax.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/ajax.js?rev=1495641&r1=1495640&r2=1495641&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/ajax.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/ajax.js Fri Jun 21 23:59:26 2013
@@ -173,6 +173,7 @@ var urls = {
   },
   'reassign.get_logs': {
     'real': '/clusters/{clusterName}/requests/{requestId}?fields=tasks/*',
+    'mock': '/data/wizard/reassign/step14PolledData/tasks_poll{pollCounter}.json',
     'type': 'GET'
 
   },
@@ -603,9 +604,9 @@ var urls = {
   'wizard.install_services.installer_controller.is_retry': {
     'real': '/clusters/{cluster}/host_components?HostRoles/state=INSTALLED',
     'mock': '/data/wizard/deploy/2_hosts/poll_1.json',
+    'type': 'PUT',
     'format': function (data, opt) {
       return {
-        type: 'PUT',
         async: false,
         data: data.data
       };
@@ -614,9 +615,9 @@ var urls = {
   'wizard.install_services.installer_controller.not_is_retry': {
     'real': '/clusters/{cluster}/services?ServiceInfo/state=INIT',
     'mock': '/data/wizard/deploy/2_hosts/poll_1.json',
+    'type': 'PUT',
     'format': function (data, opt) {
       return {
-        type: 'PUT',
         async: false,
         data: data.data
       };