openstudio-aws 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: efb7b51f623a6281881c9a2dc12e481b79f6b421
-  data.tar.gz: 7faf36a9857a0251fc291b61bbb7c591e76319e9
+  metadata.gz: 80a7d0fb0cfb2e9591bdecbab513beb25963a318
+  data.tar.gz: 5d94a084883970ce98d5c02266e7c92b92eb0a48
 SHA512:
-  metadata.gz: e2ff331d5294a79f0e2afdc7ad1a99f2d2ce5647a78d2e49e1ed6fd0c0f1fcf5a781958eb8d04b86b782b33d11290207adcd55200adb31a516941cd0f6248a7b
-  data.tar.gz: aeff692fe3684060a92c24408a1af49a614f71485db974f15c55c4aa9be8756e699cb8f43e361d517871f177eeb0cc944e24ca08373c29fb626173d11a47ed59
+  metadata.gz: a8d73ffcc32f05a0cd1331c9626f9062ef8302c5815d6beca23ed850add4f789309365958e0f478972dcf448617577faa26050538032926bfa23fcc707a179bb
+  data.tar.gz: 7d77ff39607f83f0d3ab66f6d7f2f59c9266b0c9334839ef61e97b7f4a718c7639a0f0efc53840e207892754c3e100ca2d88bb777fd1cc25329a904dd54b9791

data/lib/openstudio-aws.rb

@@ -4,6 +4,7 @@ require 'net/http'
 require 'yaml'
 require 'logger'
 require 'semantic'
+require 'semantic/core_ext'
 
 # AWS SDK CORE
 begin

data/lib/openstudio/aws/config.rb

@@ -11,7 +11,7 @@ module OpenStudio
           @yml_config_file = File.join(File.expand_path("~"), "aws_config.yml")
           if !File.exists?(@yml_config_file)
             write_config_file
-            puts "No Config File in user home directory. A template has been added, please edit and save: #{@yml_config_file}"
+            raise "No Config File in user home directory. A template has been added, please edit and save: #{@yml_config_file}"
             exit 1
           end
         end

data/lib/openstudio/aws/version.rb

@@ -1,6 +1,5 @@
 module OpenStudio
   module Aws
-    VERSION = "0.1.16"
-    OPENSTUDIO_VERSION = "1.2.1"
+    VERSION = "0.1.17"
   end
 end

data/lib/openstudio/lib/ami_list.rb

@@ -20,6 +20,7 @@
 
 # Class for managing the AMI ids based on the openstudio version and the openstudio-server version
 
+
 class OpenStudioAmis
   VALID_OPTIONS = [
       :openstudio_version, :openstudio_server_version, :host, :url
@@ -36,7 +37,7 @@ class OpenStudioAmis
         :openstudio_version => 'default', 
         :openstudio_server_version => 'default',
         :host => 'developer.nrel.gov',
-        :url => '/downloads/buildings/openstudio/server'
+        :url => '/downloads/buildings/openstudio/rsrc'
     }
     @version = version
     @options = defaults.merge(options)
@@ -97,7 +98,13 @@ class OpenStudioAmis
     amis = nil
     if @options[:openstudio_server_version].to_sym == :default
       # just grab the most recent server
+      # need to do a sort to get the most recent because we can't promise that they are in order
+      json[:openstudio].each do |k,v|
+        
+        
+      end
       key, value = json[:openstudio_server].first
+      
       amis = value[:amis]
       #puts json.inspect
     else

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -249,9 +249,9 @@ class OpenStudioAwsWrapper
   end
 
   def launch_server(image_id, instance_type, options = {})
-    defaults = { :user_id => "unknown_user" }
+    defaults = {:user_id => "unknown_user"}
     options = defaults.merge(options)
-    
+
     user_data = File.read(File.expand_path(File.dirname(__FILE__))+'/server_script.sh')
     @server = OpenStudioAwsInstance.new(@aws, :server, @key_pair_name, @security_group_name, @group_uuid, @private_key, @proxy)
 
@@ -261,9 +261,9 @@ class OpenStudioAwsWrapper
   end
 
   def launch_workers(image_id, instance_type, num, options = {})
-    defaults = { :user_id => "unknown_user" }
+    defaults = {:user_id => "unknown_user"}
     options = defaults.merge(options)
-    
+
     user_data = File.read(File.expand_path(File.dirname(__FILE__))+'/worker_script.sh.template')
     user_data.gsub!(/SERVER_IP/, @server.data.ip)
     user_data.gsub!(/SERVER_HOSTNAME/, 'master')
@@ -355,26 +355,26 @@ class OpenStudioAwsWrapper
   # new ami list
   def create_new_ami_json(version = 1)
     # get the list of existing amis from developer.nrel.gov
-    existing_amis = OpenStudioAmis.new(version).list
+    existing_amis = OpenStudioAmis.new(1).list
 
     # list of available AMIs from AWS
     available_amis = describe_amis()
 
     amis = transform_ami_lists(existing_amis, available_amis)
-    
+
     if version == 1
       version1 = {}
 
       # grab the old AMIs that are in the 0.0.1 section
-      amis[:openstudio_server]["0.0.1".to_sym].each do |a|
-        next if a[:deprecate]
+      #amis[:openstudio_server]["0.0.1".to_sym].each do |a|
+      #  next if a[:deprecate]
 
-        version1[a[:openstudio_version]] = a[:amis]
-      end
+      #  version1[a[:openstudio_version]] = a[:amis]
+      #end
 
       # now grab the good keys - they should be sorted newest to older... so go backwards
       amis[:openstudio_server].keys.reverse.each do |key|
-        next if key == "0.0.1".to_sym
+        next if amis[:openstudio_server][key][:deprecate]
 
         a = amis[:openstudio_server][key]
         # this will override any of the old ami/os version
@@ -384,22 +384,23 @@ class OpenStudioAwsWrapper
       # create the default version. First sort, then grab the first hash's values
       puts JSON.pretty_generate(version1)
       default_v = nil
-      version1.each do |k,v|
+      version1.each do |k, v|
         default_v ||= k
         # todo: add a check if the AMI is not marked as invalid 
-        if Semantic::Version.new(k.to_s) >= Semantic::Version.new(default_v.to_s)
-          default_v = k  
+        if k.to_s.to_version >= default_v.to_s.to_version
+          default_v = k
         end
       end
       puts JSON.pretty_generate(version1)
-      
+
       version1[:default] = version1[default_v]
       puts JSON.pretty_generate(version1)
-      
+
       amis = version1
-      
+
     elsif version == 2
       # don't need to transform anything right now
+      puts JSON.pretty_generate(amis)
     end
 
     amis
@@ -422,38 +423,65 @@ class OpenStudioAwsWrapper
     out
   end
 
-  private
+  # take the base version and increment the patch until
+  def get_next_version(base, list_of_svs)
+    b = base.to_version
+
+    # first go through the array and test that there isn't any other versions > that in the array
+    list_of_svs.each do |v|
+      b = v.to_version if v.to_version.satisfies("#{b.major}.#{b.minor}.*") && v.to_version.patch > b.patch
+    end
+
+    # get the max version in the list_of_svs
+    while list_of_svs.include?(b.to_s)
+      b.patch += 1
+    end
+
+    # return the value back as a string
+    b.to_s
+  end
+
+  protected
 
   # transform the available amis into an easier to read format
   def transform_ami_lists(existing, available)
     # initialize ami hash
+    puts existing.inspect
+    puts available.inspect
+
     amis = {:openstudio_server => {}, :openstudio => {}}
-    
+    list_of_svs = []
+
     available[:images].each do |ami|
       sv = ami[:tags_hash][:openstudio_server_version]
-      sv = "0.0.1" if sv.nil?
-
-      a = nil
-      #initialize hashes
-      if sv == "0.0.1" # unknown is an array
-        amis[:openstudio_server][sv.to_sym] = [] if !amis[:openstudio_server][sv.to_sym]
-        amis[:openstudio_server][sv.to_sym] << {}
-        a = amis[:openstudio_server][sv.to_sym].last
-      else
-        amis[:openstudio_server][sv.to_sym] = {} if !amis[:openstudio_server][sv.to_sym]
-        a = amis[:openstudio_server][sv.to_sym]
+
+
+      if sv.nil? || sv == ""
+        puts "found nil version, incrementing from 0.0.1"
+        sv = get_next_version("0.0.1", list_of_svs)
       end
+      list_of_svs << sv
+
+      puts list_of_svs.inspect
+      amis[:openstudio_server][sv.to_sym] = {} if !amis[:openstudio_server][sv.to_sym]
+      a = amis[:openstudio_server][sv.to_sym]
 
       # initialize ami hash
       a[:amis] = {} if !a[:amis]
 
       # fill in data (this will override data currently)
-      a[:deprecate] = true if sv == "0.0.1"
+      a[:deprecate] = true if sv.to_version.satisfies("0.0.*")
       a[:openstudio_version] = ami[:tags_hash][:openstudio_version] if ami[:tags_hash][:openstudio_version]
       a[:openstudio_version_sha] = ami[:tags_hash][:openstudio_version_sha] if ami[:tags_hash][:openstudio_version_sha]
       a[:user_uuid] = ami[:tags_hash][:user_uuid] if ami[:tags_hash][:user_uuid]
       a[:deprecate] = ami[:tags_hash][:deprecate] if ami[:tags_hash][:deprecate]
       a[:created_on] = ami[:tags_hash][:created_on] if ami[:tags_hash][:created_on]
+      a[:openstudio_server_version] = sv.to_s
+      if ami[:tags_hash][:tested]
+        a[:tested] = ami[:tags_hash][:tested].downcase == "true"
+      else
+        a[:tested] = false
+      end
 
       if ami[:name] =~ /Worker|Cluster/
         if ami[:virtualization_type] == "paravirtual"
@@ -467,25 +495,33 @@ class OpenStudioAwsWrapper
         a[:amis][:server] = ami[:image_id]
       end
     end
+    #puts "Current AMIs: #{JSON.pretty_generate(amis)}"
 
-    # dump the existing amis into the 'unknown category, but don't flag them as 'deprecate'
+    # merge in the existing AMIs the existing amis into the 'unknown category, but don't flag them as 'deprecate'
+    #puts "Existing AMIs: #{JSON.pretty_generate(existing)}"
     existing.keys.each do |ami_key|
       next if ami_key == "default".to_sym # ignore default
 
-      amis[:openstudio_server]["0.0.1".to_sym] = [] if !amis[:openstudio_server]["0.0.1".to_sym]
-      amis[:openstudio_server]["0.0.1".to_sym] << {}
-      a = amis[:openstudio_server]["0.0.1".to_sym].last
+      # get next version
+      next_version = get_next_version("0.0.1", list_of_svs)
+      list_of_svs << next_version
+
+      amis[:openstudio_server][next_version.to_sym] = {} if !amis[:openstudio_server][next_version.to_sym]
+      a = amis[:openstudio_server][next_version.to_sym]
       a[:amis] = {} if !a[:amis]
 
       a[:openstudio_version] = ami_key
       a[:amis][:server] = existing[ami_key][:server]
       a[:amis][:worker] = existing[ami_key][:worker]
       a[:amis][:cc2worker] = existing[ami_key][:cc2worker]
+      a[:openstudio_server_version] = next_version.to_s
     end
 
-    # flip these around for openstudio section
+    puts "After merge: #{JSON.pretty_generate(amis)}"
+    # flip these around for openstudio server section
     amis[:openstudio_server].keys.each do |key|
-      next if key == "0.0.1".to_sym
+      next if key.to_s.to_version.satisfies("0.0.*")
+
       a = amis[:openstudio_server][key]
       ov = a[:openstudio_version]
 
@@ -499,12 +535,24 @@ class OpenStudioAwsWrapper
     end
 
     # sort on the semantic version so that grabbing the key will be the most recent
-    amis[:openstudio_server].sort_by { |k, _| Semantic::Version.new(k.to_s) }
+    amis[:openstudio_server].each do |k, v|
+      puts "K is #{k}"
+      puts "V is #{v}"
+      puts "version is #{v[:openstudio_server_version]}"
+      puts "version is #{v[:openstudio_server_version].class}"
+    end
+
+    # sort the openstudio server version
+    amis[:openstudio_server] = Hash[amis[:openstudio_server].sort_by { |k, v| v[:openstudio_server_version].to_version }.reverse]
 
-    # determine the defaults - for now just grab the most recent in each openstudio version
+    # now sort the openstudio section & determine the defaults
     amis[:openstudio].keys.each do |key|
+      amis[:openstudio][key] = Hash[amis[:openstudio][key].sort_by { |k, _| k.to_s.to_version }.reverse]
       amis[:openstudio][key][:default] = amis[:openstudio][key].keys[0]
     end
+    amis[:openstudio] = Hash[amis[:openstudio].sort_by { |k, _| k.to_s.to_version }.reverse]
+
+    puts "After sort: #{JSON.pretty_generate(amis)}"
 
     amis
   end

data/spec/aws_instances/aws_spec_api.rb

@@ -11,10 +11,6 @@ describe OpenStudio::Aws::Aws do
       @aws.should_not be_nil
     end
 
-    
-    it "should ask the user to create a new config file" do
-    end
-
     it "should create a server" do
       # use the default instance type
       options = {instance_type: "m1.small", image_id: "ami-29faca40"}
@@ -43,7 +39,7 @@ describe OpenStudio::Aws::Aws do
 
       expect(@aws.os_aws.server).not_to be_nil
     end
-
+    
     it "should kill running instances" do
       # how to test this?
     end

data/spec/openstudio-aws/aws_wrapper_spec.rb

@@ -67,18 +67,35 @@ describe OpenStudioAwsWrapper do
         resp = @aws.os_aws.create_new_ami_json(1)
         expect(resp["1.1.3".to_sym][:server]).to eq("ami-fb301292")
         expect(resp["1.2.1".to_sym][:server]).to eq("ami-89744be0")
-        expect(resp["default".to_sym][:server]).to_not eq("ami-89744be0") 
+        expect(resp["default".to_sym][:server]).to_not eq("ami-89744be0")
       end
     end
 
-    context "version 2" do     
+    context "version 2" do
       it "should create a new json" do
         resp = @aws.os_aws.create_new_ami_json(2)
         expect(resp[:openstudio_server]["1.3.1".to_sym][:openstudio_version_sha]).to eq("7a955d780b")
+        expect(resp[:openstudio_server]["1.3.5".to_sym][:tested]).to eq(false)
       end
 
     end
   end
 
+  context "ami list" do
+    before :all do
+      @aws = OpenStudio::Aws::Aws.new
+    end
+
+    it "should get the next version" do
+      expect(@aws.os_aws.get_next_version("0.1.1", [])).to eq("0.1.1")
+      expect(@aws.os_aws.get_next_version("0.1.1", ["0.1.1"])).to eq("0.1.2")
+      expect(@aws.os_aws.get_next_version("0.1.1", ["0.1.1", "0.1.3"])).to eq("0.1.4")
+      expect(@aws.os_aws.get_next_version("0.1.1", ["0.1.1", "0.1.2", "0.1.3"])).to eq("0.1.4")
+      expect(@aws.os_aws.get_next_version("0.1.1", ["0.1.1", "0.1.2", "0.1.3", "0.1.15"])).to eq("0.1.16")
+      expect(@aws.os_aws.get_next_version("0.1.1", ["0.1.1", "0.1.2", "0.1.3", "0.1.15", "3.1.0"])).to eq("0.1.16")
+      expect(@aws.os_aws.get_next_version("0.1.1", ["0.1.1", "0.1.2", "0.1.3", "0.1.15", "3.1.27"])).to eq("0.1.16")
+    end
+  end
+
 
 end

data/spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.4.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws ami lists" tests="2" time="0.251887" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Aws ami lists should allow a different region" time="0.185956">
+  </testcase>
+  <testcase name="OpenStudio::Aws::Aws ami lists should allow a different region" time="0.065729">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.33.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws proxy configuration" tests="3" time="0.234069" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Aws proxy configuration should create an instance" time="0.064862">
+  </testcase>
+  <testcase name="OpenStudio::Aws::Aws proxy configuration should create a AWS instance with a proxy" time="0.098895">
+  </testcase>
+  <testcase name="OpenStudio::Aws::Aws proxy configuration should create a AWS instance with a proxy with username / password" time="0.069974">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Aws-should-error.1.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws should error" tests="1" time="0.077115" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Aws should error should not find a json" time="0.076874">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Aws-version-testing.1.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws version testing" tests="1" time="0.079709" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Aws version testing version 2: should find the right AMIs Server 1.3.1" time="0.07953">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Aws.38.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws" tests="0" time="0.000103" failures="0" errors="0" skipped="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.58.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Config create a new config" tests="1" time="0.000921" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Config create a new config should create a new instance" time="0.000599">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Config.58.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Config" tests="0" time="9.6e-05" failures="0" errors="0" skipped="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAmis-version-1.60.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAmis version 1" tests="3" time="0.206071" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAmis version 1 should default to an ami if nothing passed" time="0.062829">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should return specific amis if passed a version" time="0.072756">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should list all amis" time="0.070175">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAmis-version-2.58.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAmis version 2" tests="1" time="0.000341" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAmis version 2 should default the server version" time="0.000145">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAmis.60.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAmis" tests="0" time="0.000105" failures="0" errors="0" skipped="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsMethods-processors.60.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsMethods processors" tests="2" time="0.000618" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAwsMethods processors should default to 1 with a warning" time="0.000218">
+  </testcase>
+  <testcase name="OpenStudioAwsMethods processors should return known values for various instances" time="0.000175">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsMethods.60.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsMethods" tests="0" time="9.2e-05" failures="0" errors="0" skipped="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.59.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper authenticated session availability" tests="2" time="0.824265" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAwsWrapper authenticated session availability should describe the zones" time="0.493015">
+  </testcase>
+  <testcase name="OpenStudioAwsWrapper authenticated session availability should list number of instances" time="0.331058">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.50.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper authenticated session create new ami json" tests="2" time="0.747267" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAwsWrapper authenticated session create new ami json should describe existing AMIs" time="0.464838">
+  </testcase>
+  <testcase name="OpenStudioAwsWrapper authenticated session create new ami json should describe a specific image" time="0.282185">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.59.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper authenticated session new instance" tests="1" time="0.000362" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAwsWrapper authenticated session new instance should be created" time="0.000205">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.8.xml

@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper authenticated session version 1" tests="1" time="0.37976" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAwsWrapper authenticated session version 1 should create a new json" time="0.379576">
+  </testcase>
+  <system-out>
+{
+  "1.2.1": {
+    "worker": "ami-37744b5e",
+    "cc2worker": "ami-51744b38",
+    "server": "ami-89744be0"
+  },
+  "1.2.0": {
+    "server": "ami-a3edddca",
+    "worker": "ami-bfedddd6",
+    "cc2worker": "ami-b5eddddc"
+  },
+  "1.1.3": {
+    "server": "ami-fb301292",
+    "worker": "ami-21301248",
+    "cc2worker": "ami-d73311be"
+  },
+  "1.1.2": {
+    "server": "ami-89f5d3e0",
+    "worker": "ami-35f2d45c",
+    "cc2worker": "ami-27f2d44e"
+  },
+  "1.1.1": {
+    "server": "ami-955308fc",
+    "worker": "ami-c95308a0",
+    "cc2worker": "ami-a55308cc"
+  },
+  "1.1.0": {
+    "server": "ami-1b376a72",
+    "worker": "ami-970b56fe",
+    "cc2worker": "ami-a30b56ca"
+  },
+  "1.2.2": {
+    "cc2worker": "ami-05a39c6c",
+    "server": "ami-29a29d40",
+    "worker": "ami-f3a39c9a"
+  }
+}
+{
+  "1.2.1": {
+    "worker": "ami-37744b5e",
+    "cc2worker": "ami-51744b38",
+    "server": "ami-89744be0"
+  },
+  "1.2.0": {
+    "server": "ami-a3edddca",
+    "worker": "ami-bfedddd6",
+    "cc2worker": "ami-b5eddddc"
+  },
+  "1.1.3": {
+    "server": "ami-fb301292",
+    "worker": "ami-21301248",
+    "cc2worker": "ami-d73311be"
+  },
+  "1.1.2": {
+    "server": "ami-89f5d3e0",
+    "worker": "ami-35f2d45c",
+    "cc2worker": "ami-27f2d44e"
+  },
+  "1.1.1": {
+    "server": "ami-955308fc",
+    "worker": "ami-c95308a0",
+    "cc2worker": "ami-a55308cc"
+  },
+  "1.1.0": {
+    "server": "ami-1b376a72",
+    "worker": "ami-970b56fe",
+    "cc2worker": "ami-a30b56ca"
+  },
+  "1.2.2": {
+    "cc2worker": "ami-05a39c6c",
+    "server": "ami-29a29d40",
+    "worker": "ami-f3a39c9a"
+  }
+}
+{
+  "1.2.1": {
+    "worker": "ami-37744b5e",
+    "cc2worker": "ami-51744b38",
+    "server": "ami-89744be0"
+  },
+  "1.2.0": {
+    "server": "ami-a3edddca",
+    "worker": "ami-bfedddd6",
+    "cc2worker": "ami-b5eddddc"
+  },
+  "1.1.3": {
+    "server": "ami-fb301292",
+    "worker": "ami-21301248",
+    "cc2worker": "ami-d73311be"
+  },
+  "1.1.2": {
+    "server": "ami-89f5d3e0",
+    "worker": "ami-35f2d45c",
+    "cc2worker": "ami-27f2d44e"
+  },
+  "1.1.1": {
+    "server": "ami-955308fc",
+    "worker": "ami-c95308a0",
+    "cc2worker": "ami-a55308cc"
+  },
+  "1.1.0": {
+    "server": "ami-1b376a72",
+    "worker": "ami-970b56fe",
+    "cc2worker": "ami-a30b56ca"
+  },
+  "1.2.2": {
+    "cc2worker": "ami-05a39c6c",
+    "server": "ami-29a29d40",
+    "worker": "ami-f3a39c9a"
+  },
+  "default": {
+    "cc2worker": "ami-05a39c6c",
+    "server": "ami-29a29d40",
+    "worker": "ami-f3a39c9a"
+  }
+}
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.8.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper authenticated session version 2" tests="1" time="0.478721" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAwsWrapper authenticated session version 2 should create a new json" time="0.478524">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.59.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper authenticated session" tests="0" time="0.073645" failures="0" errors="0" skipped="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.60.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper unauthenticated session" tests="1" time="0.579699" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAwsWrapper unauthenticated session should fail to authenticate" time="0.57955">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudioAwsWrapper.60.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAwsWrapper" tests="0" time="9.3e-05" failures="0" errors="0" skipped="0">
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-02 00:00:00.000000000 Z
+date: 2014-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -84,6 +84,7 @@ files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.1.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.2.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.3.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.4.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.1.xml
@@ -120,6 +121,7 @@ files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.30.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.31.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.32.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.33.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.4.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.5.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.6.xml
@@ -128,8 +130,10 @@ files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.9.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-should-error.0.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-should-error.1.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-should-error.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-version-testing.0.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-version-testing.1.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-version-testing.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-workers-before-server.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-workers-before-server.1.xml
@@ -169,6 +173,7 @@ files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws.35.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.36.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.37.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws.38.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.4.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.5.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.6.xml
@@ -230,6 +235,7 @@ files:
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.55.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.56.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.57.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.58.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.6.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.7.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.8.xml
@@ -289,6 +295,7 @@ files:
 - spec/reports/SPEC-OpenStudio-Aws-Config.55.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.56.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.57.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.58.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.6.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.7.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.8.xml
@@ -351,6 +358,7 @@ files:
 - spec/reports/SPEC-OpenStudioAmis-version-1.58.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.59.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.6.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.60.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.7.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.8.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.9.xml
@@ -409,6 +417,7 @@ files:
 - spec/reports/SPEC-OpenStudioAmis-version-2.55.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.56.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.57.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.58.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.6.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.7.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.8.xml
@@ -471,6 +480,7 @@ files:
 - spec/reports/SPEC-OpenStudioAmis.58.xml
 - spec/reports/SPEC-OpenStudioAmis.59.xml
 - spec/reports/SPEC-OpenStudioAmis.6.xml
+- spec/reports/SPEC-OpenStudioAmis.60.xml
 - spec/reports/SPEC-OpenStudioAmis.7.xml
 - spec/reports/SPEC-OpenStudioAmis.8.xml
 - spec/reports/SPEC-OpenStudioAmis.9.xml
@@ -532,6 +542,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.58.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.59.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.6.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.60.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.7.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.8.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.9.xml
@@ -593,6 +604,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsMethods.58.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.59.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.6.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.60.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.7.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.8.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.9.xml
@@ -652,6 +664,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.56.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.57.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.58.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.8.xml
@@ -703,6 +716,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.48.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.49.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.50.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.8.xml
@@ -763,6 +777,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.56.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.57.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.58.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.8.xml
@@ -776,6 +791,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.5.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.7.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.8.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.1.xml
@@ -785,6 +801,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.5.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.7.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.8.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.1.xml
@@ -841,6 +858,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.56.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.57.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.58.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.8.xml
@@ -914,6 +932,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.58.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.6.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.60.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.8.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.9.xml
@@ -975,6 +994,7 @@ files:
 - spec/reports/SPEC-OpenStudioAwsWrapper.58.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.6.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.60.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.8.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.9.xml
@@ -1015,6 +1035,7 @@ test_files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.1.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.2.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.3.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.4.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-ami-lists.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.1.xml
@@ -1051,6 +1072,7 @@ test_files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.30.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.31.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.32.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.33.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.4.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.5.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.6.xml
@@ -1059,8 +1081,10 @@ test_files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.9.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-proxy-configuration.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-should-error.0.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-should-error.1.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-should-error.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-version-testing.0.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws-version-testing.1.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-version-testing.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-workers-before-server.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-workers-before-server.1.xml
@@ -1100,6 +1124,7 @@ test_files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws.35.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.36.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.37.xml
+- spec/reports/SPEC-OpenStudio-Aws-Aws.38.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.4.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.5.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws.6.xml
@@ -1161,6 +1186,7 @@ test_files:
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.55.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.56.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.57.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.58.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.6.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.7.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.8.xml
@@ -1220,6 +1246,7 @@ test_files:
 - spec/reports/SPEC-OpenStudio-Aws-Config.55.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.56.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.57.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.58.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.6.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.7.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.8.xml
@@ -1282,6 +1309,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAmis-version-1.58.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.59.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.6.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.60.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.7.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.8.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.9.xml
@@ -1340,6 +1368,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAmis-version-2.55.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.56.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.57.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.58.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.6.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.7.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.8.xml
@@ -1402,6 +1431,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAmis.58.xml
 - spec/reports/SPEC-OpenStudioAmis.59.xml
 - spec/reports/SPEC-OpenStudioAmis.6.xml
+- spec/reports/SPEC-OpenStudioAmis.60.xml
 - spec/reports/SPEC-OpenStudioAmis.7.xml
 - spec/reports/SPEC-OpenStudioAmis.8.xml
 - spec/reports/SPEC-OpenStudioAmis.9.xml
@@ -1463,6 +1493,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.58.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.59.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.6.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.60.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.7.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.8.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.9.xml
@@ -1524,6 +1555,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsMethods.58.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.59.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.6.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.60.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.7.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.8.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.9.xml
@@ -1583,6 +1615,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.56.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.57.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.58.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.8.xml
@@ -1634,6 +1667,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.48.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.49.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.50.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-create-new-ami-json.8.xml
@@ -1694,6 +1728,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.56.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.57.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.58.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.8.xml
@@ -1707,6 +1742,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.5.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.7.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.8.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-1.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.1.xml
@@ -1716,6 +1752,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.5.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.7.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.8.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-version-2.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.1.xml
@@ -1772,6 +1809,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.56.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.57.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.58.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.8.xml
@@ -1845,6 +1883,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.58.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.6.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.60.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.8.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.9.xml
@@ -1906,6 +1945,7 @@ test_files:
 - spec/reports/SPEC-OpenStudioAwsWrapper.58.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.59.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.6.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.60.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.7.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.8.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.9.xml