vas 0.4.0 → 1.0.0

data/lib/vas/shared/configuration.rb

@@ -26,25 +26,32 @@ module Shared
     attr_reader :size
 
     private
-    
+
     attr_reader :content_location
-    
+
     public
 
     # @private
     def initialize(location, client, instance_type, instance_class)
       super(location, client)
 
-      @path = details["path"]
-      @size = details["size"]
+      @instance_class = instance_class
 
       @instance_location = Util::LinkUtils.get_link_href(details, instance_type)
-      @content_location = Util::LinkUtils.get_link_href(details, "content")
+      @content_location = Util::LinkUtils.get_link_href(details, 'content')
 
-      @instance_class = instance_class
+      @path = details['path']
+    end
+
+    # Reloads the configuration's details from the server
+    #
+    # @return [void]
+    def reload
+      super
+      @size = details['size']
     end
 
-    # Retrieves the configuration's content and passes it to the block
+    # Retrieves the configuration's content from the server and passes it to the block
     #
     # @yield [chunk] a chunk of the configuration's content
     #
@@ -55,12 +62,12 @@ module Shared
 
     # @return [Instance] the instance that owns the configuration
     def instance
-      @instance_class.new(@instance_location, client)
+      @instance ||= @instance_class.new(@instance_location, client)
     end
 
     # @return [String] a string representation of the configuration
     def to_s
-      "#<#{self.class} name='#@path' size=#@size>"
+      "#<#{self.class} name='#@path' size='#@size'>"
     end
 
   end

data/lib/vas/shared/deletable.rb

@@ -0,0 +1,34 @@
+# 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 Shared
+  
+  # The +Deletable+ mixin provides classes with support for deletion. The
+  # class must provide two instance variables: client and location
+  module Deletable
+    
+    # @private
+    attr_accessor :collection
+
+    # Performs a delete. If a collection is available it is reloaded
+    def delete
+      @client.delete(@location)
+      @collection.reload unless @collection.nil?
+    end
+
+  end
+
+end

data/lib/vas/shared/groups.rb

@@ -21,11 +21,9 @@ module Shared
 
     # @private
     def initialize(location, client, group_class)
-      super(location, client, "groups", group_class)
+      super(location, client, 'groups', group_class)
     end
 
-    public
-
     # Creates a new group 
     #
     # @param name [String] the group's name
@@ -33,18 +31,17 @@ module Shared
     #
     # @return [Group] the new group
     def create(name, nodes)
-      node_locations = []
-      nodes.each { |node| node_locations << node.location }
-      entry_class.new(client.post(location, {:name => name, :nodes => node_locations}, "group"), client)
+      payload = {:name => name,
+                 :nodes => nodes.collect { |node| node.location }}
+      super(payload, 'group')
     end
 
   end
 
   # @abstract A collection of one or more nodes
   class Group < Shared::Resource
-
-    # @return [Installations] the group's installations
-    attr_reader :installations
+    
+    include Deletable
 
     # @return [String] the group's name
     attr_reader :name
@@ -52,18 +49,31 @@ module Shared
     # @private
     def initialize(location, client, nodes_class, installations_class)
       super(location, client)
-      @name = details["name"]
-      @installations = installations_class.new(Util::LinkUtils.get_link_href(details, "installations"), client)
+
+      @installations_class = installations_class
       @nodes_class = nodes_class
+
+      @installations_location = Util::LinkUtils.get_link_href(details, 'installations')
+
+      @name = details['name']
     end
-    
+
+    # Reloads the group's details from the server
+    def reload
+      super
+      @nodes = nil
+    end
+
+    # @return [Installations] the group's installations
+    def installations
+      @installations ||= @installations_class.new(@installations_location, client)
+    end
+
     public
 
     # @return [GroupableNode[]] the group's nodes
     def nodes
-      nodes = []
-      Util::LinkUtils.get_link_hrefs(client.get(location), "node").each { |node_location| nodes << @nodes_class.new(node_location, client)}
-      nodes
+      @nodes ||= create_resources_from_links('node', @nodes_class)
     end
 
     # @return [String] a string representation of the group
@@ -85,6 +95,7 @@ module Shared
       node_locations = []
       nodes.each { |node| node_locations << node.location }
       client.post(location, {:nodes => node_locations})
+      reload
     end
 
   end

data/lib/vas/shared/installation_images.rb

@@ -21,7 +21,7 @@ module Shared
   
     # @private
     def initialize(location, client, installation_image_class)
-      super(location, client, "installation-images", installation_image_class)
+      super(location, client, 'installation-images', installation_image_class)
     end
 
     # Creates an installation image by uploading a file to the server and assigning it a version
@@ -31,7 +31,7 @@ module Shared
     #
     # @return [InstallationImage] the new installation image
     def create(path, version)
-      entry_class.new(client.post_image(location, path, { :version => version }), client)
+      create_image(path, { :version => version })
     end
 
   end
@@ -41,6 +41,8 @@ module Shared
   #   group.
   class InstallationImage < Resource
     
+    include Deletable
+    
     # @return [String] the installation image's version
     attr_reader :version
 
@@ -50,23 +52,29 @@ module Shared
     # @private
     def initialize(location, client, installation_class) #:nodoc:
       super(location, client)
-      @version = details["version"]
-      @size = details["size"]
+
       @installation_class = installation_class
+
+      @version = details['version']
+      @size = details['size']
+    end
+
+    # Reloads the installation image's details from the server
+    #
+    # @return [void]
+    def reload
+      super
+      @installations = nil
     end
 
     # @return [Installation[]] the installations that have been created from the installation image
     def installations
-      installations = []
-      Util::LinkUtils.get_link_hrefs(client.get(location), "installation").each { |installation_location|
-        installations << @installation_class.new(installation_location, client)
-      }
-      installations
+      @installations ||= create_resources_from_links('installation', @installation_class)
     end
 
     # @return [String] a string representation of the installation image
     def to_s
-      "#<#{self.class} version='#@version'>"
+      "#<#{self.class} version='#@version' size='#@size'>"
     end
 
   end

data/lib/vas/shared/installations.rb

@@ -21,7 +21,7 @@ module Shared
 
     # @private
     def initialize(location, client, installation_class)
-      super(location, client, "installations", installation_class)
+      super(location, client, 'installations', installation_class)
     end
 
     # Creates a new installation
@@ -30,7 +30,7 @@ module Shared
     #
     # @return [Installation] the new installation
     def create(installation_image)
-      entry_class.new(client.post(location, { :image => installation_image.location }, "installation"), client)
+      super({ :image => installation_image.location }, 'installation')
     end
     
   end
@@ -39,39 +39,39 @@ module Shared
   #   installation is used when creating a new instance and provides the binaries that the instance uses at
   #   runtime
   class Installation < Shared::Resource
+    
+    include Deletable
 
     # @return [String] the installation's version
     attr_reader :version
-
-    # @return [InstallationImage] the installation image that was used to create the installation
-    attr_reader :installation_image
-
-    # @return [Group] the group that contains the installation
-    attr_reader :group
     
     # @private
-    def initialize(location, client, installation_image_class, group_class) #:nodoc:
+    def initialize(location, client, installation_image_class, group_class)
       super(location, client)
 
-      @version = details["version"]
-      @installation_image = installation_image_class.new(Util::LinkUtils.get_link_href(details, "installation-image"), client)
-      @group = group_class.new(Util::LinkUtils.get_link_href(details, "group"), client)
+      @installation_image_location = Util::LinkUtils.get_link_href(details, 'installation-image')
+      @group_location = Util::LinkUtils.get_link_href(details, 'group')
+
+      @installation_image_class = installation_image_class
+      @group_class = group_class
+
+      @version = details['version']
+    end
+
+    # @return [Group] the group that contains the installation
+    def group
+      @group ||= @group_class.new(@group_location, client)
+    end
+
+    # @return [InstallationImage] the installation image that was used to create the installation
+    def installation_image
+      @installation_image ||= @installation_image_class.new(@installation_image_location, client)
     end
     
     # @return [String] a string representation of the installation
     def to_s #:nodoc:
       "#<#{self.class} version='#@version'>"
     end
-    
-    private
-
-    def retrieve_instances(instance_rel, instance_class)
-      instances = []
-      Util::LinkUtils.get_link_hrefs(client.get(location), instance_rel).each { |instance_location|
-        instances << instance_class.new(instance_location, client)
-      }
-      instances
-    end
 
   end
   

data/lib/vas/shared/instance.rb

@@ -18,19 +18,12 @@ module Shared
 
   # @abstract A collection of instances
   class Instance < Shared::StateResource
+    
+    include Deletable
 
     # @return [String] the instance's name
     attr_reader :name
 
-    # @return the instance's live configurations
-    attr_reader :live_configurations
-
-    # @return the instance's pending configurations
-    attr_reader :pending_configurations
-
-    # @return [Group] the group that contains this instance
-    attr_reader :group
-
     # @private
     def initialize(location, client,
         group_class,
@@ -38,29 +31,57 @@ module Shared
         live_configurations_class,
         pending_configurations_class,
         node_instance_class,
-        node_instance_type) #:nodoc:
+        node_instance_type)
+
       super(location, client)
 
-      @name = details["name"]
-      @live_configurations = live_configurations_class.new(Util::LinkUtils.get_link_href(details, "live-configurations"), client)
-      @pending_configurations = pending_configurations_class.new(Util::LinkUtils.get_link_href(details, "pending-configurations"), client)
-      @group = group_class.new(Util::LinkUtils.get_link_href(details, "group"), client)
+      @live_configurations_location = Util::LinkUtils.get_link_href(details, 'live-configurations')
+      @pending_configurations_location = Util::LinkUtils.get_link_href(details, 'pending-configurations')
+      @group_location = Util::LinkUtils.get_link_href(details, 'group')
+
+      @group_class = group_class
       @installation_class = installation_class
       @node_instance_class = node_instance_class
+      @live_configurations_class = live_configurations_class
+      @pending_configurations_class = pending_configurations_class
       @node_instance_type = node_instance_type
+
+      @name = details['name']
+    end
+
+    # Reloads the instance's details from the server
+    #
+    # @return [void]
+    def reload
+      super
+      @installation_location = Util::LinkUtils.get_link_href(details, 'installation')
+      @installation = nil
+      @node_instances = nil
     end
 
     # @return [Installation] the installation that this instance is using
     def installation
-      @installation_class.new(Util::LinkUtils.get_link_href(client.get(location), 'installation'), client)
+      @installation ||= @installation_class.new(@installation_location, client)
     end
 
     # @return [NodeInstance[]] the instance's individual node instances
     def node_instances
-      node_instances = []
-      Util::LinkUtils.get_link_hrefs(client.get(location), @node_instance_type).each {
-          |node_instance_location| node_instances << @node_instance_class.new(node_instance_location, client)}
-      node_instances
+      @node_instances ||= create_resources_from_links(@node_instance_type, @node_instance_class)
+    end
+
+    # @return [Group] the group that contains this instance
+    def group
+      @group ||= @group_class.new(@group_location, client)
+    end
+
+    # @return the instance's live configurations
+    def live_configurations
+      @live_configurations ||= @live_configurations_class.new(@live_configurations_location, client)
+    end
+
+    # @return the instance's pending configurations
+    def pending_configurations
+      @pending_configurations ||= @pending_configurations_class.new(@pending_configurations_location, client)
     end
 
     # @return [String] a string representation of the instance

data/lib/vas/shared/live_configuration.rb

@@ -0,0 +1,42 @@
+# 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 Shared
+
+  # @abstract A live configuration file in an instance
+  class LiveConfiguration < Shared::Configuration
+
+    # @private
+    def initialize(location, client, instance_type, instance_class, node_live_configuration_class)
+      super(location, client, instance_type, instance_class)
+      @node_live_configuration_class = node_live_configuration_class
+    end
+
+    # Reloads the live configuration's details from the server
+    def reload
+      super
+      @node_live_configurations = nil
+    end
+
+    # @return [NodeLiveConfiguration[]] the configuration's node configurations
+    def node_configurations
+      @node_live_configurations ||= create_resources_from_links('node-live-configuration',
+                                                                @node_live_configuration_class)
+    end
+
+  end
+
+end