vas 0.4.0 → 1.0.0

data/lib/vas/gemfire/disk_stores.rb

@@ -28,19 +28,25 @@ module Gemfire
 
   # A disk store in a cache server node instance
   class DiskStore < Shared::Resource
+    
+    include Shared::Deletable
 
     # @return [String] the name of the disk store
     attr_reader :name
 
-    # @return [CacheServerNodeInstance] the disk store's cache server node instance
-    attr_reader :instance
+    # @return [Integer] the size of the disk store
+    attr_reader :size
+
+    # @return [Integer] the last modified stamp of the disk store
+    attr_reader :last_modified
 
     # @private
     def initialize(location, client)
       super(location, client)
 
       @name = details['name']
-      @instance = CacheServerNodeInstance.new(Util::LinkUtils.get_link_href(details, 'cache-server-node-instance'), client)
+
+      @instance_location = Util::LinkUtils.get_link_href(details, 'cache-server-node-instance')
       @content_location = Util::LinkUtils.get_link_href(details, 'content')
     end
 
@@ -52,20 +58,22 @@ module Gemfire
     def content(&block)
       client.get_stream(@content_location, &block)
     end
-    
-    # @return [Integer] the size of the disk store
-    def size
-      client.get(location)['size']
+
+    # @return [CacheServerNodeInstance] the disk store's cache server node instance
+    def instance
+      @instance ||= CacheServerNodeInstance.new(@instance_location, client)
     end
 
-    # @return [Integer] the last modified stamp of the disk store
-    def last_modified
-      client.get(location)['last-modified']
+    # Reloads the disk store's details from the server
+    def reload
+      super
+      @size = details['size']
+      @last_modified = details['last-modified']
     end
 
     # @return [String] a string representation of the disk store
     def to_s
-      "#<#{self.class} name='#@name'>"
+      "#<#{self.class} name='#@name' size='#@size' last_modified='#@last_modified'>"
     end
 
   end

data/lib/vas/gemfire/gemfire.rb

@@ -37,10 +37,10 @@ module Gemfire
 
       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)
-      @nodes = Nodes.new(Util::LinkUtils.get_link_href(json, "nodes"), client)
-      @application_code_images = ApplicationCodeImages.new(Util::LinkUtils.get_link_href(json, "application-code-images"), 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)
+      @nodes = Nodes.new(Util::LinkUtils.get_link_href(json, 'nodes'), client)
+      @application_code_images = ApplicationCodeImages.new(Util::LinkUtils.get_link_href(json, 'application-code-images'), client)
 
     end
     

data/lib/vas/gemfire/groups.rb

@@ -29,21 +29,28 @@ module Gemfire
   # A GemFire group
   class Group < Shared::MutableGroup
 
+    # @private
+    def initialize(location, client)
+      super(location, client, Node, Installations)
+
+      @agent_instances_location = Util::LinkUtils.get_link_href(details, 'agent-group-instances')
+      @cache_server_instances_location = Util::LinkUtils.get_link_href(details, 'cache-server-group-instances')
+      @locator_instances_location = Util::LinkUtils.get_link_href(details, 'locator-group-instances')
+    end
+
     # @return [AgentInstances] the group's agent instances
-    attr_reader :agent_instances
+    def agent_instances
+      @agent_instances ||= AgentInstances.new(@agent_instances_location, client)
+    end
 
     # @return [CacheServerInstances] the group's cache server instances
-    attr_reader :cache_server_instances
+    def cache_server_instances
+      @cache_server_instances ||= CacheServerInstances.new(@cache_server_instances_location, client)
+    end
 
     # @return [LocatorInstances] the group's locator instances
-    attr_reader :locator_instances
-
-    # @private
-    def initialize(location, client)
-      super(location, client, Node, Installations)
-      @agent_instances = AgentInstances.new(Util::LinkUtils.get_link_href(details, "agent-group-instances"), client)
-      @cache_server_instances = CacheServerInstances.new(Util::LinkUtils.get_link_href(details, "cache-server-group-instances"), client)
-      @locator_instances = LocatorInstances.new(Util::LinkUtils.get_link_href(details, "locator-group-instances"), client)
+    def locator_instances
+      @locator_instances ||= LocatorInstances.new(@locator_instances_location, client)
     end
 
   end

data/lib/vas/gemfire/installations.rb

@@ -34,19 +34,28 @@ module Gemfire
       super(location, client, InstallationImage, Group)
     end
 
+    # Reloads the installation's details from the server
+    # @return [void]
+    def reload
+      super
+      @agent_instances = nil
+      @cache_server_instances = nil
+      @locator_instances = nil
+    end
+
     # @return [AgentInstance[]] the agent instances that are using the installation
     def agent_instances
-      retrieve_instances("agent-group-instance", AgentInstance);
+      @agent_instances ||= create_resources_from_links('agent-group-instance', AgentInstance);
     end
 
     # @return [CacheServerInstance[]] the cache server instances that are using the installation
     def cache_server_instances
-      retrieve_instances("cache-server-group-instance", CacheServerInstance);
+      @cache_server_instances ||= create_resources_from_links('cache-server-group-instance', CacheServerInstance);
     end
 
     # @return [LocatorInstance[]] the locator instances that are using the installation
     def locator_instances
-      retrieve_instances("locator-group-instance", LocatorInstance);
+      @locator_instances ||= create_resources_from_links('locator-group-instance', LocatorInstance);
     end
     
   end

data/lib/vas/gemfire/live_application_codes.rb

@@ -16,12 +16,12 @@
 
 module Gemfire
 
-  # Used to enumerate a cache server's live application code.
+  # Used to enumerate a cache server's live application code
   class LiveApplicationCodes < Shared::Collection
 
     # @private
     def initialize(location, client)
-      super(location, client, "live-application-code", ApplicationCode)
+      super(location, client, 'live-application-code', ApplicationCode)
     end
 
   end

data/lib/vas/gemfire/locator_instances.rb

@@ -21,7 +21,7 @@ module Gemfire
 
     # @private
     def initialize(location, client)
-      super(location, client, "locator-group-instances", LocatorInstance)
+      super(location, client, 'locator-group-instances', LocatorInstance)
     end
 
     # Creates a new locator instance
@@ -47,7 +47,7 @@ module Gemfire
         payload[:server] = options[:server]
       end
 
-      LocatorInstance.new(client.post(location, payload, "locator-group-instance"), client)
+      super(payload, 'locator-group-instance')
     end
 
   end
@@ -55,11 +55,21 @@ module Gemfire
   # A locator instance
   class LocatorInstance < Shared::Instance
 
+    # @return [Integer] the port that the locator will listen on
+    attr_reader :port
+
+    # @return [Boolean] +true+ if the locator will act as a peer, +false+ if it will not
+    attr_reader :peer
+
+    # @return [Boolean] +true+ if the locator will act as a server, +false+ if it will not
+    attr_reader :server
+
     # @private
     def initialize(location, client)
       super(location, client, Group, Installation, LocatorLiveConfigurations, LocatorPendingConfigurations, LocatorNodeInstance, 'locator-node-instance')
     end
 
+
     # Updates the instance using the supplied +options+.
     #
     # @param options [Hash] optional configuration for the instance
@@ -92,21 +102,21 @@ module Gemfire
       end
 
       client.post(location, payload)
+      reload
     end
 
-    # @return [Integer] the port that the locator will listen on
-    def port
-      client.get(location)['port']
-    end
-
-    # @return [Boolean] +true+ if the locator will act as a peer, +false+ if it will not
-    def peer
-      client.get(location)['peer']
+    # Reloads the instance's details from the server
+    # @return [void]
+    def reload
+      super
+      @port = details['port']
+      @peer = details['peer']
+      @server = details['server']
     end
 
-    # @return [Boolean] +true+ if the locator will act as a server, +false+ if it will not
-    def server
-      client.get(location)['server']
+    # @return [String] a string representation of the instance
+    def to_s
+      "#<#{self.class} name=#{name} port='#@port' peer='#@peer' server='#@server'>"
     end
 
   end

data/lib/vas/gemfire/locator_live_configurations.rb

@@ -21,17 +21,17 @@ module Gemfire
 
     # @private
     def initialize(location, client)
-      super(location, client, "live-configurations", LocatorLiveConfiguration)
+      super(location, client, 'live-configurations', LocatorLiveConfiguration)
     end
 
   end
   
   # A live configuration file in a locator instance
-  class LocatorLiveConfiguration < Shared::Configuration
+  class LocatorLiveConfiguration < Shared::LiveConfiguration
 
     # @private
     def initialize(location, client)
-      super(location, client, "locator-group-instance", LocatorInstance)
+      super(location, client, 'locator-group-instance', LocatorInstance, LocatorNodeLiveConfiguration)
     end
 
   end

data/lib/vas/gemfire/locator_node_instances.rb

@@ -21,7 +21,7 @@ module Gemfire
 
     # @private
     def initialize(location, client)
-      super(location, client, "locator-node-instances", LocatorNodeInstance)
+      super(location, client, 'locator-node-instances', LocatorNodeInstance)
     end
 
   end
@@ -29,24 +29,32 @@ module Gemfire
   # A locator node instance
   class LocatorNodeInstance < Shared::NodeInstance
 
-    # @private
-    def initialize(location, client) #:nodoc:
-      super(location, client, Node, LocatorLogs, LocatorInstance, 'locator-group-instance')
-    end
-
     # @return [Integer] the port that the locator will listen on
-    def port
-      client.get(location)['port']
-    end
+    attr_reader :port
 
     # @return [Boolean] +true+ if the locator will act as a peer, +false+ if it will not
-    def peer
-      client.get(location)['peer']
-    end
+    attr_reader :peer
 
     # @return [Boolean] +true+ if the locator will act as a server, +false+ if it will not
-    def server
-      client.get(location)['server']
+    attr_reader :server
+
+    # @private
+    def initialize(location, client)
+      super(location, client, Node, LocatorLogs, LocatorInstance, 'locator-group-instance', LocatorNodeLiveConfigurations)
+    end
+
+    # Reloads the instance's details from the server
+    # @return [void]
+    def reload
+      super
+      @port = details['port']
+      @peer = details['peer']
+      @server = details['server']
+    end
+
+    # @return [String] a string representation of the instance
+    def to_s
+      "#<#{self.class} name=#{name} port='#@port' peer='#@peer' server='#@server'>"
     end
 
   end

data/lib/vas/gemfire/locator_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 Gemfire
+
+  # Used to enumerate a locator node instance's live configuration
+  class LocatorNodeLiveConfigurations < Shared::Collection
+
+    # @private
+    def initialize(location, client)
+      super(location, client, 'node-live-configurations', LocatorNodeLiveConfiguration)
+    end
+
+  end
+  
+  # A live configuration file in a locator node instance
+  class LocatorNodeLiveConfiguration < Shared::NodeConfiguration
+
+    # @private
+    def initialize(location, client)
+      super(location, client, 'locator-node-instance', LocatorNodeInstance, LocatorLiveConfiguration)
+    end
+
+  end
+
+end

data/lib/vas/gemfire/nodes.rb

@@ -21,7 +21,7 @@ module Gemfire
 
     # @private
     def initialize(location, client)
-      super(location, client, "nodes", Node)
+      super(location, client, 'nodes', Node)
     end
 
   end
@@ -44,15 +44,36 @@ module Gemfire
     # @private
     def initialize(location, client)
       super(location, client, Group)
-      @java_home = details["java-home"]
-      @agent_instances = AgentNodeInstances.new(Util::LinkUtils.get_link_href(details, "agent-node-instances"), client)
-      @cache_server_instances = CacheServerNodeInstances.new(Util::LinkUtils.get_link_href(details, "cache-server-node-instances"), client)
-      @locator_instances = LocatorNodeInstances.new(Util::LinkUtils.get_link_href(details, "locator-node-instances"), client)
+      @agent_instances_location = Util::LinkUtils.get_link_href(details, 'agent-node-instances')
+      @cache_server_instances_location = Util::LinkUtils.get_link_href(details, 'cache-server-node-instances')
+      @locator_instances_location = Util::LinkUtils.get_link_href(details, 'locator-node-instances')
+    end
+
+    # Reloads the node's details from the server
+    # @return [void]
+    def reload
+      super
+      @java_home = details['java-home']
+    end
+
+    # @return [AgentNodeInstances] the node's agent instances
+    def agent_instances
+      @agent_instances ||= AgentNodeInstances.new(@agent_instances_location, client)
+    end
+
+    # @return [CacheServerNodeInstances] the node's server instances
+    def cache_server_instances
+      @cache_server_instances ||= CacheServerNodeInstances.new(@cache_server_instances_location, client)
+    end
+
+    # @return [LocatorNodeInstances] the node's locator instances
+    def locator_instances
+      @locator_instances ||= LocatorNodeInstances.new(@locator_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}'>"
+      "#<#{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}' java_home='#@java_home' metadata='#{metadata}'>"
     end
 
   end

data/lib/vas/gemfire/pending_application_codes.rb

@@ -21,7 +21,7 @@ module Gemfire
 
     # @private
     def initialize(location, client)
-      super(location, client, "pending-application-code", ApplicationCode)
+      super(location, client, 'pending-application-code', PendingApplicationCode)
     end
 
     # Creates a new pending application code
@@ -30,9 +30,14 @@ module Gemfire
     #
     # @return [ApplicationCode] the new application code
     def create(image)
-      ApplicationCode.new(client.post(location, { :image => image.location}), client)
+      super({:image => image.location})
     end
 
   end
+  
+  # An application code that is pending
+  class PendingApplicationCode < ApplicationCode
+    include Shared::Deletable
+  end
 
 end

data/lib/vas/gemfire/statistics.rb

@@ -28,12 +28,17 @@ module Gemfire
 
   # A statistic of a cache server
   class Statistic < Shared::Resource
+    
+    include Shared::Deletable
 
     # @return [String] the path of statistic
     attr_reader :path
 
-    # @return [CacheServerNodeInstance] The statistic's cache server node instance
-    attr_reader :instance
+    # @return [Integer] the size of the statistic
+    attr_reader :size
+
+    # @return [Integer] the last modified stamp of the statistic
+    attr_reader :last_modified
 
     # @private
     def initialize(location, client)
@@ -41,18 +46,20 @@ module Gemfire
 
       @path = details['path']
 
-      @instance = CacheServerNodeInstance.new(Util::LinkUtils.get_link_href(details, 'cache-server-node-instance'), client)
+      @instance_location = Util::LinkUtils.get_link_href(details, 'cache-server-node-instance')
       @content_location = Util::LinkUtils.get_link_href(details, 'content')
     end
-    
-    # @return [Integer] the size of the statistic
-    def size
-      client.get(location)['size']
+
+    # Reloads the statistic's details from the server
+    def reload
+      super
+      @size = details['size']
+      @last_modified = details['last-modified']
     end
 
-    # @return [Integer] the last modified stamp of the statistic
-    def last_modified
-      client.get(location)['last-modified']
+    # @return [CacheServerNodeInstance] The statistic's cache server node instance
+    def instance
+      @instance ||= CacheServerNodeInstance.new(@instance_location, client)
     end
 
     # Retrieves the statistic's content
@@ -66,7 +73,7 @@ module Gemfire
 
     # @return [String] a string representation of the statistic
     def to_s
-      "#<#{self.class} path='#@path'>"
+      "#<#{self.class} path='#@path' size='#@size' last_modified='#@last_modified'>"
     end
 
   end