iteh-zabbixapi 0.2.2 → 0.2.3

data/lib/zabbixapi/group.rb

@@ -1,5 +1,4 @@
 module Zabbix
-
   class ZabbixApi
     def get_group_id(pattern)
 
@@ -13,25 +12,12 @@ module Zabbix
       }
 
       response = send_request(message)
-
-      if not ( response.empty? ) then
-        result = response[0]['groupid']
-      else
-        result = nil
-      end
-
-      return result
+      response.empty? ? nil : response[0]['groupid']
     end
 
     def group_exist?(pattern)
-
       group_id = get_groups_id(pattern)
-
-      if ( group_id ) then
-        return true
-      else
-        return false
-      end
+      group_id ? true : false
     end
 
     def add_group(groupname)
@@ -44,14 +30,7 @@ module Zabbix
       }
 
       response = send_request(message)
-
-      if ( response ) then
-        result = response['groupids']
-      else
-        result = nil
-      end
-
-      return result
+      response ? response['groupids'] : nil
     end
 
     def add_host_to_group(host_id, group_id)
@@ -66,13 +45,7 @@ module Zabbix
 
       response = send_request(message)
 
-      if not ( response.empty? ) then
-        result = true
-      else
-        result = false
-      end
-      
-      return result
+      response.empty? ? false : true
     end
   end
 end

data/lib/zabbixapi/host.rb

@@ -12,6 +12,7 @@ module Zabbix
         'ip' => '0.0.0.0',
         'proxy_hostid' => 0,
         'groups' => [],
+        'templates' => [],
         'useipmi' => 0,
         'ipmi_ip' => '',
         'ipmi_port' => 623,
@@ -22,6 +23,7 @@ module Zabbix
       }
 
       host_options['groups'].map! { |group_id| {'groupid' => group_id} }
+      host_options['templates'].map! { |template_id| {'templateid' => template_id} }
 
       host = merge_opt(host_default, host_options)
 

data/lib/zabbixapi/template.rb

@@ -89,15 +89,7 @@ module Zabbix
       }
 
       response = send_request(message)
-
-      unless response.empty? then
-        result = response.keys[0]
-      else
-        result = nil
-      end
-
-      return result
-
+      (response.is_a?(Array) && response.first.is_a?(Hash)) ? response.first["templateid"] : nil
     end
 
     def link_templates_with_hosts(templates_id, hosts_id)

data/lib/zabbixapi/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 
 module Zabbix
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/spec/zabbixapi_spec.rb

@@ -92,6 +92,65 @@ describe Zabbix::ZabbixApi do
       host.should be_nil
     end
 
+    it "should add a host with groups and templates" do
+      FakeWeb.allow_net_connect = true
+
+      new_host = {
+        "host" => "new host",
+        "ip" => "10.10.10.10",
+        "port" => "10055",
+        "useip" => 1,
+        "dns" => "myhost.com",
+        "groups" => [2],
+        "templates" => [10001]
+      }
+      zbx = Zabbix::ZabbixApi.new(@api_url, @api_login, @api_password)
+
+      new_host_id = zbx.add_host(new_host)
+      new_host_id.should_not be_nil
+
+      created_host = zbx.get_host({"templated_hosts" => 1, "output" => "extend", "filter" => {"dns" => new_host["dns"]}})
+      ap created_host
+    end
+
+  end
+
+  context 'get template' do
+    it "should get a template" do
+      FakeWeb.allow_net_connect = true
+
+      zbx = Zabbix::ZabbixApi.new(@api_url, @api_login, @api_password)
+      template_id = zbx.get_template_id("Template_Linux")
+      template_id.should eq("10001")
+    end
+
+    it "should return nil for no template found" do
+      FakeWeb.allow_net_connect = true
+
+      zbx = Zabbix::ZabbixApi.new(@api_url, @api_login, @api_password)
+      template_id = zbx.get_template_id("not there")
+      template_id.should be_nil
+    end
+
+  end
+
+  context 'get group' do
+    it "should get a group" do
+      FakeWeb.allow_net_connect = true
+
+      zbx = Zabbix::ZabbixApi.new(@api_url, @api_login, @api_password)
+      group_id = zbx.get_group_id("Linux servers")
+      group_id.should eq("2")
+    end
+
+    it "should return nil for no group found" do
+      FakeWeb.allow_net_connect = true
+
+      zbx = Zabbix::ZabbixApi.new(@api_url, @api_login, @api_password)
+      group_id = zbx.get_group_id("not there")
+      group_id.should be_nil
+    end
+
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: iteh-zabbixapi
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - Eduard Snesarev
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-24 00:00:00 +02:00
+date: 2011-06-25 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency