zabbixapi 2.2.2 → 2.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1af8e059d91bcd50ee36f944393de794e0072d2
-  data.tar.gz: 3975f68a19eff6923a223943bd8d3511e6c4e088
+  metadata.gz: bd481b02c9223088ad234cbca2b81d51bcc5916b
+  data.tar.gz: 32641a4d6a3f436ae4fb521f78f6e55c10b159dd
 SHA512:
-  metadata.gz: 10ffe07da786c3a7cbc6b33fdd4d1c397d5b2ce8115cbacfe26d5c1136b4ade6d1cfb70e5a63558195b998d0aae8ed3c70ff20c946b01947eb4c42f93543a95a
-  data.tar.gz: c19d6d4e47b3c500dfe5e87a9dc40bd6d35570608663817a28944cf72323babda2b0f7b03f569976c2a838d9265542da775dd5a2ff9422751db06b05cafd54d9
+  metadata.gz: 827a84f1bf076a63c25ef9c17d082e4e7d56290015023a7cfbf6e5e8efaacea67d88a35670079e59f77618eef59f371dbe6917f7238a8cbdcf6c16168e76c130
+  data.tar.gz: fa4c337f755a659da65cabca1bc598c063edc3fc25e63a4c021af04ce1e33497d38429fe00094c7a3e802d8f2779cd5b5b03c345dadb058e5de4d674a68a5fe3

data/lib/zabbixapi.rb

@@ -23,6 +23,7 @@ require "zabbixapi/classes/usergroups"
 require "zabbixapi/classes/usermacros"
 require "zabbixapi/classes/users"
 require "zabbixapi/classes/configurations"
+require "zabbixapi/classes/hostinterfaces"
 
 class ZabbixApi
 
@@ -107,5 +108,8 @@ class ZabbixApi
     @configurations ||= Configurations.new(@client)
   end
 
+  def hostinterfaces
+    @hostinterfaces ||= Hostinterfaces.new(@client)
+  end
 end
 

data/lib/zabbixapi/basic/basic_logic.rb

@@ -46,22 +46,25 @@ class ZabbixApi
     end
 
     def get_full_data(data)
-      log "[DEBUG] Call get_full_data with parametrs: #{data.inspect}"
+      log "[DEBUG] Call get_full_data with parametrs: #{data.inspect} and params #{data[:params]}"
 
-      @client.api_request(
+      data[:params] ||= {}
+      res = @client.api_request(
         :method => "#{method_name}.get",
         :params => {
           :filter => {
             indentify.to_sym => data[indentify.to_sym]
           },
           :output => "extend"
-        }
+        }.merge(data[:params])
       )
+      res
     end
 
     def dump_by_id(data)
-      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect}"
+      log "[DEBUG] Call dump_by_id with parametrs: #{data.inspect} and params #{data[:params]}"
 
+      data[:params] ||= {}
       @client.api_request(
         :method => "#{method_name}.get",
         :params => {
@@ -69,7 +72,7 @@ class ZabbixApi
             key.to_sym => data[key.to_sym]
           },
           :output => "extend"
-        }
+        }.merge(data[:params])
       )
     end
 

data/lib/zabbixapi/classes/hostinterfaces.rb

@@ -0,0 +1,19 @@
+class ZabbixApi
+  class Hostinterfaces < Basic
+    def array_flag
+      true
+    end
+
+    def method_name
+      "hostinterface"
+    end
+
+    def indentify
+      "hostid"
+    end
+
+    def key
+      "interfaceid"
+    end
+  end
+end

data/lib/zabbixapi/version.rb

@@ -1,3 +1,3 @@
 class ZabbixApi
-  VERSION = "2.2.2"
+  VERSION = "2.2.3"
 end

data/spec/host.rb

@@ -36,15 +36,15 @@ describe 'host' do
         @hostgroupid2 = zbx.hostgroups.create(:name => gen_name('hostgroup'))
         host = gen_name('host')
         hostid = zbx.hosts.create(
-          host: host,
-          interfaces: [{ type: 1, main: 1, ip: '192.168.0.1', dns: 'server.example.org', port: 10050, useip: 0 }],
-          groups: [
-            {groupid: @hostgroupid},
-            {groupid: @hostgroupid2}
+          :host => host,
+          :interfaces => [{ :type => 1, :main => 1, :ip => '192.168.0.1', :dns => 'server.example.org', :port => 10050, :useip => 0 }],
+          :groups => [
+            {:groupid => @hostgroupid},
+            {:groupid => @hostgroupid2}
           ])
 
         expect(hostid).to be_kind_of Integer
-        host = zbx.query(method: 'host.get', params: { hostids: [hostid], selectGroups: 'extend' }).first
+        host = zbx.query(:method => 'host.get', :params => { :hostids => [hostid], :selectGroups => 'extend' }).first
 
         expect(host['hostid'].to_i).to eq hostid
         expect(host['groups'].size).to eq 2
@@ -90,6 +90,11 @@ describe 'host' do
       it "should contains created host" do
         expect(zbx.hosts.get_full_data(:host => @host)[0]).to include("host" => @host)
       end
+
+      it "shoulld dump interfaces" do
+        expect(zbx.hosts.get_full_data(:host => @host, :params => {:selectInterfaces => "extend"})[0]["interfaces"][0]).to include("type" => "1")
+        expect(zbx.hosts.get_full_data(:host => @host, :params => {:selectInterfaces => "extend"})[0]["interfaces"][0]).to include("ip" => "10.20.48.88")
+      end
     end
 
     describe 'get_id' do

data/spec/hostinterface.rb

@@ -0,0 +1,79 @@
+#encoding: utf-8
+
+require 'spec_helper'
+
+describe "hostinterface" do
+  before :all do
+    @hostgroup = gen_name 'hostgroup'
+    @hostgroupid = zbx.hostgroups.create(:name => @hostgroup)
+  end
+
+  context 'when interface not exists' do
+    before do
+      @host = gen_name 'host'
+    end
+
+    describe 'create' do
+      it 'should return integer id' do
+        @hostid = zbx.hosts.create(:host => @host,
+                                   :interfaces => [
+                                       {
+                                           :type => 1,
+                                           :main => 1,
+                                           :ip => "10.20.48.88",
+                                           :dns => "",
+                                           :port => 10050,
+                                           :useip => 1
+                                       }
+                                   ],
+                                   :groups => [:groupid => @hostgroupid]
+        )
+        interfaceid = zbx.hostinterfaces.create(
+            :hostid => @hostid,
+            :dns => "",
+            :ip => "1.1.1.1",
+            :main => 0,
+            :port => '10050',
+            :type => 1,
+            :useip => 1
+        )
+        interfaceid.should be_kind_of(Integer)
+      end
+
+      describe 'get_id' do
+        it "should return nil" do
+          random_id = gen_name('')
+          expect(zbx.hosts.get_id(:hostids => [random_id])).to be_kind_of(NilClass)
+        end
+      end
+    end
+  end
+
+  context 'when interface exists' do
+    before :all do
+      @host = gen_name 'host'
+      @hostid = zbx.hosts.create(
+          :host => @host,
+          :interfaces => [
+              {
+                  :type => 1,
+                  :main => 1,
+                  :ip => "10.20.48.88",
+                  :dns => "",
+                  :port => 10050,
+                  :useip => 1
+              }
+          ],
+          :groups => [:groupid => @hostgroupid]
+      )
+      @interfaceid = zbx.hostinterfaces.create(:hostid => @hostid, :type => 1, :main => 0, :ip => "10.20.48.88", :dns => "", :port => 10050, :useip => 1)
+    end
+
+    describe 'get_full_data' do
+      it "should contains created host" do
+        expect(zbx.hostinterfaces.get_full_data(:hostid => "#{@hostid}")[0]).to include("hostid" => "#{@hostid}")
+      end
+    end
+
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zabbixapi
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.2.3
 platform: ruby
 authors:
 - Vasiliev D.V.
@@ -9,26 +9,26 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2016-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.0
 description: Allows you to work with zabbix api from ruby.
@@ -39,9 +39,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
@@ -56,6 +56,7 @@ files:
 - lib/zabbixapi/classes/errors.rb
 - lib/zabbixapi/classes/graphs.rb
 - lib/zabbixapi/classes/hostgroups.rb
+- lib/zabbixapi/classes/hostinterfaces.rb
 - lib/zabbixapi/classes/hosts.rb
 - lib/zabbixapi/classes/items.rb
 - lib/zabbixapi/classes/mediatypes.rb
@@ -76,6 +77,7 @@ files:
 - spec/graph.rb
 - spec/host.rb
 - spec/hostgroup.rb
+- spec/hostinterface.rb
 - spec/item.rb
 - spec/mediatype.rb
 - spec/query.rb
@@ -97,17 +99,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: zabbixapi
-rubygems_version: 2.2.2
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Realization for Zabbix API.
@@ -118,6 +120,7 @@ test_files:
 - spec/graph.rb
 - spec/host.rb
 - spec/hostgroup.rb
+- spec/hostinterface.rb
 - spec/item.rb
 - spec/mediatype.rb
 - spec/query.rb