vas 0.4.0 → 1.0.0

data/lib/vas/tc_server/instances.rb

@@ -47,7 +47,7 @@ module TcServer
       end
       
       if options.has_key?(:runtime_version)
-        payload["runtime-version"] = options[:runtime_version]
+        payload['runtime-version'] = options[:runtime_version]
       end
       
       if options.has_key?(:templates)
@@ -59,8 +59,8 @@ module TcServer
       if options.has_key?(:layout)
         payload[:layout] = options[:layout]
       end
-      
-      Instance.new(client.post(location, payload, "group-instance"), client)
+
+      super(payload, 'group-instance')
     end
 
   end
@@ -77,21 +77,27 @@ module TcServer
     # @return [Hash] the instance's services
     attr_reader :services
 
-    # @return [Applications] the instance's applications
-    attr_reader :applications
-
     # @private
     def initialize(location, client)
       super(location, client, Group, Installation, LiveConfigurations, PendingConfigurations, NodeInstance, 'node-instance')
 
-      @layout = details["layout"]
-      @runtime_version = details["runtime-version"]
-      @services = details["services"]
-      @applications = Applications.new(Util::LinkUtils.get_link_href(details, "group-applications"), client)
+      @layout = details['layout']
+    end
 
+    # Reloads the instance's details from the server
+    # @return [void]
+    def reload
+      super
+      @runtime_version = details['runtime-version']
+      @services = details['services']
     end
 
-    # Updates the installation and, optionally, the runtime_version used by the instance
+    # @return [Applications] the instance's applications
+    def applications
+      @applications ||= Applications.new(Util::LinkUtils.get_link_href(details, 'group-applications'), client)
+    end
+
+    # Updates the installation and, optionally, the +runtime_version+ used by the instance
     #
     # @param installation [Installation] the installation to be used by the instance
     # @param runtime_version [String] the version of the runtime to be used by the instance
@@ -99,10 +105,16 @@ module TcServer
     # @return [void]
     def update(installation, runtime_version = nil)
       payload = { :installation => installation.location }
-      if (!runtime_version.nil?)
+      if runtime_version
         payload['runtime-version'] = runtime_version
       end
-      client.post(location, payload);
+      client.post(location, payload)
+      reload
+    end
+
+    # @return [String] a string representation of the instance
+    def to_s
+      "#<#{self.class} name='#{name}' layout='#@layout' runtime_version='#@runtime_version' services='#@services'>"
     end
 
   end

data/lib/vas/tc_server/live_configurations.rb

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

data/lib/vas/tc_server/logs.rb

@@ -19,7 +19,8 @@ module TcServer
   # Used to enumerate a tc Server node instance's logs
   class Logs < Shared::Logs
 
-    def initialize(location, client) #:nodoc:
+    # @private
+    def initialize(location, client)
       super(location, client, Log)
     end
 
@@ -28,7 +29,8 @@ module TcServer
   # A log file in a tc Server node instance
   class Log < Shared::Log
 
-    def initialize(location, client) #:nodoc:
+    # @private
+    def initialize(location, client)
       super(location, client, 'node-instance', NodeInstance)
     end
 

data/lib/vas/tc_server/node_applications.rb

@@ -21,7 +21,7 @@ module TcServer
 
     # @private
     def initialize(location, client)
-      super(location, client, "applications", NodeApplication)
+      super(location, client, 'applications', NodeApplication)
     end
 
   end
@@ -41,29 +41,33 @@ module TcServer
     # @return [String] the host the application will deploy its revisions to
     attr_reader :host
 
-    # @return [NodeRevisions] the application's revisions
-    attr_reader :revisions
-
-    # @return [Application] the application that this node application is a member of
-    attr_reader :group_application
-    
-    # @return [NodeInstance] the node instance that contains the application
-    attr_reader :instance
-
     # @private
     def initialize(location, client)
       super(location, client)
 
-      @revisions = NodeRevisions.new(Util::LinkUtils.get_link_href(details, "node-revisions"), client)
+      @group_application_location = Util::LinkUtils.get_link_href(details, 'group-application')
+      @instance_location = Util::LinkUtils.get_link_href(details, 'node-instance')
+      @revisions_location = Util::LinkUtils.get_link_href(details, 'node-revisions')
+
+      @context_path = details['context-path']
+      @name = details['name']
+      @service = details['service']
+      @host = details['host']
+    end
 
-      @context_path = details["context-path"]
-      @name = details["name"]
-      @service = details["service"]
-      @host = details["host"]
+    # @return [NodeInstance] the node instance that contains the application
+    def instance
+      @instance ||= NodeInstance.new(@instance_location, client)
+    end
 
-      @instance = NodeInstance.new(Util::LinkUtils.get_link_href(details, "node-instance"), client)
+    # @return [Application] the application that this node application is a member of
+    def group_application
+      @group_application ||= Application.new(@group_application_location, client)
+    end
 
-      @group_application = Application.new(Util::LinkUtils.get_link_href(details, "group-application"), client)
+    # @return [NodeRevisions] the application's revisions
+    def revisions
+      @revisions ||= NodeRevisions.new(@revisions_location, client)
     end
 
     # @return [String] a string representation of the node application

data/lib/vas/tc_server/node_instances.rb

@@ -21,7 +21,7 @@ module TcServer
 
     # @private
     def initialize(location, client)
-      super(location, client, "node-instances", NodeInstance)
+      super(location, client, 'node-instances', NodeInstance)
     end
 
   end
@@ -38,17 +38,31 @@ module TcServer
     # @return [Hash] the instance's services
     attr_reader :services
 
-    # @return [NodeApplications] the instance's applications
-    attr_reader :applications
-
     # @private
     def initialize(location, client)
-      super(location, client, Node, Logs, Instance, 'group-instance')
+      super(location, client, Node, Logs, Instance, 'group-instance', NodeLiveConfigurations)
+
+      @layout = details['layout']
+
+      @applications_location = Util::LinkUtils.get_link_href(details, 'node-applications')
+    end
+
+    # Reloads the instance's details from the server
+    # @return [void]
+    def reload
+      super
+      @runtime_version = details['runtime-version']
+      @services = details['services']
+    end
+
+    # @return [NodeApplications] the instance's applications
+    def applications
+      @applications ||= NodeApplications.new(@applications_location, client)
+    end
 
-      @layout = details["layout"]
-      @runtime_version = details["runtime-version"]
-      @services = details["services"]
-      @applications = NodeApplications.new(Util::LinkUtils.get_link_href(details, "node-applications"), client)
+    # @return [String] a string representation of the instance
+    def to_s
+      "#<#{self.class} name='#{name}' layout='#@layout' runtime_version='#@runtime_version' services='#@services'>"
     end
 
   end

data/lib/vas/tc_server/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 TcServer
+
+  # 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/tc_server/node_revisions.rb

@@ -32,22 +32,27 @@ module TcServer
     # @return [String] the revision's version
     attr_reader :version
 
-    # @return [NodeApplication] the revision's application
-    attr_reader :application
-
-    # @return [Revision] the group revision that this node revision is a member of
-    attr_reader :group_revision
-    
     # @private
     def initialize(location, client)
       super(location, client)
-      
+
+      @application_location = Util::LinkUtils.get_link_href(details, 'node-application')
+      @group_revision_location = Util::LinkUtils.get_link_href(details, 'group-revision')
+
       @version = details['version']
-      @application = NodeApplication.new(Util::LinkUtils.get_link_href(details, 'node-application'), client)
-      @group_revision = Revision.new(Util::LinkUtils.get_link_href(details, 'group-revision'), client)
     end
 
-    # @return [String] a string representation of the ndoe revision
+    # @return [NodeApplication] the revision's application
+    def application
+      @application ||= NodeApplication.new(@application_location, client)
+    end
+
+    # @return [Revision] the group revision that this node revision is a member of
+    def group_revision
+      @group_revision ||= Revision.new(@group_revision_location, client)
+    end
+
+    # @return [String] a string representation of the node revision
     def to_s
       "#<#{self.class} version='#@version'>"
     end

data/lib/vas/tc_server/nodes.rb

@@ -21,7 +21,7 @@ module TcServer
 
     # @private
     def initialize(location, client)
-      super(location, client, "nodes", Node)
+      super(location, client, 'nodes', Node)
     end
 
   end
@@ -31,20 +31,27 @@ module TcServer
 
     # @return [String] the node's Java home
     attr_reader :java_home
-    
-    # @return [NodeInstances] the node's instances
-    attr_reader :instances
 
     # @private
     def initialize(location, client)
       super(location, client, Group)
-      @java_home = details["java-home"]
-      @instances = NodeInstances.new(Util::LinkUtils.get_link_href(details, "node-instances"), client)
+      @instance_location = Util::LinkUtils.get_link_href(details, 'node-instances')
+    end
+
+    # Reloads the node's details from the server
+    def reload
+      super
+      @java_home = details['java-home']
     end
-    
+
+    # @return [NodeInstances] the node's instances
+    def instances
+      @instances ||= NodeInstances.new(@instance_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/tc_server/revision_images.rb

@@ -21,9 +21,9 @@ module TcServer
 
     # @private
     def initialize(location, client)
-      super(location, client, "revision-images", RevisionImage)
+      super(location, client, 'revision-images', RevisionImage)
     end
-    
+
     # Creates a new revision image by uploading a war file to the server
     #
     # @param path [String] the path of the WAR file
@@ -32,14 +32,16 @@ module TcServer
     #
     # @return [RevisionImage] the new revision image
     def create(path, name, version)
-      RevisionImage.new(client.post_image(location, path, { :name => name, :version => version }), client)
+      create_image(path, {:name => name, :version => version})
     end
-    
+
   end
-  
+
   # A revision image, i.e. a WAR file
   class RevisionImage < Shared::Resource
 
+    include Shared::Deletable
+
     # @return [String] the revision image's name
     attr_reader :name
 
@@ -53,16 +55,20 @@ module TcServer
     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 revision image's details from the server
+    def reload
+      super
+      @revisions = nil
+    end
+
     # @return [Revision[]] the revisions that have been created from this revision image
     def revisions
-      revisions = []
-      Util::LinkUtils.get_link_hrefs(client.get(location), "group-revision").each { |revision_location| revisions << Revision.new(revision_location, client)}
-      revisions
+      @revisions ||= create_resources_from_links('group-revision', Revision)
     end
 
     # @return [String] a string representation of the revision image

data/lib/vas/tc_server/revisions.rb

@@ -30,7 +30,7 @@ module TcServer
     #
     # @return [Revision] the new revision
     def create(revision_image)
-      Revision.new(client.post(location, { :image => revision_image.location}, 'group-revision'), client)
+      super({ :image => revision_image.location}, 'group-revision')
     end
     
   end
@@ -38,32 +38,36 @@ module TcServer
   # A revision of an application
   class Revision < Shared::StateResource
 
+    include Shared::Deletable
+
     # @return [String] the revision's version
     attr_reader :version
 
-    # @return [Application] the revision's application
-    attr_reader :application
-    
-    # @return [RevisionImage] the revision image, if any, that was used to create the revision
-    attr_reader :revision_image
-    
     # @private
     def initialize(location, client)
       super(location, client)
-      
+
       @version = details['version']
-      @application = Application.new(Util::LinkUtils.get_link_href(details, 'group-application'), client)
-      
-      revision_image_location = Util::LinkUtils.get_link_href(details, 'revision-image')
-      @revision_image = RevisionImage.new(revision_image_location, client) unless revision_image_location.nil?
+      @application_location = Util::LinkUtils.get_link_href(details, 'group-application')
+      @revision_image_location = Util::LinkUtils.get_link_href(details, 'revision-image')
     end
 
     # @return [NodeRevision[]] the revision's node revisions
     def node_revisions
-      node_revisions = []
-      Util::LinkUtils.get_link_hrefs(client.get(location), 'node-revision').each {
-          |node_revision_location| node_revisions << NodeRevision.new(node_revision_location, client)}
-      node_revisions
+      @node_revisions ||= create_resources_from_links('node-revision', NodeRevision)
+    end
+
+    # @return [Application] the revision's application
+    def application
+      @application ||= Application.new(@application_location, client)
+    end
+
+    # @return [RevisionImage] the revision image, if any, that was used to create the revision
+    def revision_image
+      if @revision_image.nil?
+        @revision_image = RevisionImage.new(@revision_image_location, client) unless @revision_image_location.nil?
+      end
+      @revision_image
     end
     
     # @return [String] a string representation of the revision