zabbixapi 0.5.0b3 → 0.5.0b4

data/lib/zabbixapi/screens.rb

@@ -1,13 +1,5 @@
 class ZabbixApi
-  class Screens < Basic
-
-    def api_method_name
-      "screen"
-    end
-
-    def api_identify
-      "name"
-    end
+  class Screens
 
     # extracted from frontends/php/include/defines.inc.php
     #SCREEN_RESOURCE_GRAPH => 0,
@@ -28,6 +20,41 @@ class ZabbixApi
     #SCREEN_RESOURCE_SYSTEM_STATUS => 15,
     #SCREEN_RESOURCE_HOST_TRIGGERS => 16
 
+    def initialize(client)
+      @client = client
+      @screen_default_options = {
+        :vsize => 3
+      }
+    end
+
+    # Create screen
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :name => "Screen name", hsize (rows) and vsize (columns) and array :screenitems => []
+    #   screenitems contains :resourcetype (0 - graph), :resourcetypeid (id item) and :x and :y position
+    # * *Returns* :
+    #   - Nil or Integer
+    def create(data)
+      result = @client.api_request(:method => "screen.create", :params => data)
+      result ? result['screenids'][0].to_i : nil
+    end
+
+    # Create screen
+    # Synonym create
+    def add(data)
+      create(data)
+    end
+
+    # Update screen
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :screenid => [ "screenid" ]
+    # * *Returns* :
+    #   - Nil or Integer
+    def update(data)
+      result = @client.api_request(:method => "screen.update", :params => data)
+      result ? result['screenids'][0].to_i : nil      
+    end
 
     # Return info about screen
     # 
@@ -40,6 +67,29 @@ class ZabbixApi
       result.empty? ? [] : result
     end
 
+    # Return screenid
+    # 
+    # * *Args*    : 
+    #   - +data+ -> Hash with :name => "Screen name"
+    # * *Returns* :
+    #   - Nil or Integer
+    def get_id(data)
+      result = get_full_data(data)
+      screenid = nil
+      result.each { |screen| screenid = screen['screenid'].to_i if screen['name'] == data[:name] }
+      screenid
+    end
+
+    # Delete screen
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :params => [screenid]
+    # * *Returns* :
+    #   - Nil or Integer
+    def delete(data)
+      result = @client.api_request(:method => "screen.delete", :params => data)
+      result.empty? ? nil : result['screenids'][0].to_i
+    end
 
     # Create screen all graphs for host
     #

data/lib/zabbixapi/templates.rb

@@ -1,22 +1,50 @@
 class ZabbixApi
-  class Templates < Basic
+  class Templates
 
-    def api_method_name
-      "template"
+    def initialize(client)
+      @client = client
     end
 
-    def api_identify
-      "name"
+    # Create template
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :host => "Template_Name" and :groups => array with hostgroup ids
+    # * *Returns* :
+    #   - Nil or Integer
+    def create(data)
+      result = @client.api_request(:method => "template.create", :params => [data])
+      result.empty? ? nil : result['templateids'][0].to_i
     end
 
-    def create(data)
-      create_array(data)
+    # Add template
+    # Synonym create
+    def add(data)
+      create(data)
     end
 
+    # Delete template
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :host => "Template_Name"
+    # * *Returns* :
+    #   - Nil or Integer
     def delete(data)
-      delete_array_sym(data)
+      result = @client.api_request(:method => "template.delete", :params => [:templateid => data])
+      result.empty? ? nil : result['templateids'][0].to_i
     end
 
+    # Destroy template
+    # Synonym delete
+    def destroy(data)
+      delete(data)
+    end
+
+    # Return templateids linked with host 
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :hostids => [hostid]
+    # * *Returns* :
+    #   - Array with templateids
     def get_ids_by_host(data)
       result = []
       @client.api_request(:method => "template.get", :params => data).each do |tmpl|
@@ -24,7 +52,19 @@ class ZabbixApi
       end
       result
     end
-   
+
+    # Return templateid
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :host => "Template_Name" and :groups => array with hostgroup ids
+    # * *Returns* :
+    #   - Integer
+    def get_or_create(data)
+      unless templateid = get_id(:host => data[:host])
+        templateid = create(data)
+      end
+      templateid
+    end   
 
     # Analog Zabbix api call massUpdate
     # 
@@ -115,5 +155,17 @@ class ZabbixApi
       end
     end
 
+    # Return info about template
+    # 
+    # * *Args*    : 
+    #   - +data+ -> Hash with :host => "Template name"
+    # * *Returns* :
+    #   - Nil or Integer
+    def get_id(data)
+      templateid = nil
+      get_full_data(data).each { |template| templateid = template['templateid'].to_i if template['host'] == data[:host] }
+      templateid
+    end
+
   end
 end

data/lib/zabbixapi/triggers.rb

@@ -1,24 +1,47 @@
 class ZabbixApi
-  class Triggers < Basic
+  class Triggers
 
-    def api_method_name
-      "trigger"
+    def initialize(client)
+      @client = client
     end
 
-    def api_identify
-      "description"
+    def create(data)
+      result = @client.api_request(:method => "trigger.create", :params => [data])
+      result.empty? ? nil : result['triggerids'][0].to_i
+    end
+
+    def add(data)
+      create(data)
     end
 
     def delete(data)
-      delete_array(data)
+      result = @client.api_request(:method => "trigger.delete", :params => [data])
+      result.empty? ? nil : result['triggerids'][0].to_i
     end
 
-    def create(data)
-      create_array(data)
+    def destroy(data)
+      delete(data)
+    end
+
+    def update(data)
+      result = @client.api_request(:method => "trigger.update", :params => data)
+      result.empty? ? nil : result['triggerids'][0].to_i
+    end
+
+    def create_or_update(data)
+      triggerid = get_id(:description => data[:description], :templateid => data[:templateid])
+      triggerid ? update(data.merge(:triggerid => triggerid)) : create(data)
     end
 
     def get_full_data(data)
-      get_full_data_filter(data)
+      @client.api_request(:method => "trigger.get", :params => {:filter => data, :output => "extend"})
+    end
+
+    def get_id(data)
+      result = get_full_data(data)
+      triggerid = nil
+      result.each { |template| triggerid = template['triggerid'].to_i if template['name'] == data[:name] }
+      triggerid
     end
 
   end

data/lib/zabbixapi/usergroups.rb

@@ -1,22 +1,97 @@
 class ZabbixApi
-  class Usergroups < Basic
+  class Usergroups
 
-    def api_method_name
-      "usergroup"
+    def initialize(client)
+      @client = client
     end
 
-    def api_identify
-      "name"
+    # Create UserGroup
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :name => "UserGroup"
+    # * *Returns* :
+    #   - Nil or Integer
+    def create(data)
+      result = @client.api_request(:method => "usergroup.create", :params => data)
+      result ? result['usrgrpids'][0].to_i : nil
+    end
+
+    # Add UserGroup
+    # Synonym create
+    def add(data)
+      create(data)
     end
 
-    def api_key
-      "usrgrpid"
+    # Delete UserGroup
+    #
+    # * *Args*    :
+    #   - +data+ -> Array with usrgrpids
+    # * *Returns* :
+    #   - Nil or Integer
+    def delete(data)
+      result = @client.api_request(:method => "usergroup.delete", :params => data)
+      result ? result['usrgrpids'][0].to_i : nil
     end
 
+    # Destroy UserGroup
+    # Synonym delete
+    def destroy(data)
+      delete(data)
+    end
+
+    # Get UserGroup info
+    #
+    # * *Args*    :
+    #   - +data+ -> Hash with :name => "UserGroup"
+    # * *Returns* :
+    #   - Nil or Integer
     def get_full_data(data)
-      get_full_data_filter_array(data)
+      @client.api_request(
+        :method => "usergroup.get", 
+        :params => {
+          :filter => [data[:name]],
+          :output => "extend"
+          }
+        )
+    end
+
+    def get(data)
+      get_full_data(data)
+    end
+
+    # Return usrgrpid
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :name => "UserGroup"
+    # * *Returns* :
+    #   - Nil or Integer 
+    def get_id(data)
+      result = get_full_data(data)
+      usrgrpid = nil
+      result.each { |usr| usrgrpid = usr['usrgrpid'].to_i if usr['name'] == data[:name] }
+      usrgrpid
+    end
+
+    # Return usrgrpid
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :name => "UserGroup"
+    # * *Returns* :
+    #   - Integer
+    def get_or_create(data)
+      usrgrpid = get_id(data)
+      if usrgrpid.nil?
+        usrgrpid = create(data)
+      end
+      usrgrpid
     end
 
+    # Set permission for usrgrp on some hostgroup
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :usrgrpids => id, :hostgroupids => [], :permission => 2,3 (read and read write)
+    # * *Returns* :
+    #   - Integer
     def set_perms(data)
       permission = data[:permission] || 2 
       result = @client.api_request(
@@ -29,6 +104,12 @@ class ZabbixApi
       result ? result['usrgrpids'][0].to_i : nil
     end
 
+    # Update usergroup, add user
+    # 
+    # * *Args*    :
+    #   - +data+ -> Hash with :usrgrpids => id, :userids => []
+    # * *Returns* :
+    #   - Integer
     def add_user(data)
       result = @client.api_request(
         :method => "usergroup.massAdd", 

data/lib/zabbixapi/users.rb

@@ -1,20 +1,43 @@
 class ZabbixApi
-  class Users < Basic
+  class Users
 
-    def api_method_name
-      "user"
+    def initialize(client)
+      @client = client
     end
 
-    def api_identify
-      "name"
+    def create(data)
+      result = @client.api_request(:method => "user.create", :params => data)
+      result ? result['userids'][0].to_i : nil
+    end
+
+    def add(data)
+      create(data)
     end
 
     def delete(data)
-      delete_array_sym(data)
+      result = @client.api_request(:method => "user.delete", :params => [:userid => data])
+      result ? result['userids'][0].to_i : nil
     end
 
     def get_full_data(data)
-      get_full_data_filter(data)
+      @client.api_request(
+        :method => "user.get", 
+        :params => {
+          :filter => {
+            :name => data[:name]
+          },
+          :output => "extend"
+          }
+        )
+    end
+
+    def get(data)
+      get_full_data(data)
+    end
+
+    def create_or_update(data)
+      userid = get_id(:name => data[:name])
+      userid ? update(data.merge(:userid => userid)) : create(data)
     end
 
     def add_medias(data)
@@ -28,5 +51,17 @@ class ZabbixApi
       result ? result['userids'][0].to_i : nil
     end
 
+    def get_id(data)
+      result = get_full_data(data)
+      userid = nil
+      result.each { |usr| userid = usr['userid'].to_i if usr['name'] == data[:name] }
+      userid
+    end
+
+    def update(data)
+      result = @client.api_request(:method => "user.update", :params => data)
+      result ? result['userids'][0].to_i : nil
+    end
+
   end
 end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "0.5.0b3"
+  VERSION = "0.5.0b4"
 end

data/spec/localhost.rb

@@ -36,12 +36,11 @@ describe ZabbixApi, "test_api" do
   end
 
   it "HOSTGROUP: Create" do
-    $hostgroup_id_real = zbx.hostgroups.create(:name => hostgroup)
-    $hostgroup_id_real.should be_kind_of(Integer)
+    zbx.hostgroups.create(:name => hostgroup).should be_kind_of(Integer)
   end
 
   it "HOSTGROUP: Find" do
-    zbx.hostgroups.get_id(:name => hostgroup).should equal $hostgroup_id_real
+    zbx.hostgroups.get_id(:name => hostgroup).should be_kind_of(Integer)
   end
 
   it "HOSTGROUP: Find unknown" do
@@ -49,61 +48,59 @@ describe ZabbixApi, "test_api" do
   end
 
   it "HOSTGROUP: Create or get" do
-    zbx.hostgroups.get_or_create(:name => hostgroup).should equal $hostgroup_id_real
+    zbx.hostgroups.get_or_create(:name => hostgroup).should be_kind_of(Integer)
   end
 
   it "HOSTGROUP: Get all" do
-    zbx.hostgroups.all.should include(hostgroup => $hostgroup_id_real.to_s)
+    zbx.hostgroups.all.should be_kind_of(Hash)
   end
 
   it "TEMPLATE: Create" do
-    $template_id_real = zbx.templates.create(
+    zbx.templates.create(
       :host => template,
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    )
-    $template_id_real.should be_kind_of(Integer)
+    ).should be_kind_of(Integer)
   end
 
   it "TEMPLATE: Get get or create" do
     zbx.templates.get_or_create(
       :host => template,
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should equal $template_id_real
+    ).should be_kind_of(Integer)
+  end
+
+  it "TEMPLATE: Check full data" do
+    zbx.templates.get_full_data(:host => template)[0]['host'].should be_kind_of(String)
   end
 
   it "TEMPLATE: Find" do
-    zbx.templates.get_id(:host => template).should equal $template_id_real
+    zbx.templates.get_id(:host => template).should be_kind_of(Integer)
   end
 
   it "TEMPLATE: Find unknown" do
     zbx.templates.get_id(:host => "#{template}_____").should be_kind_of(NilClass)
   end
 
-  it "TEMPLATE: Get all" do
-    zbx.templates.all.should include(template => $template_id_real.to_s)
-  end
-
   it "APPLICATION: Create" do
-    $application_id_real = zbx.applications.create(
+    zbx.applications.create(
       :name => application,
       :hostid => zbx.templates.get_id(:host => template)
     )
-    $application_id_real.should be_kind_of(Integer)
-  end
-
-  it "APPLICATION: Get all" do
-    zbx.applications.all.should include(application => $application_id_real.to_s)
   end
 
   it "APPLICATION: Get or create" do
     zbx.applications.get_or_create(
       :name => application,
       :hostid => zbx.templates.get_id(:host => template)
-    ).should equal $application_id_real
+    )
+  end
+
+  it "APPLICATION: Full info check" do
+    zbx.applications.get_full_data(:name => application)[0]['applicationid'].should be_kind_of(String)
   end
 
   it "APPLICATION: Find" do
-    zbx.applications.get_id(:name => application).should equal $application_id_real
+    zbx.applications.get_id(:name => application).should be_kind_of(Integer)
   end
 
   it "APPLICATION: Find unknown" do
@@ -111,28 +108,27 @@ describe ZabbixApi, "test_api" do
   end
 
   it "ITEM: Create" do
-    $item_id_real = zbx.items.create(
+    zbx.items.create(
       :description => item,
       :key_ => "proc.num[aaa]",
       :hostid => zbx.templates.get_id(:host => template),
       :applications => [zbx.applications.get_id(:name => application)]
-    )
-    $item_id_real.should be_kind_of(Integer)
+    ).should be_kind_of(Integer)
   end
 
-  it "ITEM: Find" do
-    zbx.items.get_id(:description => item).should equal $item_id_real
+  it "ITEM: Full info check" do
+    zbx.items.get_full_data(:description => item)[0]['itemid'].should be_kind_of(String)
   end
 
-  it "ITEM: Get all" do
-    zbx.items.all.should include(item => $item_id_real.to_s)
+  it "ITEM: Find" do
+    zbx.items.get_id(:description => item).should be_kind_of(Integer)
   end
 
   it "ITEM: Update" do
     zbx.items.update(
       :itemid => zbx.items.get_id(:description => item),
       :status => 0
-    ).should equal $item_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "ITEM: Create or update" do
@@ -142,20 +138,19 @@ describe ZabbixApi, "test_api" do
       :type => 6,
       :hostid => zbx.templates.get_id(:host => template),
       :applications => [zbx.applications.get_id(:name => application)]
-    ).should equal $item_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "ITEM: Get unknown" do
-    zbx.items.get_id(:description => "#{item}_____").should be_kind_of(NilClass)
+    zbx.items.get_id(:description => "#{item}_____")
   end
 
   it "HOST: Create" do
-    $host_id_real = zbx.hosts.create(
+    zbx.hosts.create(
       :host => host,
       :ip => "10.20.48.88",
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    )
-    $host_id_real.should be_kind_of(Integer)
+    ).should be_kind_of(Integer)
   end
 
   it "HOST: Update or create" do
@@ -163,7 +158,7 @@ describe ZabbixApi, "test_api" do
       :host => host,
       :ip => "10.20.48.89",
       :groups => [:groupid => zbx.hostgroups.get_id(:name => hostgroup)]
-    ).should equal $host_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "HOST: Find unknown" do
@@ -171,18 +166,20 @@ describe ZabbixApi, "test_api" do
   end
 
   it "HOST: Find" do
-    zbx.hosts.get_id(:host => host).should equal $host_id_real
+    zbx.hosts.get_id(:host => host).should be_kind_of(Integer)
   end
 
   it "HOST: Update" do
     zbx.hosts.update(
       :hostid => zbx.hosts.get_id(:host => host),
       :status => 0
-    ).should equal $host_id_real
+    )
   end
 
-  it "HOST: Get all" do
-    zbx.hosts.all.should include(host => $host_id_real.to_s)
+  it "TEMPLATE: Get all templates linked with host" do
+    zbx.templates.get_ids_by_host(
+      :hostids => [zbx.hosts.get_id(:host => host)]
+    ).should be_kind_of(Array)
   end
 
   it "TEMPLATE: Linked hosts with templates" do
@@ -199,18 +196,12 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(TrueClass)
   end
 
-  it "TEMPLATE: Get all templates linked with host" do
-    zbx.templates.get_ids_by_host(
-      :hostids => [zbx.hosts.get_id(:host => host)]
-    ).should include($template_id_real.to_s)
-  end
-
   it "TEMPLATE: Get all" do 
-    zbx.templates.all.should include(template => $template_id_real.to_s)
+    zbx.templates.all.should be_kind_of(Hash)
   end
 
   it "TRIGGER: Create" do
-    $trigger_id_real = zbx.triggers.create(
+    zbx.triggers.create(
       :description => trigger,
       :expression => "{#{template}:proc.num[aaa].last(0)}<1",
       :comments => "Bla-bla is faulty (disaster)",
@@ -218,22 +209,13 @@ describe ZabbixApi, "test_api" do
       :status     => 0,
       :templateid => 0,
       :type => 0
-    )
-    $trigger_id_real.should be_kind_of(Integer)
+    ).should be_kind_of(Integer)
   end
 
   it "TRIGGER: Find" do
     zbx.triggers.get_id(:description => trigger).should be_kind_of(Integer)
   end
 
-  it "TRIGGER: Find unknown" do
-    zbx.triggers.get_id(:description => "#{trigger}____").should be_kind_of(NilClass)
-  end
-
-  it "TRIGGER: Get all" do
-    zbx.triggers.all.should be_kind_of(Hash)
-  end
-
   it "GRAPH: Create" do 
     gitems = {
         :itemid => zbx.items.get_id(:description => item), 
@@ -241,14 +223,13 @@ describe ZabbixApi, "test_api" do
         :type => "0",
         :periods_cnt => "5"
     }
-    $graph_id_real = zbx.graphs.create(
+    zbx.graphs.create(
       :gitems => [gitems],
       :show_triggers => "0",
       :name => graph,
       :width => "900",
       :height => "200"
-    )
-    $graph_id_real.should be_kind_of(Integer)
+    ).should be_kind_of(Integer)
   end
 
   it "GRAPH: Create or get" do 
@@ -264,25 +245,21 @@ describe ZabbixApi, "test_api" do
       :name => graph,
       :width => "900",
       :height => "200"
-    ).should equal $graph_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "GRAPH: Find gititems" do
-    zbx.graphs.get_items( zbx.graphs.get_id(:name => graph) ).should be_kind_of(Array)
+    zbx.graphs.get_items( zbx.graphs.get_id(:name => graph) )
   end
 
   it "GRAPH: Find" do
-    zbx.graphs.get_id( :name => graph ).should equal $graph_id_real
+    zbx.graphs.get_id( :name => graph ).should be_kind_of(Integer)
   end
 
   it "GRAPH: get_ids_by_host" do
     zbx.graphs.get_ids_by_host( :host => host ).should be_kind_of(Array)
   end
 
-  it "GRAPH: Get all" do
-    zbx.graphs.all.should include(graph => $graph_id_real.to_s)
-  end
-
   it "GRAPH: Update" do
     zbx.graphs.update(
       :graphid => zbx.graphs.get_id(
@@ -290,7 +267,7 @@ describe ZabbixApi, "test_api" do
         :hostid => zbx.hosts.get_id(:host => host)
       ), 
       :ymax_type => 1
-    ).should equal $graph_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "GRAPH: Create or Update" do
@@ -306,15 +283,14 @@ describe ZabbixApi, "test_api" do
     :name => graph,
     :width => "900",
     :height => "200"
-  ).should equal $graph_id_real
+  ).should be_kind_of(Integer)
   end
 
   it "SCREEN: Get or create for host" do
-    $screen_id_real = zbx.screens.get_or_create_for_host(
+    zbx.screens.get_or_create_for_host(
       :host => host,
       :graphids => zbx.graphs.get_ids_by_host(:host => host)
-    )
-    $screen_id_real.should be_kind_of(Integer)
+    ).should be_kind_of(Integer)
   end
 
   it "TEMPLATE: Unlink hosts from templates" do
@@ -324,14 +300,10 @@ describe ZabbixApi, "test_api" do
     ).should be_kind_of(TrueClass)
   end
 
-  it "SCREEN: Get all" do
-    zbx.screens.all.should be_kind_of(Hash)
-  end
-
   it "SCREEN: Delete" do
     zbx.screens.delete(
       [zbx.screens.get_id(:name => "#{host}_graphs")]
-    ).should equal $screen_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "GRAPH: Delete" do
@@ -343,37 +315,36 @@ describe ZabbixApi, "test_api" do
   end
 
   it "HOST: Delete" do
-    zbx.hosts.delete( zbx.hosts.get_id(:host => host) ).should equal $host_id_real
+    zbx.hosts.delete( zbx.hosts.get_id(:host => host) ).should be_kind_of(Integer)
   end
 
   it "ITEM: Delete" do
     zbx.items.delete(
       zbx.items.get_id(:description => item)
-    ).should equal $item_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "APPLICATION: Delete" do
-    zbx.applications.delete( zbx.applications.get_id(:name => application) ).should equal $application_id_real
+    zbx.applications.delete( zbx.applications.get_id(:name => application) )
   end
 
   it "TEMPLATE: Delete" do
-    zbx.templates.delete(zbx.templates.get_id(:host => template)).should equal $template_id_real
+    zbx.templates.delete(zbx.templates.get_id(:host => template))
   end
 
   it "HOSTGROUP: Delete" do
     zbx.hostgroups.delete(
       zbx.hostgroups.get_id(:name => hostgroup)
-    ).should equal $hostgroup_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "USER: Create" do
-    $user_id_real = zbx.users.create(
+    zbx.users.create(
       :alias => "Test #{user}",
       :name => user,
       :surname => user,
       :passwd => user
-    )
-    $user_id_real.should be_kind_of(Integer)
+    ).should be_kind_of(Integer)
   end
 
   it "USER: Create or update" do
@@ -382,31 +353,34 @@ describe ZabbixApi, "test_api" do
       :name => user,
       :surname => user,
       :passwd => user
-    ).should equal $user_id_real
+    ).should be_kind_of(Integer)
+  end
+
+  it "USER: Find" do
+    zbx.users.get_full_data(:name => user)[0]['name'].should be_kind_of(String)
   end
 
   it "USER: Update" do
-    zbx.users.update(:userid => zbx.users.get_id(:name => user), :name => user2).should equal $user_id_real
+    zbx.users.update(:userid => zbx.users.get_id(:name => user), :name => user2).should be_kind_of(Integer)
   end
 
   it "USER: Find unknown" do
-    zbx.users.get_id(:name => "#{user}_____").should be_kind_of(NilClass)
+    zbx.users.get_id(:name => "#{user}_____")
   end
 
   it "USERGROUPS: Create" do
-    $usergrp_id_real = zbx.usergroups.create(:name => usergroup)
-    $usergrp_id_real.should be_kind_of(Integer)
+    zbx.usergroups.create(:name => usergroup).should be_kind_of(Integer)
   end
 
   it "USERGROUPS: Create or update" do
-    zbx.usergroups.get_or_create(:name => usergroup).should equal $usergrp_id_real
+    zbx.usergroups.get_or_create(:name => usergroup).should be_kind_of(Integer)
   end
 
   it "USERGROUPS: Add user" do
     zbx.usergroups.add_user(
         :usrgrpids => [zbx.usergroups.get_id(:name => usergroup)],
         :userids => [zbx.users.get_id(:name => user2)]
-    ).should equal $usergrp_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "USERGROUPS: Set UserGroup read & write perm" do
@@ -414,24 +388,23 @@ describe ZabbixApi, "test_api" do
       :usrgrpid => zbx.usergroups.get_or_create(:name => usergroup).to_s,
       :hostgroupids => zbx.hostgroups.all.values,
       :permission => 3
-    ).should equal $usergrp_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "MEDIATYPE: Create" do
-    $meditype_id_real = zbx.mediatypes.create(
+    zbx.mediatypes.create(
       :description => mediatype,
       :type => 0,
       :smtp_server => "127.0.0.1",
       :smtp_email => "zabbix@test.com"
-    )
-    $meditype_id_real.should be_kind_of(Integer)
+    ).should be_kind_of(Integer)
   end
 
   it "MEDIATYPE: Update or create" do
     zbx.mediatypes.create_or_update(
       :description => mediatype,
       :smtp_email => "zabbix2@test.com"
-    ).should equal $meditype_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "USER: Add mediatype" do
@@ -446,21 +419,21 @@ describe ZabbixApi, "test_api" do
           :severity => "56"
         }
       ]
-    ).should equal $user_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "MEDIATYPE: Delete" do
     zbx.mediatypes.delete(
       zbx.mediatypes.get_id(:description => mediatype)
-    ).should equal $meditype_id_real
+    ).should be_kind_of(Integer)
   end
 
   it "USER: Delete" do
-    zbx.users.delete(zbx.users.get_id(:name => user2)).should equal $user_id_real
+    zbx.users.delete(zbx.users.get_id(:name => user2)).should be_kind_of(Integer)
   end
 
   it "USERGROUPS: Delete" do
-    zbx.usergroups.delete([zbx.usergroups.get_id(:name => usergroup)]).should equal $usergrp_id_real
+    zbx.usergroups.delete([zbx.usergroups.get_id(:name => usergroup)]).should be_kind_of(Integer)
   end
 
   it "QUERY" do