zenoss_client 0.0.2 → 0.0.3

data/README.rdoc

@@ -26,6 +26,10 @@ string unless you apply this patch:
 
 http://gist.github.com/328414
 
+This has been reported and is filed as a product defect:
+
+http://dev.zenoss.com/trac/ticket/6282
+
 
 == TO USE:
 A gem is now available.  'gem install zenoss_client'

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/lib/model/{device.rb → devices/device.rb}

@@ -1,27 +1,28 @@
 #############################################################################
-# Copyright © 2009 Dan Wanek <dwanek@nd.gov>
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
 #
 #
-# This file is part of Zenoss-RubyREST.
+# This file is part of zenoss_client.
 # 
-# Zenoss-RubyREST is free software: you can redistribute it and/or
+# zenoss_client is free software: you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or (at
 # your option) any later version.
 # 
-# Zenoss-RubyREST is distributed in the hope that it will be useful,
+# zenoss_client is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 # Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with Zenoss-RubyREST.  If not, see <http://www.gnu.org/licenses/>.
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
 #############################################################################
 module Zenoss
   module Model
     class Device
       include Zenoss::Model
       include Zenoss::Model::EventView
+      include Zenoss::Model::DeviceResultInt
 
       attr_reader :path, :device, :os, :hw
 
@@ -33,10 +34,20 @@ module Zenoss
 
         @os = OperatingSystem.new(self)
         @hw = DeviceHW.new(self)
+
+        # Initialize common things from Model
+        model_init
       end
 
       # ------------------ REST Calls ------------------ #
 
+      # Move this Device to the given DeviceClass.
+      def change_device_class(device_class)
+        reset_cache_vars
+        rest("changeDeviceClass?deviceClassPath=#{device_class.organizer_name}")
+      end
+
+
       # Instead of calling the /getId REST method, this method simply returns
       # the @device value since it is the same anyway.
       def get_id()

data/lib/model/{device_class.rb → devices/device_class.rb}

@@ -1,21 +1,21 @@
 #############################################################################
-# Copyright © 2009 Dan Wanek <dwanek@nd.gov>
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
 #
 #
-# This file is part of Zenoss-RubyREST.
+# This file is part of zenoss_client.
 # 
-# Zenoss-RubyREST is free software: you can redistribute it and/or
+# zenoss_client is free software: you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or (at
 # your option) any later version.
 # 
-# Zenoss-RubyREST is distributed in the hope that it will be useful,
+# zenoss_client is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 # Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with Zenoss-RubyREST.  If not, see <http://www.gnu.org/licenses/>.
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
 #############################################################################
 module Zenoss
   module Model
@@ -32,10 +32,27 @@ module Zenoss
         # Like, '/zport/dmd/Devices/Server/Linux'
         # or, '/Devices/Server/Linux'
         # or, '/Server/Linux'
-        path = devclass.sub(/^(\/zport\/dmd\/)?(@base_id\/)?([^\/]+)\/?$/,'\2')
+        path = devclass.sub(/^(\/zport\/dmd\/)?(#{@base_id}\/)?([^\/]+)\/?$/,'\2')
         @organizer_name = rest('getOrganizerName', "#{@base_id}/#{path}")
       end
 
+      # ------------------------- Utility Methods ------------------------- #
+      # These are methods that do not exist as part of the official Zenoss
+      # API, but from an object model they seem to make sense to me.
+      # ------------------------------------------------------------------- #
+
+      # Add a device beneath this Device Class.  It is also typically best
+      # to use the fully qualified version of the device name.
+      # It returns true if the device is added, false otherwise.
+      def add_device(fully_qualified_device)
+        loader = ZDeviceLoader.instance
+        loader.load_device(fully_qualified_device, @organizer_name)
+      end
+
+
+
+      # --------------------------- REST Methods -------------------------- #
+
       # Name of the device in Zenoss.  This method will return the first
       # match if the device_name is not fully qualified.
       def find_device_path(device_name)
@@ -48,7 +65,7 @@ module Zenoss
       end
 
 
-      protected
+      private
 
       def rest(method, path = "#{@base_id}#{@organizer_name}")
         super("#{path}/#{method}")

data/lib/model/devices.rb

@@ -0,0 +1,53 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+
+# This file contains helper modules for minor classes that have to deal
+# with Devices and DeviceClasses.
+
+module Zenoss
+  module Model
+
+    module DeviceResultInt
+
+      # Return the path of the device_class; everything after '/zport/dmd/Devices'
+      def get_device_class_name
+        @cache_vars[:device_class_name] ||= rest('getDeviceClassName')
+      end
+
+      # Return the path of the device_class; everything after '/zport/dmd/Devices'
+      def get_device_class_path
+        get_device_class_name
+      end
+
+      # Return the DeviceClass object of this object
+      def device_class
+        @cache_vars[:device_class] ||= DeviceClass.new(get_device_class_name)
+      end
+    end # DeviceResultInt
+
+  end # Model
+end # Zenoss
+
+
+# Load the main Device related files
+require 'model/devices/device_class'
+require 'model/devices/device'
+require 'model/devices/device_hw'
+require 'model/devices/operating_system'

data/lib/model/events/event_class.rb

@@ -0,0 +1,19 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################

data/lib/model/manufacturers/manufacturers.rb

@@ -0,0 +1,19 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################

data/lib/model/model.rb

@@ -1,21 +1,21 @@
 #############################################################################
-# Copyright © 2009 Dan Wanek <dwanek@nd.gov>
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
 #
 #
-# This file is part of Zenoss-RubyREST.
+# This file is part of zenoss_client.
 # 
-# Zenoss-RubyREST is free software: you can redistribute it and/or
+# zenoss_client is free software: you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or (at
 # your option) any later version.
 # 
-# Zenoss-RubyREST is distributed in the hope that it will be useful,
+# zenoss_client is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 # Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with Zenoss-RubyREST.  If not, see <http://www.gnu.org/licenses/>.
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
 #############################################################################
 require 'uri'
 require 'net/http'
@@ -24,21 +24,39 @@ module Zenoss
   module Model
     include Zenoss
 
+    # Common initialization for all Model components
+    def model_init
 
-    # -------- Methods from DeviceResultInt.DeviceResultInt -------- #
+      # A place to maintain cached vars to prevent unnecessary REST calls
+      @cache_vars = {}
+    end
+
+    
+    private
 
-    def get_device_class_name
-      rest('getDeviceClassName')
+    # Reset the cache variables so the REST calls return the appropriate
+    # values after a change has taken place.
+    def reset_cache_vars
+      @cache_vars.each_key do |key|
+        @cache_vars[key] = nil
+      end
     end
 
   end # Model
 end # Zenoss
 
-# Modules
 require 'model/event_view'
 
-# Classes
-require 'model/device'
-require 'model/device_class'
-require 'model/device_hw'
-require 'model/operating_system'
+# Device Loader interface.  You can use it directly or use the
+# utility methods in DeviceClass to create devices beneath
+# that class
+require 'model/z_device_loader'
+
+# Device Related ( /zport/dmd/Devices )
+require 'model/devices'
+
+# Service Related ( /zport/dmd/Services )
+require 'model/services'
+
+# Systems Related ( /zport/dmd/Systems )
+require 'model/systems'

data/lib/model/processes/os_process_organizer.rb

@@ -0,0 +1,19 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################

data/lib/model/services/ip_service.rb

@@ -0,0 +1,19 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################

data/lib/model/services/service.rb

@@ -0,0 +1,19 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################

data/lib/model/services/service_class.rb

@@ -0,0 +1,19 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################

data/lib/model/services/service_organizer.rb

@@ -0,0 +1,44 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+module Zenoss
+  module Model
+    class ServiceOrganizer
+      include Zenoss
+      include Zenoss::Model
+
+      attr_reader :organizer_name
+
+      def initialize(service_organizer)
+        @base_id = 'Services'
+
+        path = service_organizer.sub(/^(\/zport\/dmd\/)?(@base_id\/)?([^\/]+)\/?$/,'\2')
+        @organizer_name = rest('getOrganizerName', "#{@base_id}/#{path}")
+      end
+
+
+      protected
+
+      def rest(method, path = "#{@base_id}#{@organizer_name}")
+        super("#{path}/#{method}")
+      end
+
+    end # ServiceOrganizer
+  end # Model
+end # Zenoss

data/lib/model/services/win_service.rb

@@ -0,0 +1,19 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################

data/lib/model/services.rb

@@ -0,0 +1,24 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+require 'model/services/service_organizer'
+require 'model/services/service_class'
+require 'model/services/service'
+require 'model/services/ip_service'
+require 'model/services/win_service'

data/lib/model/systems/system.rb

@@ -0,0 +1,83 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+module Zenoss
+  module Model
+    class System
+      include Zenoss
+      include Zenoss::Model
+
+      attr_reader :organizer_name
+
+      def initialize(devclass)
+        @base_id = 'Systems'
+
+        # This confusing little ditty lets us accept a System in a number of ways:
+        # Like, '/zport/dmd/Systems/MyService'
+        # or, '/Systems/MyService'
+        # or, '/MyService'
+        path = devclass.sub(/^(\/zport\/dmd\/)?(#{@base_id}\/)?([\w\/]+)\/?$/,'\3')
+
+        @id = path.split('/').last
+        @organizer_name = rest('getOrganizerName', "#{@base_id}/#{path}")
+      end
+
+
+      # ------------------------- Utility Methods ------------------------- #
+      # These are methods that do not exist as part of the official Zenoss
+      # API, but from an object model they seem to make sense to me.
+      # ------------------------------------------------------------------- #
+
+      # Add a device beneath this Device Class.  It is also typically best
+      # to use the fully qualified version of the device name.
+      # It returns true if the device is added, false otherwise.
+      def add_subsystem(sys_name)
+        loader = ZDeviceLoader.instance
+        loader.add_system("#{@organizer_name}/#{sys_name}")
+      end
+
+      # TODO:  Need to add some error checking.  For now we are just returning true
+      def delete_subsystem(sys_name)
+        rest("manage_deleteOrganizer?orgname=#{sys_name}")
+        true
+      end
+
+      # Delete this System
+      def delete!
+        Zenoss.systems.delete_subsystem(@organizer_name)
+      end
+
+
+      # --------------------------- REST Methods -------------------------- #
+
+      # Instead of calling the /getId REST method, this method simply returns
+      # the @id value since it is the same anyway.
+      def get_id
+        @id
+      end
+
+      private
+
+      def rest(method, path = "#{@base_id}#{@organizer_name}")
+        super("#{path}/#{method}")
+      end
+
+    end # System
+  end # Model
+end # Zenoss

data/lib/model/systems.rb

@@ -0,0 +1,20 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+require 'model/systems/system'

data/lib/model/z_device_loader.rb

@@ -0,0 +1,65 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+require 'singleton'
+module Zenoss
+  module Model
+    class ZDeviceLoader
+      include Model
+      include Singleton
+
+      def initialize
+        @path = "DeviceLoader"
+      end
+      
+
+      # Load a device into the database connecting its major relations and collecting its configuration.
+      # loadDevice(self, deviceName, devicePath="/Discovered", tag="", serialNumber="", zSnmpCommunity="",
+      # zSnmpPort=161, zSnmpVer=None, rackSlot=0, productionState=1000, comments="", hwManufacturer="",
+      # hwProductName="", osManufacturer="", osProductName="", locationPath="", groupPaths=[], systemPaths=[],
+      # performanceMonitor="localhost", discoverProto="snmp", priority=3, REQUEST=None)
+      #
+      # TODO: Enhance this functionality
+      # Return: true if the device is added, false if it is not
+      def load_device(device_name, device_path)
+        method = "loadDevice?deviceName=#{device_name}&devicePath=#{device_path}"
+        body = rest(method)
+        (body =~ /Navigate to device/) ? true : false
+      end
+      
+      #add a system to the database
+      # addSystem(self, newSystemPath, REQUEST=None)
+      def add_system(system_path)
+        method = "addSystem?newSystemPath=#{system_path}"
+        rest(method)
+        sys = System.new("/Systems/#{system_path}")
+      end
+
+      
+      private
+
+      def rest(method)
+        super("#{@path}/#{method}")
+      end
+
+
+
+    end # ZDeviceLoader
+  end # Model
+end # Zenoss

data/lib/model/zenpack/zenpack_manager.rb

@@ -0,0 +1,34 @@
+#############################################################################
+# Copyright © 2010 Dan Wanek <dwanek@nd.gov>
+#
+#
+# This file is part of zenoss_client.
+# 
+# zenoss_client is free software: you can redistribute it and/or
+# modify it under the terms of the GNU General Public License as published
+# by the Free Software Foundation, either version 3 of the License, or (at
+# your option) any later version.
+# 
+# zenoss_client is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+# Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License along
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
+#############################################################################
+module Zenoss
+  module Model
+    class ZenPackManager
+      include Model
+
+      def initialize
+        model_init
+      end
+
+      def manage_add_zenpack(zenpack_id)
+      end
+
+    end
+  end # Model
+end # Zenoss

data/lib/zenoss.rb

@@ -2,20 +2,20 @@
 # Copyright © 2010 Dan Wanek <dwanek@nd.gov>
 #
 #
-# This file is part of Zenoss-RubyREST.
+# This file is part of zenoss_client.
 # 
-# Zenoss-RubyREST is free software: you can redistribute it and/or
+# zenoss_client is free software: you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or (at
 # your option) any later version.
 # 
-# Zenoss-RubyREST is distributed in the hope that it will be useful,
+# zenoss_client is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 # Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with Zenoss-RubyREST.  If not, see <http://www.gnu.org/licenses/>.
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
 #############################################################################
 require 'rubygems'
 require 'date'
@@ -46,6 +46,17 @@ module Zenoss
     Model::DeviceClass.new('/zport/dmd/Devices')
   end
 
+  # Return the base ServiceOrganizer /zport/dmd/Services
+  def Zenoss.services
+    Model::ServiceOrganizer.new('/zport/dmd/Services')
+  end
+
+  # Return the base System /zport/dmd/Systems
+  def Zenoss.systems
+    Model::System.new('/zport/dmd/Systems')
+  end
+
+
 
   private
 

data/preamble

@@ -2,18 +2,18 @@
 # Copyright © 2010 Dan Wanek <dwanek@nd.gov>
 #
 #
-# This file is part of Zenoss-RubyREST.
+# This file is part of zenoss_client.
 # 
-# Zenoss-RubyREST is free software: you can redistribute it and/or
+# zenoss_client is free software: you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as published
 # by the Free Software Foundation, either version 3 of the License, or (at
 # your option) any later version.
 # 
-# Zenoss-RubyREST is distributed in the hope that it will be useful,
+# zenoss_client is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
 # Public License for more details.
 # 
 # You should have received a copy of the GNU General Public License along
-# with Zenoss-RubyREST.  If not, see <http://www.gnu.org/licenses/>.
+# with zenoss_client.  If not, see <http://www.gnu.org/licenses/>.
 #############################################################################

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: zenoss_client
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Dan Wanek
@@ -9,19 +14,21 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -06:00
+date: 2010-03-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: tzinfo
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: "  \tThis is a Ruby library for accessing Zenoss through its REST interface.  It is a work in progress and as functionality is testing\n\
   \tit will be added.  For documentation on what the method calls do see the official Zenoss API docs.\n"
 email: dan.wanek@gmail.com
@@ -37,12 +44,26 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/model/device.rb
-- lib/model/device_class.rb
-- lib/model/device_hw.rb
+- lib/model/devices.rb
+- lib/model/devices/device.rb
+- lib/model/devices/device_class.rb
+- lib/model/devices/device_hw.rb
+- lib/model/devices/operating_system.rb
 - lib/model/event_view.rb
+- lib/model/events/event_class.rb
+- lib/model/manufacturers/manufacturers.rb
 - lib/model/model.rb
-- lib/model/operating_system.rb
+- lib/model/processes/os_process_organizer.rb
+- lib/model/services.rb
+- lib/model/services/ip_service.rb
+- lib/model/services/service.rb
+- lib/model/services/service_class.rb
+- lib/model/services/service_organizer.rb
+- lib/model/services/win_service.rb
+- lib/model/systems.rb
+- lib/model/systems/system.rb
+- lib/model/z_device_loader.rb
+- lib/model/zenpack/zenpack_manager.rb
 - lib/zenoss.rb
 - preamble
 has_rdoc: true
@@ -63,18 +84,22 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 7
       version: 1.8.7
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A Ruby API for accessing Zenoss via REST