vas 0.4.0 → 1.0.0

data/lib/vas/rabbitmq/groups.rb

@@ -29,15 +29,17 @@ module RabbitMq
   # A RabbitMQ group
   class Group < Shared::Group
 
-    # @return [Instances] the group's instances
-    attr_reader :instances
-
     # @private
     def initialize(location, client)
       super(location, client, Node, Installations)
-      @instances = Instances.new(Util::LinkUtils.get_link_href(details, "group-instances"), client)
+
+      @instances_location = Util::LinkUtils.get_link_href(details, 'group-instances')
     end
 
+    # @return [Instances] the group's instances
+    def instances
+      @instances ||= Instances.new(@instances_location, client)
+    end
   end
 
 end

data/lib/vas/rabbitmq/installations.rb

@@ -18,14 +18,14 @@ module RabbitMq
 
   # Used to enumerate, create, and delete RabbitMQ installations
   class Installations < Shared::Installations
-    
+
     # @private
     def initialize(location, client)
       super(location, client, Installation)
     end
-    
+
   end
-  
+
   # A RabbitMQ installation
   class Installation < Shared::Installation
 
@@ -34,11 +34,19 @@ module RabbitMq
       super(location, client, InstallationImage, Group)
     end
 
+    # Reloads the installation's details from the server
+    #
+    # @return [void]
+    def reload
+      super
+      @instances = nil
+    end
+
     # @return [Instance[]] the instances that are using the installation
     def instances
-      retrieve_instances("group-instance", Instance);
+      @instances ||= create_resources_from_links('group-instance', Instance)
     end
-    
+
   end
-  
+
 end

data/lib/vas/rabbitmq/instances.rb

@@ -21,7 +21,7 @@ module RabbitMq
 
     # @private
     def initialize(location, client)
-      super(location, client, "group-instances", Instance)
+      super(location, client, 'group-instances', Instance)
     end
 
     # Creates a new instance
@@ -32,7 +32,7 @@ module RabbitMq
     # @return  [Instance] the new instance
     def create(installation, name)
       payload = { :installation => installation.location, :name => name }
-      Instance.new(client.post(location, payload, "group-instance"), client)
+      super(payload, 'group-instance')
     end
 
   end
@@ -40,9 +40,6 @@ module RabbitMq
   # A RabbitMQ instance
   class Instance < Shared::Instance
 
-    # @return [Plugins] the instance's plugins
-    attr_reader :plugins
-
     # @private
     def initialize(location, client)
       super(location, client, Group, Installation, LiveConfigurations, PendingConfigurations, NodeInstance, 'node-instance')
@@ -55,7 +52,13 @@ module RabbitMq
     #
     # @return [void]
     def update(installation)
-      client.post(location, { :installation => installation.location });
+      client.post(location, { :installation => installation.location })
+      reload
+    end
+
+    # @return [Plugins] the instance's plugins
+    def plugins
+      @plugins ||= Plugins.new(Util::LinkUtils.get_link_href(details, 'plugins'), client)
     end
 
   end

data/lib/vas/rabbitmq/live_configurations.rb

@@ -21,17 +21,17 @@ module RabbitMq
 
     # @private
     def initialize(location, client)
-      super(location, client, "live-configurations", LiveConfiguration)
+      super(location, client, 'live-configurations', LiveConfiguration)
     end
 
   end
   
   # A live configuration file in a RabbitMQ instance
-  class LiveConfiguration < Shared::Configuration
+  class LiveConfiguration < Shared::LiveConfiguration
 
     # @private
     def initialize(location, client)
-      super(location, client, "group-instance", Instance)
+      super(location, client, 'group-instance', Instance, NodeLiveConfiguration)
     end
 
   end

data/lib/vas/rabbitmq/node_instances.rb

@@ -21,7 +21,7 @@ module RabbitMq
 
     # @private
     def initialize(location, client)
-      super(location, client, "node-instances", NodeInstance)
+      super(location, client, 'node-instances', NodeInstance)
     end
 
   end
@@ -31,7 +31,7 @@ module RabbitMq
 
     # @private
     def initialize(location, client)
-      super(location, client, Node, Logs, Instance, 'group-instance')
+      super(location, client, Node, Logs, Instance, 'group-instance', NodeLiveConfigurations)
     end
 
   end

data/lib/vas/rabbitmq/node_live_configurations.rb

@@ -0,0 +1,39 @@
+# vFabric Administration Server Ruby API
+# Copyright (c) 2012 VMware, Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+module RabbitMq
+
+  # Used to enumerate a node instance's live configuration
+  class NodeLiveConfigurations < Shared::Collection
+
+    # @private
+    def initialize(location, client)
+      super(location, client, 'node-live-configurations', NodeLiveConfiguration)
+    end
+
+  end
+  
+  # A live configuration file in a node instance
+  class NodeLiveConfiguration < Shared::NodeConfiguration
+
+    # @private
+    def initialize(location, client)
+      super(location, client, 'node-instance', NodeInstance, LiveConfiguration)
+    end
+
+  end
+
+end

data/lib/vas/rabbitmq/nodes.rb

@@ -15,34 +15,37 @@
 
 
 module RabbitMq
-  
+
   # Used to enumerate RabbitMQ nodes
   class Nodes < Shared::Collection
 
     # @private
     def initialize(location, client)
-      super(location, client, "nodes", Node)
+      super(location, client, 'nodes', Node)
     end
 
   end
 
   # A RabbitMQ node
   class Node < Shared::GroupableNode
-    
-    # @return [NodeInstances] the node's instances
-    attr_reader :instances
 
     # @private
     def initialize(location, client)
       super(location, client, Group)
-      @instances = NodeInstances.new(Util::LinkUtils.get_link_href(details, "node-instances"), client)
+      @instances_location = Util::LinkUtils.get_link_href(details, 'node-instances')
+    end
+
+    # @return [NodeInstances] the node's instances
+    def instances
+      @instances ||= NodeInstances.new(@instances_location, client)
     end
 
     # @return [String] a string representation of the node
-    def to_s 
-      "#<#{self.class} host_names='#{host_names}' ip_addresses='#{ip_addresses}' operating_system='#{operating_system}' architecture='#{architecture}' agent_home='#{agent_home}' java_home='#{java_home}' metadata='#{metadata}'>"
+    def to_s
+      "#<#{self.class} host_names='#{host_names}' ip_addresses='#{ip_addresses}' ipv4_addresses='#{ipv4_addresses}' ipv6_addresses='#{ipv6_addresses}' operating_system='#{operating_system}' architecture='#{architecture}' agent_home='#{agent_home}' metadata='#{metadata}'>"
     end
 
+
   end
 
 end

data/lib/vas/rabbitmq/plugin_images.rb

@@ -30,7 +30,7 @@ module RabbitMq
     #
     # @return [PluginImage] the new plugin image
     def create(path)
-      PluginImage.new(client.post_image(location, path), client)
+      create_image(path)
     end
     
   end
@@ -38,6 +38,8 @@ module RabbitMq
   # A plugin image
   class PluginImage < Shared::Resource
 
+    include Shared::Deletable
+
     # The plugin image's name
     attr_reader :name
 
@@ -51,21 +53,26 @@ module RabbitMq
     def initialize(location, client)
       super(location, client)
 
-      @name = details["name"]
-      @version = details["version"]
+      @name = details['name']
+      @version = details['version']
       @size = details['size']
     end
 
+    # Reloads the plugin image's details from the server
+    # @return [void]
+    def reload
+      super
+      @plugins = nil
+    end
+
     # @return [Plugin[]] the plugins that have been created from this plugin image
     def plugins
-      plugins = []
-      Util::LinkUtils.get_link_hrefs(client.get(location), "plugin").each { |plugin_location| plugins << Plugin.new(plugin_location, client)}
-      plugins
+      @plugins ||= create_resources_from_links('plugin', Plugin)
     end
 
     # @return [String] a string representation of the plugin image
     def to_s
-      "#<#{self.class} name='#@name' version='#@version'>"
+      "#<#{self.class} name='#@name' size='#@size' version='#@version'>"
     end
 
   end

data/lib/vas/rabbitmq/plugins.rb

@@ -18,44 +18,53 @@ module RabbitMq
 
   # Used to enumerate, create, and delete plugins
   class Plugins < Shared::MutableCollection
-    
-    def initialize(location, client) #:nodoc:
-      super(location, client, "plugins", Plugin)
+
+    def initialize(location, client)
+      super(location, client, 'plugins', Plugin)
     end
 
     # Creates a plugin from the +plugin_image+
+    # @return [Plugin] the new plugin
     def create(plugin_image)
-      Plugin.new(client.post(location, { :image => plugin_image.location}, 'plugin'), client)
+      super({:image => plugin_image.location}, 'plugin')
     end
-    
+
   end
 
   # A plugin in a RabbitMQ instance
   class Plugin < Shared::Resource
 
+    include Shared::Deletable
+
     # @return [String] the plugin's version
     attr_reader :version
 
     # @return [String] the plugin's name
     attr_reader :name
-    
-    # @return [Instance] the instance that contains the plugin
-    attr_reader :instance
-    
-    # @return [PluginImage] the plugin image, if any, that was used to create the plugin
-    attr_reader :plugin_image
-    
+
     # @private
     def initialize(location, client)
       super(location, client)
-      
+
       @name = details['name']
       @version = details['version']
-      @instance = Instance.new(Util::LinkUtils.get_link_href(details, 'group-instance'), client)
+
+      @instance_location = Util::LinkUtils.get_link_href(details, 'group-instance')
       @state_location = Util::LinkUtils.get_link_href(details, 'state')
-      
-      plugin_image_location = Util::LinkUtils.get_link_href(details, 'plugin-image')
-      @plugin_image = PluginImage.new(plugin_image_location, client) unless plugin_image_location.nil?
+    end
+
+    # @return [PluginImage] the plugin image, if any, that was used to create the plugin
+    def plugin_image
+      if @plugin_image.nil?
+        plugin_image_location = Util::LinkUtils.get_link_href(details, 'plugin-image')
+        @plugin_image = PluginImage.new(plugin_image_location, client) unless plugin_image_location.nil?
+      end
+      @plugin_image
+    end
+
+    # @return [Instance] the instance that contains the plugin
+    def instance
+      @instance ||= Instance.new(@instance_location, client)
     end
 
     # @return [String] the state of the plugin
@@ -67,16 +76,16 @@ module RabbitMq
     #
     # @return [void]
     def enable
-      client.post(@state_location, { :status => 'ENABLED' })
+      client.post(@state_location, {:status => 'ENABLED'})
     end
 
     # Disables the plugin
     #
     # @return [void]
     def disable
-      client.post(@state_location, { :status => 'DISABLED' })
+      client.post(@state_location, {:status => 'DISABLED'})
     end
-    
+
     # @return [String] a string representation of the plugin
     def to_s
       "#<#{self.class} name='#@name' version='#@version'>"

data/lib/vas/rabbitmq/rabbitmq.rb

@@ -37,10 +37,10 @@ module RabbitMq
 
       json = client.get(location)
 
-      @groups = Groups.new(Util::LinkUtils.get_link_href(json, "groups"), client)
-      @installation_images = InstallationImages.new(Util::LinkUtils.get_link_href(json, "installation-images"), client)
-      @plugin_images = PluginImages.new(Util::LinkUtils.get_link_href(json, "plugin-images"), client)
-      @nodes = Nodes.new(Util::LinkUtils.get_link_href(json, "nodes"), client)
+      @groups = Groups.new(Util::LinkUtils.get_link_href(json, 'groups'), client)
+      @installation_images = InstallationImages.new(Util::LinkUtils.get_link_href(json, 'installation-images'), client)
+      @plugin_images = PluginImages.new(Util::LinkUtils.get_link_href(json, 'plugin-images'), client)
+      @nodes = Nodes.new(Util::LinkUtils.get_link_href(json, 'nodes'), client)
     end
 
   end

data/lib/vas/shared/collection.rb

@@ -19,34 +19,57 @@ module Shared
   # @abstract A dynamic collection of items
   class Collection < Shared::Resource
 
+    include Enumerable
+
     private
-    
+
     attr_reader :entry_class
-    
+
     public
 
     # @private
     def initialize(location, client, type, entry_class)
-      super(location, client)
       @type = type
       @entry_class = entry_class
+      super(location, client)
     end
 
-    # Gets the items in the collection from the server. Calls the block once for each item.
+    def reload
+      super
+      @items = nil
+    end
+
+    # Calls the block once for each item in the collection.
     #
     # @yieldparam item an item in the collection
     #
     # @return [void]
     def each
-      items = client.get(location)[@type]
+      @items ||= create_collection_entries
+      @items.each { |item| yield item }
+    end
 
-      if (!items.nil?)
-        client.get(location)[@type].each { |item|
-          yield entry_class.new(Util::LinkUtils.get_self_link_href(item), client)
-        }
+    private
+
+    def create_collection_entries
+      entries_json = details[@type]
+      if entries_json
+        entries_json.collect { |json| create_entry(Util::LinkUtils.get_self_link_href(json)) }
+      else
+        []
       end
     end
-  
+    
+    def create_entry(location)
+      entry = @entry_class.new(location, client)
+
+      if @entry_class.include?(Deletable)
+        entry.collection = self
+      end
+      
+      entry
+    end
+
   end
-  
+
 end