openstudio-aws 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ac6b743feca80ea6c1cc34f6ecd9f765504d52b
-  data.tar.gz: 19e378e4fc19eb4578e11a010ee4761a7f506d78
+  metadata.gz: 0d33b30a0656911cefb58ff085e87a4b36ee1ff8
+  data.tar.gz: 9ccc2d0a0d75e654dfdd20dd7ef211c43b90d407
 SHA512:
-  metadata.gz: c29dc7caf6cf02f2357a655986a9a1f0a57aaddb717447b037e94c0fb0bef81df919b9678f33317964321b3c837b8a2a4b2e05e3a75dfb0d303b675b9af45e6e
-  data.tar.gz: c34a468d431073cf7b69eb50325516152dcf69300242d0de2e4460f003b75b3b5c6288985f1adf3f4e3e7e39ad9b287ffe82287a651c6820a60d9b64b8517be9
+  metadata.gz: d20b55e37e3f1c1f7a457af6140726e83d5caa119326cbfe67a2f510cf86d178887f3fc9e373dac9ba7cacd0189259e7e2323e176ea1ea2f5d4ad57742191280
+  data.tar.gz: 8c642295ea9555236f4686f587ee85b53f5c9e6bf1826e845845847ccc7838f845ba0ab016b64e0d20808402b4bed6d2d9eb309268a1fb5272da5fb1b0281145

data/Rakefile

@@ -26,7 +26,7 @@ task :release => :build do
 end
 
 RSpec::Core::RakeTask.new("spec") do |spec|
-  spec.rspec_opts = %w(--format progress --format CI::Reporter::RSpec)
+  #spec.rspec_opts = %w(--format progress --format CI::Reporter::RSpec)
   spec.pattern = "spec/**/*_spec.rb"
 end
 

data/lib/openstudio/aws/aws.rb

@@ -12,7 +12,8 @@ module OpenStudio
         @os_aws = OpenStudioAwsWrapper.new(config)
         @local_key_file_name = nil
 
-        @default_amis = OpenStudioAmis.new(1, "1.1.3").get_amis
+        # this will grab the default version of openstudio ami versions
+        @default_amis = OpenStudioAmis.new(1).get_amis
       end
 
       # command line call to create a new instance.  This should be more tightly integrated with teh os-aws.rb gem

data/lib/openstudio/aws/version.rb

@@ -1,6 +1,6 @@
 module OpenStudio
   module Aws
-    VERSION = "0.1.10"
+    VERSION = "0.1.11"
     OPENSTUDIO_VERSION = "1.2.1"
   end
 end

data/lib/openstudio/lib/ami_list.rb

@@ -28,7 +28,19 @@ class OpenStudioAmis
     @openstudio_server_version = openstudio_server_version
   end
 
-  def get_amis()
+  def list
+    json = nil
+    command = "list_amis_version_#{@version}"
+    if OpenStudioAmis.method_defined?(command)
+      json = send(command)
+    else
+      raise "Unknown api version command #{command}"
+    end
+    
+    json
+  end
+
+  def get_amis
     amis = nil
     command = "get_ami_version_#{@version}"
     if OpenStudioAmis.method_defined?(command)
@@ -42,28 +54,38 @@ class OpenStudioAmis
     amis
   end
 
-  protected 
-  
-  def get_ami_version_1()
+  protected
+
+  def list_amis_version_1
     endpoint = '/downloads/buildings/openstudio/rsrc/amis.json'
+    json = retrieve_json(endpoint)
+
+    json
+  end
+
+  def list_amis_version_2
+    endpoint = '/downloads/buildings/openstudio/rsrc/amis_v2.json'
 
     json = retrieve_json(endpoint)
+    json
+  end
+
+  def get_ami_version_1()
+    json = list_amis_version_1
     version = json.has_key?(@openstudio_version) ? @openstudio_version : 'default'
 
     json[version]
   end
 
   def get_ami_version_2()
-    endpoint = '/downloads/buildings/openstudio/rsrc/amis_v2.json'
-
-    json = retrieve_json(endpoint)
+    json = list_amis_version_2
     version = json.has_key?(@openstudio_version) ? @openstudio_version : 'default'
 
     #logic logic
   end
-  
+
   private
-  
+
   def retrieve_json(endpoint)
     result = nil
     resp = Net::HTTP.get_response('developer.nrel.gov', endpoint)

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -276,6 +276,27 @@ class OpenStudioAwsWrapper
     true
   end
 
+  def describe_amis(filter = nil, image_ids = [], owned_by_me = true)
+    resp = nil
+
+    if owned_by_me
+      if filter  
+        resp = @aws.describe_images({:owners => [:self], :filter => filter}).data
+      else
+        resp = @aws.describe_images({:owners => [:self]}).data
+      end
+    else
+      if filter  
+        resp = @aws.describe_images({:filter => filter}).data
+      else
+        resp = @aws.describe_images({:image_ids => image_ids}).data
+      end
+    end
+
+
+    resp
+  end
+  
   # method to query the amazon api to find the server (if it exists), based on the group id
   # if it is found, then it will set the @server member variable.
   # Note that the information around keys and security groups is pulled from the instance information.
@@ -301,6 +322,26 @@ class OpenStudioAwsWrapper
     end
   end
   
+  
+  # method to hit the existing list of available amis and compare to the list of AMIs on Amazon and then generate the 
+  # new ami list
+  def create_new_ami_json(version = 1)
+    existing_amis = OpenStudioAmis.new(version).list
+    logger.info existing_amis
+    
+    if version == 1
+      # check if the AMIs still exist (anywhere)
+      #test_ami = @os_aws.describe_amis(nil, )
+    elsif version == 2
+    end
+    
+
+    # check if the existing AMIs still exist
+    #existing_amis
+    available_amis = describe_amis()
+    logger.info available_amis
+  end
+  
   def to_os_worker_hash
     worker_hash = []
     @workers.each { |worker|

data/spec/openstudio-aws/ami_list_spec.rb

@@ -17,13 +17,15 @@ describe OpenStudioAmis do
 
       amis = a.get_amis
 
-      expect(amis['server']).to eq("ami-29e5cd40") 
-      expect(amis['worker']).to eq("ami-a9e4ccc0") 
-      expect(amis['cc2worker']).to eq("ami-5be4cc32") 
+      expect(amis['server']).to eq("ami-a3e4d4ca") 
+      expect(amis['worker']).to eq("ami-b9e4d4d0") 
+      expect(amis['cc2worker']).to eq("ami-a5e4d4cc") 
     end
     
-    it "should raise if passed an invalid version" do
+    it "should list all amis" do
+      a = OpenStudioAmis.new(1).list
       
+      expect(a).not_to be_nil
     end
   end
   
@@ -32,6 +34,9 @@ describe OpenStudioAmis do
       
     end
   end
+  
+  
+  
 
 end
 

data/spec/openstudio-aws/{lib_spec.rb → aws_wrapper_spec.rb}

@@ -28,20 +28,32 @@ describe OpenStudioAwsWrapper do
         resp = @os_aws.describe_availability_zones
         expect { resp }.not_to be_nil
         resp[:availability_zone_info].length.should eq(4)
-                             
+
         resp[:availability_zone_info].inspect.should eq("[{:zone_name=>\"us-east-1a\", :state=>\"available\", :region_name=>\"us-east-1\", :messages=>[]}, {:zone_name=>\"us-east-1b\", :state=>\"available\", :region_name=>\"us-east-1\", :messages=>[]}, {:zone_name=>\"us-east-1c\", :state=>\"available\", :region_name=>\"us-east-1\", :messages=>[]}, {:zone_name=>\"us-east-1d\", :state=>\"available\", :region_name=>\"us-east-1\", :messages=>[]}]")
-        
+
         resp = @os_aws.describe_availability_zones_json
         expect { resp }.not_to be_nil
 
       end
-      
+
       it "should list number of instances" do
         resp = @os_aws.describe_total_instances
         expect { resp }.not_to be_nil
       end
     end
-    
+
+    context "create new ami json" do
+      it "should describe existing AMIs" do
+        resp = @os_aws.describe_amis(nil, nil, true)
+        expect(resp).not_to be_nil
+      end
+
+      it "should create a new json" do
+        resp = @os_aws.create_new_ami_json(1)
+      end
+
+    end
+
   end
 
 

data/spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.2.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.000772" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Config create a new config should create a new instance" time="0.000587">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.3.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.000712" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Config create a new config should create a new instance" time="0.000565">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.4.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.000714" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Config create a new config should create a new instance" time="0.000559">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.5.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.000802" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Config create a new config should create a new instance" time="0.000627">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.6.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.00063" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Config create a new config should create a new instance" time="0.000496">
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Config.2.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-OpenStudio-Aws-Config.3.xml

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

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

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

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

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

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

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

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAmis version 1" tests="4" time="10.896444" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAmis version 1 should default to an ami if nothing passed" time="6.216596">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should return specific amis if passed a version" time="2.197012">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should raise if passed an invalid version" time="0.000112">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should list all amis" time="2.482335">
+  </testcase>
+  <system-out>
+{"default"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.2.0"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.1.3"=&gt;{"server"=&gt;"ami-fb301292", "worker"=&gt;"ami-21301248", "cc2worker"=&gt;"ami-d73311be"}, "1.1.2"=&gt;{"server"=&gt;"ami-89f5d3e0", "worker"=&gt;"ami-35f2d45c", "cc2worker"=&gt;"ami-27f2d44e"}, "1.1.1"=&gt;{"server"=&gt;"ami-955308fc", "worker"=&gt;"ami-c95308a0", "cc2worker"=&gt;"ami-a55308cc"}, "1.1.0"=&gt;{"server"=&gt;"ami-1b376a72", "worker"=&gt;"ami-970b56fe", "cc2worker"=&gt;"ami-a30b56ca"}}
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAmis version 1" tests="4" time="5.49712" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAmis version 1 should default to an ami if nothing passed" time="3.091352">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should return specific amis if passed a version" time="1.151713">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should raise if passed an invalid version" time="0.000133">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should list all amis" time="1.253591">
+  </testcase>
+  <system-out>
+AMIs are {"default"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.2.0"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.1.3"=&gt;{"server"=&gt;"ami-fb301292", "worker"=&gt;"ami-21301248", "cc2worker"=&gt;"ami-d73311be"}, "1.1.2"=&gt;{"server"=&gt;"ami-89f5d3e0", "worker"=&gt;"ami-35f2d45c", "cc2worker"=&gt;"ami-27f2d44e"}, "1.1.1"=&gt;{"server"=&gt;"ami-955308fc", "worker"=&gt;"ami-c95308a0", "cc2worker"=&gt;"ami-a55308cc"}, "1.1.0"=&gt;{"server"=&gt;"ami-1b376a72", "worker"=&gt;"ami-970b56fe", "cc2worker"=&gt;"ami-a30b56ca"}}
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAmis version 1" tests="4" time="6.55588" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAmis version 1 should default to an ami if nothing passed" time="1.801168">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should return specific amis if passed a version" time="2.33939">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should raise if passed an invalid version" time="0.000172">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should list all amis" time="2.414725">
+  </testcase>
+  <system-out>
+listing amis
+AMIs are {"default"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.2.0"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.1.3"=&gt;{"server"=&gt;"ami-fb301292", "worker"=&gt;"ami-21301248", "cc2worker"=&gt;"ami-d73311be"}, "1.1.2"=&gt;{"server"=&gt;"ami-89f5d3e0", "worker"=&gt;"ami-35f2d45c", "cc2worker"=&gt;"ami-27f2d44e"}, "1.1.1"=&gt;{"server"=&gt;"ami-955308fc", "worker"=&gt;"ami-c95308a0", "cc2worker"=&gt;"ami-a55308cc"}, "1.1.0"=&gt;{"server"=&gt;"ami-1b376a72", "worker"=&gt;"ami-970b56fe", "cc2worker"=&gt;"ami-a30b56ca"}}
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAmis version 1" tests="4" time="1.089555" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAmis version 1 should default to an ami if nothing passed" time="0.329243">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should return specific amis if passed a version" time="0.356176">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should raise if passed an invalid version" time="0.000116">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should list all amis" time="0.40368">
+  </testcase>
+  <system-out>
+listing amis
+AMIs are {"default"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.2.0"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.1.3"=&gt;{"server"=&gt;"ami-fb301292", "worker"=&gt;"ami-21301248", "cc2worker"=&gt;"ami-d73311be"}, "1.1.2"=&gt;{"server"=&gt;"ami-89f5d3e0", "worker"=&gt;"ami-35f2d45c", "cc2worker"=&gt;"ami-27f2d44e"}, "1.1.1"=&gt;{"server"=&gt;"ami-955308fc", "worker"=&gt;"ami-c95308a0", "cc2worker"=&gt;"ami-a55308cc"}, "1.1.0"=&gt;{"server"=&gt;"ami-1b376a72", "worker"=&gt;"ami-970b56fe", "cc2worker"=&gt;"ami-a30b56ca"}}
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

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

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAmis version 1" tests="3" time="3.933143" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudioAmis version 1 should default to an ami if nothing passed" time="1.260272">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should return specific amis if passed a version" time="1.193241">
+  </testcase>
+  <testcase name="OpenStudioAmis version 1 should list all amis" time="1.479331">
+  </testcase>
+  <system-out>
+listing amis
+AMIs are {"default"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.2.0"=&gt;{"server"=&gt;"ami-29e5cd40", "worker"=&gt;"ami-a9e4ccc0", "cc2worker"=&gt;"ami-5be4cc32"}, "1.1.3"=&gt;{"server"=&gt;"ami-fb301292", "worker"=&gt;"ami-21301248", "cc2worker"=&gt;"ami-d73311be"}, "1.1.2"=&gt;{"server"=&gt;"ami-89f5d3e0", "worker"=&gt;"ami-35f2d45c", "cc2worker"=&gt;"ami-27f2d44e"}, "1.1.1"=&gt;{"server"=&gt;"ami-955308fc", "worker"=&gt;"ami-c95308a0", "cc2worker"=&gt;"ami-a55308cc"}, "1.1.0"=&gt;{"server"=&gt;"ami-1b376a72", "worker"=&gt;"ami-970b56fe", "cc2worker"=&gt;"ami-a30b56ca"}}
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudioAmis" 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.6.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Nicholas Long
@@ -63,8 +63,8 @@ files:
 - spec/aws_instances/aws_spec_api.rb
 - spec/openstudio-aws/ami_list_spec.rb
 - spec/openstudio-aws/aws_methods_spec.rb
+- spec/openstudio-aws/aws_wrapper_spec.rb
 - spec/openstudio-aws/config_spec.rb
-- spec/openstudio-aws/lib_spec.rb
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.1.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.xml
@@ -76,37 +76,97 @@ files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.1.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.2.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.3.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.4.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.5.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.6.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.1.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.2.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.3.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.4.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.5.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.6.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.0.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.1.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.2.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.3.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.4.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.5.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.6.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.0.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.1.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.2.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.3.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.4.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.xml
 - spec/reports/SPEC-OpenStudioAmis.0.xml
 - spec/reports/SPEC-OpenStudioAmis.1.xml
+- spec/reports/SPEC-OpenStudioAmis.2.xml
+- spec/reports/SPEC-OpenStudioAmis.3.xml
+- spec/reports/SPEC-OpenStudioAmis.4.xml
+- spec/reports/SPEC-OpenStudioAmis.5.xml
+- spec/reports/SPEC-OpenStudioAmis.6.xml
 - spec/reports/SPEC-OpenStudioAmis.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.0.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.1.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.2.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.3.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.4.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.5.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.6.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.0.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.1.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.2.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.3.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.4.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.5.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.6.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.xml
 - spec/spec_helper.rb
 homepage: http://openstudio.nrel.gov
@@ -137,8 +197,8 @@ test_files:
 - spec/aws_instances/aws_spec_api.rb
 - spec/openstudio-aws/ami_list_spec.rb
 - spec/openstudio-aws/aws_methods_spec.rb
+- spec/openstudio-aws/aws_wrapper_spec.rb
 - spec/openstudio-aws/config_spec.rb
-- spec/openstudio-aws/lib_spec.rb
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.1.xml
 - spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.xml
@@ -150,36 +210,96 @@ test_files:
 - spec/reports/SPEC-OpenStudio-Aws-Aws.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.1.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.2.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.3.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.4.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.5.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.6.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config-create-a-new-config.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.0.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.1.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.2.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.3.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.4.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.5.xml
+- spec/reports/SPEC-OpenStudio-Aws-Config.6.xml
 - spec/reports/SPEC-OpenStudio-Aws-Config.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.0.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.1.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.2.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.3.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.4.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.5.xml
+- spec/reports/SPEC-OpenStudioAmis-version-1.6.xml
 - spec/reports/SPEC-OpenStudioAmis-version-1.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.0.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.1.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.2.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.3.xml
+- spec/reports/SPEC-OpenStudioAmis-version-2.4.xml
 - spec/reports/SPEC-OpenStudioAmis-version-2.xml
 - spec/reports/SPEC-OpenStudioAmis.0.xml
 - spec/reports/SPEC-OpenStudioAmis.1.xml
+- spec/reports/SPEC-OpenStudioAmis.2.xml
+- spec/reports/SPEC-OpenStudioAmis.3.xml
+- spec/reports/SPEC-OpenStudioAmis.4.xml
+- spec/reports/SPEC-OpenStudioAmis.5.xml
+- spec/reports/SPEC-OpenStudioAmis.6.xml
 - spec/reports/SPEC-OpenStudioAmis.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.0.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.1.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.2.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.3.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.4.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.5.xml
+- spec/reports/SPEC-OpenStudioAwsMethods-processors.6.xml
 - spec/reports/SPEC-OpenStudioAwsMethods-processors.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.0.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.1.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.2.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.3.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.4.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.5.xml
+- spec/reports/SPEC-OpenStudioAwsMethods.6.xml
 - spec/reports/SPEC-OpenStudioAwsMethods.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-availability.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session-new-instance.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-authenticated-session.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper-unauthenticated-session.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.0.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.1.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.2.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.3.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.4.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.5.xml
+- spec/reports/SPEC-OpenStudioAwsWrapper.6.xml
 - spec/reports/SPEC-OpenStudioAwsWrapper.xml
 - spec/spec_helper.rb