From bc52687bca1b3abace56f9ce5e1c9ef7cb76412f Mon Sep 17 00:00:00 2001
From: Alexander Zobnin <alexanderzobnin@gmail.com>
Date: Sat, 23 Jan 2016 14:40:58 +0300
Subject: [PATCH] Changed testDatasource() method for new api.

---
 plugins/datasource-zabbix/datasource.js | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/plugins/datasource-zabbix/datasource.js b/plugins/datasource-zabbix/datasource.js
index 54181a9..6ce5a58 100644
--- a/plugins/datasource-zabbix/datasource.js
+++ b/plugins/datasource-zabbix/datasource.js
@@ -4,6 +4,7 @@ define([
   'app/core/utils/datemath',
   './directives',
   './zabbixAPIWrapper',
+  './zabbixAPIService',
   './utils',
   './helperFunctions',
   './zabbixCacheSrv',
@@ -13,7 +14,8 @@ function (angular, _, dateMath) {
   'use strict';
 
   /** @ngInject */
-  function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv, ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache) {
+  function ZabbixAPIDatasource(instanceSettings, $q, backendSrv, templateSrv, alertSrv,
+                               ZabbixAPI, Utils, zabbixHelperSrv, ZabbixCache, ZabbixAPIService) {
 
     // General data source settings
     this.name             = instanceSettings.name;
@@ -43,27 +45,36 @@ function (angular, _, dateMath) {
      */
     this.testDatasource = function() {
       var self = this;
-      return this.zabbixAPI.getZabbixAPIVersion().then(function (apiVersion) {
-        return self.zabbixAPI.performZabbixAPILogin().then(function (auth) {
+      return this.zabbixAPI.getVersion().then(function (version) {
+        return self.zabbixAPI.login().then(function (auth) {
           if (auth) {
             return {
               status: "success",
               title: "Success",
-              message: "Zabbix API version: " + apiVersion
+              message: "Zabbix API version: " + version
             };
           } else {
             return {
               status: "error",
               title: "Invalid user name or password",
-              message: "Zabbix API version: " + apiVersion
+              message: "Zabbix API version: " + version
             };
           }
+        }, function(error) {
+          console.log(error);
+          return {
+            status: "error",
+            title: "Connection failed",
+            message: error
+          };
         });
-      }, function(error) {
+      },
+      function(error) {
+        console.log(error);
         return {
           status: "error",
           title: "Connection failed",
-          message: "Could not connect to " + error.config.url
+          message: "Could not connect to given url"
         };
       });
     };