vas 0.4.0 → 1.0.0

data/lib/vas/tc_server/tc_server.rb

@@ -40,11 +40,11 @@ module TcServer
 
       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)
-      @revision_images = RevisionImages.new(Util::LinkUtils.get_link_href(json, "revision-images"), client)
-      @template_images = TemplateImages.new(Util::LinkUtils.get_link_href(json, "template-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)
+      @revision_images = RevisionImages.new(Util::LinkUtils.get_link_href(json, 'revision-images'), client)
+      @template_images = TemplateImages.new(Util::LinkUtils.get_link_href(json, 'template-images'), client)
     end
     
   end

data/lib/vas/tc_server/template_images.rb

@@ -21,7 +21,7 @@ module TcServer
 
     # @private
     def initialize(location, client)
-      super(location, client, "template-images", TemplateImage)
+      super(location, client, 'template-images', TemplateImage)
     end
     
     # Creates a new template image by uploading a +.zip+ file to the server
@@ -32,7 +32,7 @@ module TcServer
     #
     # @return [TemplateImage] the new template image
     def create(path, name, version)
-      TemplateImage.new(client.post_image(location, path, { :name => name, :version => version }), client)
+      create_image(path, { :name => name, :version => version })
     end
     
   end
@@ -40,6 +40,8 @@ module TcServer
   # A template image
   class TemplateImage < Shared::Resource
 
+    include Shared::Deletable
+
     # @return [String] the template 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 template image's details from the server
+    def reload
+      super
+      @templates = nil
+    end
+
     # @return [Template[]] the templates that have been created from the template image
     def templates
-      templates = []
-      Util::LinkUtils.get_link_hrefs(client.get(location), "template").each { |template_location| templates << Template.new(template_location, client)}
-      templates
+      @templates ||= create_resources_from_links('template', Template)
     end
 
     # @return [String] a string representation of the template image

data/lib/vas/tc_server/templates.rb

@@ -21,7 +21,7 @@ module TcServer
     
     # @private
     def initialize(location, client)
-      super(location, client, "templates", Template)
+      super(location, client, 'templates', Template)
     end
     
     # Creates a new template
@@ -30,7 +30,7 @@ module TcServer
     #
     # @return [Template] the new template
     def create(template_image)
-      Template.new(client.post(location, { :image => template_image.location }, "template"), client)
+      super({ :image => template_image.location }, 'template')
     end
     
   end
@@ -38,28 +38,36 @@ module TcServer
   # A tc Server template
   class Template < Shared::Resource
 
+    include Shared::Deletable
+
     # @return [String] the template's version
     attr_reader :version
     
     # @return [String] the template's name
     attr_reader :name
 
-    # @return [TemplateImage] the template image, if any, that this template was created from
-    attr_reader :template_image
-
-    # @return [Installation] the template's installation
-    attr_reader :installation
-
     # @private
     def initialize(location, client)
       super(location, client)
 
-      @version = details["version"]
-      @name = details["name"]
-      @installation = Installation.new(Util::LinkUtils.get_link_href(details, 'installation'), client)
+      @version = details['version']
+      @name = details['name']
 
-      template_image_location = Util::LinkUtils.get_link_href(details, "template-image")
-      @template_image = TemplateImage.new(template_image_location, client) unless template_image_location.nil?
+      @installation_location = Util::LinkUtils.get_link_href(details, 'installation')
+      @template_image_location = Util::LinkUtils.get_link_href(details, 'template-image')
+    end
+
+    # @return [Installation] the template's installation
+    def installation
+      @installation ||= Installation.new(@installation_location, client)
+    end
+
+    # @return [TemplateImage] the template image, if any, that this template was created from
+    def template_image
+      if @template_image.nil?
+        @template_image = TemplateImage.new(@template_image_location, client) unless @template_image_location.nil?
+      end
+      @template_image
     end
 
     # @return [String] a string representation of the template

data/lib/vas/util/client.rb

@@ -71,18 +71,25 @@ module Util
         end
       }
     end
-  
+    
     def post(location, payload, rel = nil)
-  
+
       req = Net::HTTP::Post.new(location)
-  
-      req['Content-Type'] = "application/json"
-      req.body = payload.to_json
-  
+
+      if (payload.is_a?(String))
+        req['Content-Type'] = "text/plain"
+        req.body = payload
+      else
+        req['Content-Type'] = "application/json"
+        req.body = payload.to_json
+      end
+
       do_request(req) { |res|
         case res.code
           when "202"
             return await_task(res["Location"], rel)
+          when "200"
+            return
           else
             raise_vas_exception(res)
         end
@@ -134,12 +141,14 @@ module Util
           when "IN_PROGRESS"
             sleep TASK_POLLING_INTERVAL
           when "SUCCESS"
+            delete(task_location)
             if rel
               return LinkUtils.get_link_hrefs(task, rel)[0]
             else
               return
             end
           else
+            delete(task_location)
             raise VasException.new([task["message"], task["detail"]])
         end
       end

data/lib/vas/vfabric/agent_image.rb

@@ -40,7 +40,7 @@ module VFabric
     #
     # @return [void]
     def extract_to(location = '.')
-      agent_image = Tempfile.open('agent-image.zip') { |temp_file|
+      Tempfile.open('agent-image.zip') { |temp_file|
         content { |chunk| temp_file << chunk }
         temp_file.rewind
         Zip::ZipFile.foreach(temp_file.path) { |entry|

data/lib/vas/vfabric/nodes.rb

@@ -26,18 +26,11 @@ module VFabric
 
   end
 
-  # Deletes the node
-  #
-  # @param node [Node] the node to delete
-  #
-  # @return [void]
-  def delete(node)
-    client.delete(node.location)
-  end
-
   # A VFabric node
   class Node < Shared::Node
-  
+
+    include Shared::Deletable
+
     # @private
     def initialize(location, client)
       super(location, client)
@@ -45,7 +38,7 @@ module VFabric
     
     # @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}' 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}' metadata='#{metadata}'>"
     end
 
   end

data/lib/vas/vfabric/v_fabric.rb

@@ -28,8 +28,8 @@ module VFabric
     # @private
     def initialize(location, client)
       json = client.get(location)
-      @nodes = Nodes.new(Util::LinkUtils.get_link_href(json, "nodes"), client)
-      @agent_image = AgentImage.new(Util::LinkUtils.get_link_href(json, "agent-image"), client)
+      @nodes = Nodes.new(Util::LinkUtils.get_link_href(json, 'nodes'), client)
+      @agent_image = AgentImage.new(Util::LinkUtils.get_link_href(json, 'agent-image'), client)
     end
 
   end

data/lib/vas/vfabric_administration_server.rb

@@ -23,12 +23,18 @@ class VFabricAdministrationServer
   # @return [RabbitMq::RabbitMq] the RabbitMQ API
   attr_reader :rabbitmq
 
+  # @return [Sqlfire::Sqlfire, nil] the SQLFire API, or +nil+ if the server is not version 1.1.0 or later
+  attr_reader :sqlfire
+
   # @return [TcServer::TcServer] the tc Server API
   attr_reader :tc_server
 
   # @return [VFabric::VFabric] the vFabric API
   attr_reader :vfabric
 
+  # @return [WebServer::WebServer, nil] the vFabric Web Server API, or +nil+ if the server is not version 1.1.0 or later
+  attr_reader :web_server
+
   # Creates an entry point that will connect to a vFabric Administration Server. 
   # @param [Hash] configuration the connection configuration
   # @option configuration [String] :username ('admin') The username to use to authenticate with the server
@@ -36,15 +42,40 @@ class VFabricAdministrationServer
   # @option configuration [String] :host ('localhost') The host of the server
   # @option configuration [Integer] :port (8443) The HTTPS port of the server
   def initialize(configuration = {})
-    @client = Util::Client.new(configuration[:username] || "admin", configuration[:password] || "vmware")
+
+    configuration.has_key?(:client) ?
+        client = configuration[:client] :
+        client = Util::Client.new(configuration[:username] || "admin", configuration[:password] || "vmware")
 
     host = configuration[:host] || "localhost"
     port = configuration[:port] || 8443
 
-    @tc_server = TcServer::TcServer.new("https://#{host}:#{port}/tc-server/v1", @client)
-    @vfabric = VFabric::VFabric.new("https://#{host}:#{port}/vfabric/v1", @client)
-    @rabbitmq = RabbitMq::RabbitMq.new("https://#{host}:#{port}/rabbitmq/v1", @client)
-    @gemfire = Gemfire::Gemfire.new("https://#{host}:#{port}/gemfire/v1", @client)
+    @gemfire = Gemfire::Gemfire.new("https://#{host}:#{port}/gemfire/v1/", client)
+    @rabbitmq = RabbitMq::RabbitMq.new("https://#{host}:#{port}/rabbitmq/v1/", client)
+
+    sqlfire_location = "https://#{host}:#{port}/sqlfire/v1/"
+    @sqlfire = Sqlfire::Sqlfire.new(sqlfire_location, client) if available? sqlfire_location, client
+
+    @tc_server = TcServer::TcServer.new("https://#{host}:#{port}/tc-server/v1/", client)
+    @vfabric = VFabric::VFabric.new("https://#{host}:#{port}/vfabric/v1/", client)
+
+    web_server_location = "https://#{host}:#{port}/web-server/v1/"
+    @web_server = WebServer::WebServer.new(web_server_location, client) if available? web_server_location, client
   end
-  
+
+  private
+
+  def available? (location, client)
+    begin
+      client.get(location)
+      true
+    rescue VasException => error
+      if error.code == 404
+        false
+      else
+        raise error
+      end
+    end
+  end
+
 end

data/lib/vas/web_server/configuration.rb

@@ -0,0 +1,29 @@
+# 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 WebServer
+
+  # A configuration file in a Web Server instance
+  class Configuration < Shared::Configuration
+
+    # @private
+    def initialize(location, client)
+      super(location, client, 'group-instance', Instance)
+    end
+
+  end
+
+end

data/lib/vas/web_server/groups.rb

@@ -0,0 +1,44 @@
+# 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 WebServer
+
+  # Used to enumerate, create, and delete Web Server groups
+  class Groups < Shared::Groups
+
+    # @private
+    def initialize(location, client)
+      super(location, client, Group)
+    end
+
+  end
+
+  # A Web Server group
+  class Group < Shared::MutableGroup
+
+    # @private
+    def initialize(location, client)
+      super(location, client, Node, Installations)
+      @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/web_server/installation_images.rb

@@ -0,0 +1,54 @@
+# 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 WebServer
+
+  # Used to enumerate, create, and delete Web Server installation images.
+  class InstallationImages < Shared::InstallationImages
+
+    # @private
+    def initialize(location, client)
+      super(location, client, InstallationImage)
+    end
+
+    # Creates an installation image by uploading a file to the server and assigning it a version, architecture,
+    # and operating system
+    #
+    # @param path the path of the file to upload
+    # @param version [String] the installation image's version
+    # @param architecture [String] the installation image's architecture
+    # @param operating_system [String] the installation image's operating system
+    #
+    # @return [InstallationImage] the new installation image
+    def create(path, version, architecture, operating_system)
+      create_image(path, { :version => version,
+                           :architecture => architecture,
+                           'operating-system' => operating_system })
+    end
+
+  end
+  
+  # A Web Server installation image
+  class InstallationImage < Shared::InstallationImage
+
+    # @private
+    def initialize(location, client)
+      super(location, client, Installation)
+    end
+
+  end
+
+end

data/lib/vas/web_server/installations.rb

@@ -0,0 +1,52 @@
+# 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 WebServer
+
+  # Used to enumerate, create, and delete Web Server installations
+  class Installations < Shared::Installations
+    
+    # @private
+    def initialize(location, client)
+      super(location, client, Installation)
+    end
+    
+  end
+  
+  # A Web Server installation
+  class Installation < Shared::Installation
+
+    # @private
+    def initialize(location, client)
+      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
+      @instances ||= create_resources_from_links('group-instance', Instance)
+    end
+    
+  end
+  
+end