rightimage_tools 0.2.1 → 0.5.0

data/bin/update_mcis

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require "rest_connection"
+
+# Set this to key in the st_collection that matches the ID
+# of the ServerTemplate you want to replicated MCIs from.
+SOURCE_KEY = :base
+
+# Collection of all ServerTemplate IDs to update
+# Staging
+st_collection = {
+ :base_rsb => 243993001,
+ :lamp_rsb => 243995001,
+ :base => 243994001,
+ :lamp_mysql_5_1 => 243996001,
+ :lamp_mysql_5_5 => 243997001,
+ :lamp_trial => 243998001,
+ :load_balancer => 243999001,
+ :php_appserver => 244000001,
+ :rails_passenger => 244001001,
+ :tomcat_app => 244002001,
+ :db_mysql_5_1 => 244003001,
+ :db_mysql_5_5 => 244004001,
+ :storage_toolbox => 244005001,
+ :sys_dns => 237966001
+}
+
+# Production (v13)
+#st_collection = {
+# :base_rsb => 91124,
+# :lamp_rsb => 129529,
+# :base => 104181,
+# :lamp_mysql_5_1 => 106233,
+# :lamp_mysql_5_5 => 226676001,
+# :lamp_trial => 226834001,
+# :load_balancer => 120077,
+# :php_appserver => 27958,  
+# :rails_passenger => 139492,
+# :tomcat_app => 122208,
+# :db_mysql_5_1 => 107666,
+# :db_mysql_5_5 => 214130001,
+# :storage_toolbox => 104346 
+#}
+
+# Display Mapping (useful for verifying collection is okay)
+#st_collection.each { |k,v| puts "\n\n#{k} == #{ServerTemplate.find(v).nickname}\n\n\n" }
+
+puts "Rest_connection log set to /tmp/rc.log"
+ENV['REST_CONNECTION_LOG'] = "/tmp/rc.log"
+
+# Run mcicp from SOURCE_KEY to collection of servertemplates
+src_id = st_collection[SOURCE_KEY]
+st_collection.each do |dst_key, dst_id| 
+  next if dst_id == src_id
+  puts '-'*25
+  puts "Copying MCIs from #{SOURCE_KEY} to #{dst_key}"
+  skip_param = dst_key.to_s =~ /mysql_5_5/ ? "--skip Ubuntu" : ""
+  bin = File.expand_path("../mcicp",__FILE__)
+  cmd = "#{bin} --from #{src_id} --to #{dst_id} #{skip_param}"
+  puts cmd
+  puts `#{cmd}`
+  puts '-'*25
+end
+

data/bin/update_s3_index

@@ -1,12 +1,38 @@
 #!/usr/bin/env ruby
 
+
 THIS_FILE = File.symlink?(__FILE__) ? File.readlink(__FILE__) : __FILE__
 require File.expand_path(File.join(File.dirname(THIS_FILE), '..', 'lib', 's3_html_indexer'))
 
-raise "ERROR: you must define AWS_IMAGE_BUCKET in you environment. " unless ENV["AWS_IMAGE_BUCKET"]
 raise "ERROR: you must define AWS_ACCESS_KEY_ID in you environment. " unless ENV["AWS_ACCESS_KEY_ID"]
 raise "ERROR: you must define AWS_SECRET_ACCESS_KEY in you environment. " unless ENV["AWS_SECRET_ACCESS_KEY"]
 
-indexer = RightImageTools::S3HtmlIndexer.new(ENV["AWS_IMAGE_BUCKET"], ENV["AWS_ACCESS_KEY_ID"], ENV["AWS_SECRET_ACCESS_KEY"])
-indexer.to_html("index.html")
-indexer.upload_index("index.html")
+aws_image_bucket = ARGV.shift || ENV["AWS_IMAGE_BUCKET"]
+raise "ERROR: you must pass in the bucket to generate an index for. pass in all to generate index for all buckets" unless aws_image_bucket
+
+if aws_image_bucket.downcase == "all"
+  buckets = %w(
+    rightscale-rightimage-base
+    rightscale-rightimage-base-dev
+    rightscale-cloudstack
+    rightscale-cloudstack-dev
+    rightscale-openstack
+    rightscale-openstack-dev
+    rightscale-eucalyptus
+    rightscale-eucalyptus-dev
+    rightscale-ec2
+    rightscale-ec2-dev
+    rightscale-google
+    rightscale-google-dev
+    rightscale-azure
+    rightscale-azure-dev
+  )
+else
+  buckets = [aws_image_bucket]
+end
+
+buckets.each do |b|
+  indexer = RightImageTools::S3HtmlIndexer.new(b,  ENV["AWS_ACCESS_KEY_ID"], ENV["AWS_SECRET_ACCESS_KEY"])
+  indexer.to_html("index.html")
+  indexer.upload_index("index.html")
+end

data/lib/azure_helper.rb

@@ -0,0 +1,90 @@
+module AzureHelper
+    RS_LINUX_ACCOUNTS = %w(
+    rightscalewestus
+    rightscaleeastus
+    rightscaleeastasia
+    rightscalesoutheastasia
+    rightscalenortheurope
+    rightscalewesteurope
+  )
+  RS_WINDOWS_ACCOUNTS = %w(
+    rightscalewestuswin
+    rightscaleeastuswin
+    rightscaleeastasiawin
+    rightscaleseasiawin
+    rightscalenortheuropewin
+    rightscalewesteuropewin
+  )
+  AZURE_LINUX_LOCATIONS = {
+    'rightscalewesteurope' => 'West Europe',
+    'rightscalesoutheastasia' => 'Southeast Asia',
+    'rightscaleeastasia' => 'East Asia',
+    'rightscalenortheurope' => 'North Europe',
+    'rightscalewestus' => 'West US',
+    'rightscaleeastus' => 'East US'
+  }
+#  AZURE_WINDOWS_LOCATIONS = {
+#    'westeuropewin' => 'West Europe',
+#    'seasiawin' => 'Southeast Asia',
+#    'eastasiawin' => 'East Asia',
+#    'northeuropewin' => 'North Europe',
+#    'westuswin' => 'West US',
+#    'eastuswin' => 'East US'
+#  }
+  def api_dump(api, method_name, *args)
+    result = api.__send__(method_name, *args)
+  ensure
+    puts "--- #{method_name} ---"  
+    if api.request
+      puts "verb:         #{api.request.verb}"
+      puts "path:         #{api.request.path.inspect}"
+      puts "req headers:  #{api.request.headers.inspect}"
+      puts "req body:     #{api.request.body.inspect}"
+      puts " "
+      if api.response
+        puts "resp code:    #{api.response.code.inspect}"
+        puts "resp headers: #{api.response.headers.inspect}"
+        puts "resp body:    #{api.response.body.inspect}"
+        puts " "
+        pp result
+      end
+      puts "==========================================================================="
+    end
+  end
+
+  def lookup_password(account)
+    credsfile = "~/.azurecreds.yml"
+    creds_msg = <<-EOF
+    Please set up a #{credsfile} file in the following format:
+    <service account name1>: <shared key2>
+    <service account name1>: <shared key2>
+    EOF
+    begin
+      creds = YAML.load_file(File.expand_path(credsfile))
+    rescue
+      puts creds_msg
+      exit 1
+    end
+    password = creds[account]
+    unless password
+      puts "Can not find creds for account #{account} in file"
+      puts creds_msg
+      exit 1
+    end
+    password
+  end
+
+  def parse_url(url)
+    uri = URI.parse(url)
+    path = uri.path.reverse.chomp("/").reverse
+    (container, blob) = path.split("/",2)
+    account = uri.host.split(".").first
+#    puts "ACCOUNT: #{account}"
+#    puts "CONTAINER: #{container}"
+#    puts "BLOB NAME: #{blob}"
+
+    password = lookup_password(account)
+    endpoint = "https://#{account}.blob.core.windows.net"
+    return [account,password,endpoint,container,blob]
+  end
+end

data/lib/mci.rb

@@ -46,27 +46,30 @@ module RightImageTools
     # Adds an image to an mci, if the image is not already attached to the mci
     #
     # === Parameters
-    # image_id(String)
-    # cloud_id(Number)
-    # mci_name(String) 
+    # image_id(String) - rightscale id of the image to add, which will equal
+    #                    the ami-id for amazon and the resource_uid for other clouds
+    # cloud_id(Number) - rightscale if of the cloud
+    # mci_name(String) - name of the mci to add this image to
+    # mci_id(String)   - or (optionally) the rightscale id to add this image to
+    # instance_type    - default instance type of the image, if not supplied
+    #                    can usually guess
     #
     # === Return
     # mci(MultiCloudImageCloudSettingInternal):: new or existing MCI setting
     def add_image_to_mci(options)
-      cloud_id = options[:cloud_id].to_i 
-      image_id = options[:image_id]
+      cloud_id = options[:cloud_id].to_i
+      image_id = options[:image_id].to_s
       mci_name = options[:name] || options[:mci_name]
       mci_id   = options[:mci_id] || options[:id]
       description = options[:description]
 
       raise ArgumentError, ":cloud_id not supplied" unless cloud_id > 0
       raise ArgumentError, ":image_id not supplied" unless image_id =~ /./
-      raise ArgumentError, "MCI name (:name) or id (:mci_id) not supplied" unless (mci_name =~ /./ || mci_id =~ /^\d+$/)
-      raise ArgumentError, "MCI (:mci_id) supplied but an integer" if mci_id and mci_id !~ /^\d+$/
-
-      image_id = image_id.split("/").last
+      raise ArgumentError, "MCI name (:name) or id (:mci_id) not supplied" unless (mci_name =~ /./ || mci_id.to_s =~ /^\d+$/)
+      raise ArgumentError, "MCI (:mci_id) supplied but an integer" if mci_id and mci_id.to_s !~ /^\d+$/
 
       if api_version(cloud_id) == "1.0"
+        image_id = image_id.split("/").last
         unless image_id =~ /^ami-[0-9a-z]+$/
           raise ArgumentError, "image_id #{image_id} doesn't look like an amazon ami"
         end
@@ -77,9 +80,7 @@ module RightImageTools
       #validate_mci_name(mci_name) unless mci
       mci = create_mci(cloud_id, mci_name, description) unless mci
       add_rightlink_tag(mci)
-      mci_setting = find_or_create_cloud_setting(mci, image_id, cloud_id) 
-
-      # Create the MCIs, if they don't exist.
+      mci_setting = find_or_create_cloud_setting(mci, image_id, cloud_id, options)
 
       return mci.href
     end
@@ -87,44 +88,75 @@ module RightImageTools
     def validate_mci_name(name)
     end
 
-    def guess_instance_type(mci_name)
-      mci_name =~ /i386/ ? "m1.small" : "m1.large"
-    end
-
     def find_cloud_setting(mci,cloud_id)
-      mci_setting = nil
-      mci_setting = mci.multi_cloud_image_cloud_settings.select { |setting| setting.cloud_id.to_i == cloud_id.to_i }.first
+      mci.multi_cloud_image_cloud_settings.find { |s| s.cloud_id.to_i == cloud_id.to_i }
     end
 
-    def find_or_create_cloud_setting(mci, image_id, cloud_id)
-      mci_setting = nil;
+    def guess_default_instance_type(cloud_id)
       if api_version(cloud_id) == "1.0"
-        mci_setting = find_cloud_setting(mci, cloud_id)
-        instance_type = guess_instance_type(mci.name)
-
-        if mci_setting
-          unless mci_setting.image_href.include?(image_id)
-            @logger.warn("Replacing image for cloud #{cloud_id} for MCI #{mci.rs_id}")
-            res = mci_setting.destroy
-            raise "Non success code returned #{res.inspect} " if res.code.to_s !~ /^2\d\d$/
-            create_cloud_setting(mci, image_id, cloud_id, instance_type)
+        return "m1.small"
+      else
+        names = ["small instance", "1gb server", "nano-h-5", "standard.small", "small", "standard", "n1-standard-1-d", "m1.small", "s2", "1g" ]
+        types = McInstanceType.find_all(cloud_id)
+        type = types.find { |t| names.include? t.name.downcase }
+        raise "Could not guess default instance type for cloud #{cloud_id}" unless type
+        return type.href
+      end
+    end
+
+    def find_or_create_cloud_setting(mci, image_id, cloud_id, options = {})
+      #      debugger
+      mci_setting = find_cloud_setting(mci, cloud_id)
+      instance_type = options[:instance_type] || guess_default_instance_type(cloud_id)
+
+      if mci_setting
+        unless setting_exists?(mci_setting, image_id, cloud_id)
+          @logger.warn("Replacing image for cloud #{cloud_id} for MCI #{mci.rs_id}")
+          dummy_setting = nil
+          if mci.multi_cloud_image_cloud_settings.length <= 1
+            dummy_setting = create_dummy_setting(mci, cloud_id)
           end
-        else
-          @logger.info("Adding cloud images to MCI #{mci.href}")
-          mci_setting = create_cloud_setting(mci, image_id, cloud_id, instance_type)
-          #returns nil
+          res = mci_setting.destroy
+          raise "Non success code returned #{res.inspect} " if res.code.to_s !~ /^2\d\d$/
+            mci_setting = create_cloud_setting(mci, image_id, cloud_id, instance_type)
+          destroy_dummy_setting(dummy_setting) if dummy_setting
         end
-      else 
-        raise NotImplementedError, "API 1.5 not supported yet"
+      else
+        @logger.info("Adding cloud images to MCI #{mci.href}")
+        mci_setting = create_cloud_setting(mci, image_id, cloud_id, instance_type)
+        #returns nil
       end
       mci_setting
     end
 
-    def create_cloud_setting(mci, image_id, cloud_id, instance_type = nil)
+    def setting_exists?(mci_setting, image_id, cloud_id)
+      if api_version(cloud_id) == "1.0"
+        return mci_setting.image_href.include?(image_id)
+      else
+        image = McImage.find_all(cloud_id.to_i).find { |img| img.resource_uid.to_s == image_id.to_s }
+        raise "No image found for cloud #{cloud_id} with id #{image_id}" unless image
+        return mci_setting.image == image.href
+      end
+    end
+
+    # Create dummy/destroy dummy settings get around a bug in which we have to replace
+    # the (lone) setting for an MCI but can't delete it since its the last one left
+    # So temporarily add a dummy image to get around the check, then delete it right
+    # after
+    def create_dummy_setting(mci, cloud_id)
+      dummy_cloud_id = cloud_id.to_i == 1 ? 2 : 1
+      dummy_image_id = dummy_cloud_id == 1 ? "ami-41814f28" : "ami-f45beff5"
+      create_cloud_setting(mci, dummy_image_id, dummy_cloud_id, "m1.small")
+    end
+
+    def destroy_dummy_setting(setting)
+      setting.destroy
+    end
+
+    def create_cloud_setting(mci, image_id, cloud_id, instance_type)
       mci_setting = nil
       if api_version(cloud_id) == "1.0"
         # create the setting
-        #update_connection_settings(MultiCloudImageInternal)
         image_href = "#{@api_url}/ec2_images/#{image_id}?cloud_id=#{cloud_id}"
         mci_setting = MultiCloudImageCloudSettingInternal.create(
           :multi_cloud_image_href  => mci.href,
@@ -132,62 +164,55 @@ module RightImageTools
           :ec2_image_href          => image_href, 
           :aws_instance_type       => instance_type)
       else 
-        raise NotImplementedError, "API 1.5 not supported yet"
+        image = McImage.find_all(cloud_id.to_i).find { |img| img.resource_uid.to_s == image_id.to_s }
+        raise "No image found for cloud #{cloud_id} with id #{image_id}" unless image
+        @logger.debug("Found image id #{image_id} with href #{image.href}")
+        mci_id = mci.href.split("/").last
+        #        debugger
+        mci_setting = McMultiCloudImageSetting.create(mci_id,
+          :cloud_href => "/api/clouds/#{cloud_id}",
+          :image_href => image.href,
+          :instance_type_href => instance_type)
       end
       mci_setting
     end
 
     # return MultiCloudImageInternal, or nil
-    def find_mci_by_id(cloud_id,mci_id)
-      if api_version(cloud_id) == "1.0"
-        existing_mci = MultiCloudImageInternal.find(mci_id.to_i)
-      else
-        existing_mci = McMultiCloudImage.find(mci_id.to_i)
-      end
+    def find_mci_by_id(cloud_id, mci_id)
+      existing_mci = MultiCloudImage.find(mci_id.to_i)
+      existing_mci.find_and_flatten_settings
       raise ArgumentError, "Could not find #{existing_mci.rs_id}" unless existing_mci
       @logger.info("Using mci #{existing_mci.rs_id} named #{existing_mci.name}")
       existing_mci
     end
 
     def find_mci(cloud_id, mci_name)
-      mcis = []
-      if api_version(cloud_id) == "1.0"
-        #update_connection_settings(MultiCloudImage)
-        mcis = MultiCloudImage.find_all.
-          select {|n| n.is_head_version && n.name == mci_name }
-        mci_ids = mcis.map { |m| m.rs_id }
-        @logger.warn("Found multiple MCIs with name #{mci_name}: #{mci_ids.join(', ')}") if mcis.length > 1
-        if mcis.length > 0
-          existing_mci = MultiCloudImageInternal.find(mcis.first.rs_id.to_i)
-        end
-      else
-        # Double filter, find_with_filter is a wildcard ended match
-        # Also revision 0 is HEAD
-        #update_connection_settings(McMultiCloudImage)
-        mcis = McMultiCloudImage.
-          find_with_filter(:name=>mci_name).
-          select {|mci| mci.name == mci_name}.
-          select {|mci| mci.revision == 0}
-        @logger.warn("Found multiple MCIs with name #{mci_name}") if mcis.length > 1
+      mcis = MultiCloudImage.find_all.
+        select {|n| n.is_head_version && n.name == mci_name }
+      mci_ids = mcis.map { |m| m.rs_id }
+      @logger.warn("Found multiple MCIs with name #{mci_name}: #{mci_ids.join(', ')}") if mcis.length > 1
+      if mcis.length > 0
         existing_mci = mcis.first
+        existing_mci.find_and_flatten_settings
+        @logger.info("Found mci #{existing_mci.rs_id}") if existing_mci
+        return existing_mci
+      else
+        return nil
       end
-
-      @logger.info("Found mci #{existing_mci.rs_id}") if existing_mci
-      existing_mci
     end
 
     def create_mci(cloud_id, mci_name, description = nil)
       description ||= default_description(mci_name, api_version(cloud_id) == "1.0")
       @logger.info("Creating mci #{mci_name}")
-      mci = nil
 
-      #update_connection_settings(MultiCloudImageInternal)
       mci = MultiCloudImageInternal.create(
         :name        => mci_name,
         :description => description)
 
-      raise "Could not create MCI" unless mci
-      mci
+        raise "Could not create MCI" unless mci
+        mci = MultiCloudImage.find(mci.rs_id.to_i)
+        mci.find_and_flatten_settings
+        return mci
     end
 
     def add_rightlink_tag(mci)
@@ -202,7 +227,6 @@ module RightImageTools
         @logger.info "Adding tag #{tag} to #{mci.href}"
         href = mci.href
         result = Tag.set(href, ["#{tag}"])
-        #update_connection_settings(Tag)
         @logger.debug("Successfully tagged MCI. Code: #{result.code}")
       rescue Exception => e
         @logger.error("Failed to tag MCI #{mci.name}! #{e.inspect}")

data/lib/s3_html_indexer.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
+#require 'ruby-debug'
 require 'right_aws'
+require 'pp'
 
 module RightImageTools
 
@@ -8,29 +10,56 @@ module RightImageTools
   def initialize(bucket, id=nil, key=nil)
     @s3 = RightAws::S3.new(id, key)
     @dev_bucket = bucket.downcase.include?("dev")
+    
+    # If the bucket holds base images.
+    @base_bucket = bucket.downcase.include?("rightimage-base")
+
+    # If the bucket holds reports for the public clouds, ec2, Google, or Azure.
+    @public_bucket = bucket.downcase =~ /ec2|google|azure/
+
+    @cloudstack_bucket = bucket.downcase.include?("cloudstack")
     @bucket = @s3.bucket(bucket)
     @keys = @bucket.keys
     @auto_hash = Hash.new{ |h,k| h[k] = Hash.new &h.default_proc }
   end
 
-  def ver(key)
-    key.match(/v[0-9]+\.[0-9]+\.[0-9]+/).to_s
-  end
-  
   def to_html(filename)
     # Create hash hierarchy from bucket list
-    @keys.reject! { |path| path.full_name =~ /index.html/ }
     #@keys.sort! {|x,y| ver(x.full_name) <=> ver(y.full_name) }  #TODO: sort by rightlink version
     @keys.each do |path| 
       
       next unless is_public?(path)
+
+      path_key = path.full_name
+      # Ignore index.html and report_viewer.html .
+      next if path_key =~ /index.html/
+      next if path_key =~ /report_viewer.html/
+      path_key.gsub!('xen/','xenserver/')
+      path_key.gsub!(/(vmware|esxi)\/(vmware|esxi)\//,'esxi/')
+      path_key.gsub!('vmware/','esxi/')
+
+      #if path_key.split("/").size != 5
+      #  puts "WARNING: Skipping malformed path: #{path}"
+      #  next
+      #end
+
+      # Skip files if they are too small to be an image.
+      # Except for mega cloud buckets that collect reports.
+      if path.size.to_i < 1024*1024*100 and not @public_bucket
+        puts "WARNING: Skipping #{path}: it appears to be too small (<100 MB) to be an image"
+        next
+      end
       
       sub = @auto_hash
-      path.full_name.split( "/" ).each do |dir| 
+      path_key.split( "/" ).each do |dir| 
         sub = sub[dir] 
       end
       
-      sub[:link] = fix_public_endpoint(path.public_link)
+      # Retrieve image and report links duple.
+      links = fix_public_endpoint(path.public_link)
+
+      sub[:link] = links[0]
+      sub[:report] = links[1]
       sub[:size] = path.size
       sub[:date] = path.last_modified.strftime("%m/%d/%Y")
       sub[:md5sum] = path.e_tag.gsub(/\"/, "")
@@ -48,27 +77,49 @@ module RightImageTools
       add_style
       display_dirs(k,v)
       output("</html>")
+      puts "Output written to #{@file.path}"
       @file.close
     end
   end
   
   def upload_index(filename)
-    @bucket.put("index.html", File.open(filename), {}, 'public-read')
+    # 
+    if File.exists?("index.html")
+      @bucket.put("index.html", File.open(filename), {}, 'public-read')
+      File.delete("index.html")
+
+      # Upload amalgamated report_viewer.html with index.html.
+      Dir.chdir(File.join(File.dirname(File.expand_path(__FILE__)), "..", "ui", "build"))
+      @bucket.put("report_viewer.html", File.open("report_viewer.html"), {}, 'public-read')
+    else
+      # Upload index.html for empty buckets.
+      Dir.chdir(File.join(File.dirname(File.expand_path(__FILE__)), "..", "ui", "build"))
+      @bucket.put("index.html", File.open("empty_bucket_index.html"), {}, 'public-read')
+      puts "Uploaded empty bucket index.html."
+    end
   end
   
   private 
+    def ver(key)
+      key.match(/v[0-9]+\.[0-9]+\.[0-9]+/).to_s
+    end
   
     def is_public?(key)
       key.refresh    
-      puts "Key: #{key.name}"
+#      puts "Key: #{key.name}"
+      is_public = false
       key.grantees.each do |g|
-        puts "grantee:#{g.name} perms:#{g.perms}"
+#        puts "grantee:#{g.name} perms:#{g.perms}"
         if g.name.to_s == "AllUsers" && g.perms.to_s == "READ"
-          puts "Is public!!!" 
-          return true
+          is_public = true
         end
       end
-      false
+      if is_public
+        puts "PUBLIC: #{key.name}"
+      else
+        puts "NOT PUBLIC: #{key.name}"
+      end
+      return is_public
     end
     
     def display_dirs(k,v,level=0)
@@ -81,19 +132,47 @@ module RightImageTools
         add_footer(k, level)
       else
         output("<tr class='code'>")
-        output("<td><a href='#{v[:link]}'>#{k}</a></td>")
-        output("<td>#{v[:size].to_i/(1024*1024)}MB</td>")
-        output("<td>#{v[:date]}</td>")
-         output("<td>#{v[:md5sum]}</td>")
+        # Link to images stored on S3 bucket.
+        if not @public_bucket
+          output("<td><a href='#{v[:link]}'>#{k}</a></td>")
+        # Otherwise, the bucket only collects reports.
+        else
+          # Remove '.js.' extension in public cloud buckets.
+          kp = k.gsub(/\.js$/,"")
+          output("<td>#{kp}</td>")
+        end
+        # If bucket does not have report key, do not add "notes" link.
+        if not v[:report].empty?
+          output("<td><a href='#{v[:report]}'>notes</a></td>")
+        else
+          # Empty 'notes' cell.
+          output("<td></td>")
+        end
+        # Hide fields for public cloud images.
+        if not @public_bucket
+          output("<td>#{v[:size].to_i/(1024*1024)}MB</td>")
+          output("<td>#{v[:date]}</td>")
+          output("<td>#{v[:md5sum]}</td>")
+        else
+          output("<td>#{v[:date]}</td>")
+        end
         output("</tr>")
       end
     end
-        
+    
+    # Refer to "Base Images" or "RightImages" based on bucket. 
     def disclaimer
       if @dev_bucket
-        "The following RightImages are currently in RightScale development and testing.  They are not supported by RightScale.  For RightImages that RightScale supports, please see our <a href='http://rightscale-cloudstack.s3-website-us-west-1.amazonaws.com/index.html'>production images</a>"
+        prod_bucket = @bucket.name.sub("-dev","")
+        disclaimer = "The following "
+        disclaimer <<  (@base_bucket ? "Base Images" : "RightImages")
+        disclaimer << " are currently in RightScale development and testing.  They are not supported by RightScale.  For "
+        disclaimer <<  (@base_bucket ? "Base Images" : "RightImages")
+        disclaimer << " that RightScale supports, please see our <a href='http://#{prod_bucket}.s3.amazonaws.com/index.html'>production images</a>."
       else
-        "The following RightImages are tested and supported by RightScale for general use.  For further information regarding use of these images with RightScale, please contact your RightScale account manager or sign up for an account at <a href='http://www.rightscale.com'>www.rightscale.com</a>."
+        disclaimer = "The following "
+        disclaimer <<  (@base_bucket ? "Base Images" : "RightImages")
+        disclaimer << " are tested and supported by RightScale for general use.  For further information regarding use of these images with RightScale, please contact your RightScale account manager or sign up for an account at <a href='http://www.rightscale.com'>www.rightscale.com</a>."
       end
     end
     
@@ -110,22 +189,35 @@ module RightImageTools
       when 1
         # Hypervisor 
         output("<div class='hypervisor common'>")
-        output("<h#{level-1}>#{str.upcase} Hypervisor</h#{level-1}>\n")
+        # Include "Hypervisor" in subheader if not base image bucket.
+        if @base_bucket
+          output("<h#{level-1}>#{str.upcase}</h#{level-1}>\n")          
+        else
+          output("<h#{level-1}>#{str.upcase} Hypervisor</h#{level-1}>\n")
+        end
         output("</div>")
         output("<div class='platform common'>")
         output("<table style='padding:none; size:90%'>")
         output("<tr style='border: solid 1px black;'>")
         output("<th style='text-align:left'>Image</th>")
-        output("<th>Size</th>")
-        output("<th>Date</th>")
-        output("<th>MD5</th>")
+        # Leave 'Notes' header empty.
+        output("<th></th>")
+        if not @public_bucket
+          output("<th>Size</th>")
+          output("<th>Date</th>")
+          output("<th>MD5</th>")
+        else
+          output("<th>Date</th>")
+        end
         output("</tr>")
       when 2
         return
         # OS
       when 3
         return
+        # OS Version
       else
+        return
         # image
         # output("<div class='platform'>")
       end
@@ -145,25 +237,55 @@ module RightImageTools
       when 3
         return
       else
+        return
         # output("</div>")
       end
     end
 
     # https://s3.amazonaws.com/rightscale-cloudstack/foo
     # to
-    # https://rightscale-cloudstack.s3.amazonaws.com 
+    # http://rightscale-cloudstack.s3.amazonaws.com 
     def fix_public_endpoint(link)
+      link = link.dup
+      # http apparently more reliable than https when importing cloudstack images (w-4839)
+      if @cloudstack_bucket
+        link.sub!("https","http")
+        link.sub!(":443","")
+      end
       link_ary = link.split("/")
       bucket = link_ary[3]
       host = link_ary[2]
       link_ary[2] = "#{bucket}.#{host}"
       link_ary.delete_at(3)
-      link_ary.join("/")
+      new_link = link_ary.join("/")
+
+      # Relative link to report.
+      link_ary.slice!(1..2)
+
+
+      
+
+      #!!! Change the (usually double) compressed image extension to ".js".
+      #if not @public_bucket
+      #  link_ary[-1].gsub!(/\.[^.]+\.[^.]+$/,'.js')
+      #end
+
+      # If report doesn't exist, return empty string.
+      # Relative url begins at link_ary[1].
+      if not RightAws::S3::Key.create(@bucket,link_ary.slice(1..-1).join("/").gsub!(/\.[^.]+\.[^.]+$/,'.js')).exists?
+       return [new_link , '']
+      end
+
+      # Replace "https://" with image viewer prefix.
+      link_ary[0] = 'report_viewer.html?image='
+      report_link = link_ary.join("/")
+
+      # Return image link and report link.
+      return [new_link , report_link]
     end
     
     def output(str)
       @file.write "#{str}\n" if @file
-      p str
     end
 
     def add_style
@@ -176,14 +298,14 @@ module RightImageTools
     th { text-align:center }
 
     #header {
-    	background:#235186; 
-    	padding:2px 20px; 
-    	position:relative; 
-    	height:25px;
+        background:#235186; 
+        padding:2px 20px; 
+        position:relative; 
+        height:25px;
     }
 
     #header #logo {
-    	margin-top:3px; 
+        margin-top:3px; 
     }
 
     .common {
@@ -191,39 +313,39 @@ module RightImageTools
       margin-left:auto;
       margin-right:auto;
       font-weight: bold;
-    	padding:2px 20px; 
-    	position:relative; 
+        padding:2px 20px; 
+        position:relative; 
     }
 
     .bucket {
       font-size: 24px;
       color: #F5F2A9;
-    	background:#235186; 
-    	padding:10px 30px 20px; 
+        background:#235186; 
+        padding:10px 30px 20px; 
     }
    
     .version {
       color: #F5F2A9;
-    	background:#235186; 
+        background:#235186; 
     }
 
     .hypervisor {
       color: #235186;
-    	background:#F5F2A9; 
+        background:#F5F2A9; 
     }
 
     .platform {
-    	background: #FFFFFF;
-    	width:90%;
-    	margin-left: auto ;
+        background: #FFFFFF;
+        width:90%;
+        margin-left: auto ;
       margin-right: auto ;
       position: relative;
     }
     
     .disclaimer {
-    	background: #FFFFFF;
-    	width:90%;
-    	margin-left: auto ;
+        background: #FFFFFF;
+        width:90%;
+        margin-left: auto ;
       margin-right: auto ;
       position: relative;
       border: 2px solid black;
@@ -231,10 +353,10 @@ module RightImageTools
     }
     
     .code {
-    	font-family:'Courier New', monospace;
-    	color: #000000;
-    	position:relative;
-    	left:10px;
+        font-family:'Courier New', monospace;
+        color: #000000;
+        position:relative;
+        left:10px;
     }
     ")
       output "</style>"
@@ -245,7 +367,4 @@ module RightImageTools
     end
   
   end
-end
-
-
-  
+end