openstudio-aws 0.1.15 → 0.1.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69767aa78e359c8d227e8275de37f91730182216
-  data.tar.gz: c292e58432dcf8b83b29a4c81a516e8730c07021
+  metadata.gz: efb7b51f623a6281881c9a2dc12e481b79f6b421
+  data.tar.gz: 7faf36a9857a0251fc291b61bbb7c591e76319e9
 SHA512:
-  metadata.gz: 140717519b189a2c170d0b185c1428eec29d8fc043242b4e4065e62ab974059034e432911829ed9dd8320aeda08ae1fd16176982ebf14d02bc2a3ed1a37c8de3
-  data.tar.gz: 4cbf7d4f48a035651ffce4abaddf2c901f31105d618eb37f2bcc85281921343f72c5a8c0a4fb651e4db7741986b5ac1ad5218c8fc716f369a9c0c4ee8bce425e
+  metadata.gz: e2ff331d5294a79f0e2afdc7ad1a99f2d2ce5647a78d2e49e1ed6fd0c0f1fcf5a781958eb8d04b86b782b33d11290207adcd55200adb31a516941cd0f6248a7b
+  data.tar.gz: aeff692fe3684060a92c24408a1af49a614f71485db974f15c55c4aa9be8756e699cb8f43e361d517871f177eeb0cc944e24ca08373c29fb626173d11a47ed59

data/lib/openstudio/aws/aws.rb

@@ -2,11 +2,13 @@
 module OpenStudio
   module Aws
     VALID_OPTIONS = [
-        :proxy, :credentials
+        :proxy, :credentials, :ami_lookup_version, :openstudio_version, 
+        :openstudio_server_version, :region, :ssl_verify_peer, :host, :url
     ]
 
     class Aws
       attr_reader :os_aws
+      attr_reader :default_amis
 
       # default constructor to create the AWS class that can spin up server and worker instances.
       # options are optional with the following support:
@@ -18,20 +20,32 @@ module OpenStudio
           raise ArgumentError, "invalid option(s): #{invalid_options.join(', ')}"
         end
 
+        # merge in some defaults
+        defaults = {
+            :ami_lookup_version => 1,
+            :region => 'us-east-1',
+            :ssl_verify_peer => false,
+            :host => 'developer.nrel.gov',
+            :url => '/downloads/buildings/openstudio/server'
+        }
+        options = defaults.merge(options)
+
+
         # read in the config.yml file to get the secret/private key
-        if !options[:credentials] 
+        if !options[:credentials]
           config_file = OpenStudio::Aws::Config.new()
 
           # populate the credentials
-          options = {
-              :credentials =>
-                  {
-                      :access_key_id => config_file.access_key,
-                      :secret_access_key => config_file.secret_key,
-                      :region => "us-east-1",  #todo: move this to a default
-                      :ssl_verify_peer => false
-                  }
-          }
+          options[:credentials] =
+              {
+                  :access_key_id => config_file.access_key,
+                  :secret_access_key => config_file.secret_key,
+                  :region => options[:region],
+                  :ssl_verify_peer => options[:ssl_verify_peer]
+              }
+        else
+          options[:credentials][:region] = options[:region]
+          options[:credentials][:ssl_verify_peer] = options[:ssl_verify_peer]
         end
 
         if options[:proxy]
@@ -45,21 +59,29 @@ module OpenStudio
           options[:proxy_uri] = proxy_uri
 
           #todo: do we need to escape a couple of the argument of username and password
-          
+
           #todo: set some environment variables for system based proxy
-          
         end
 
+        #puts "Final options are: #{options.inspect}"
+
         @os_aws = OpenStudioAwsWrapper.new(options)
         @local_key_file_name = nil
 
         # this will grab the default version of openstudio ami versions
-        @default_amis = OpenStudioAmis.new(1).get_amis
+        # get the arugments for the AMI lookup
+        ami_options = {}
+        ami_options[:openstudio_server_version] = options[:openstudio_server_version] if options[:openstudio_server_version]
+        ami_options[:openstudio_version] = options[:openstudio_version] if options[:openstudio_version]
+        ami_options[:host] = options[:host] if options[:host]
+        ami_options[:url] = options[:url] if options[:url]
+        
+        @default_amis = OpenStudioAmis.new(options[:ami_lookup_version], ami_options).get_amis
       end
 
       # command line call to create a new instance.  This should be more tightly integrated with teh os-aws.rb gem
-      def create_server(instance_data = {}, server_json_filename = "server_data.json")
-        defaults = {instance_type: "m2.xlarge", image_id: @default_amis['server']}
+      def create_server(instance_data = {}, server_json_filename = "server_data.json", user_id="unknown_user")
+        defaults = {instance_type: "m2.xlarge", image_id: @default_amis[:server]}
         instance_data = defaults.merge(instance_data)
 
         @os_aws.create_or_retrieve_security_group("openstudio-worker-sg-v1")
@@ -67,7 +89,7 @@ module OpenStudio
 
         @local_key_file_name = "ec2_server_key.pem"
         @os_aws.save_private_key(@local_key_file_name)
-        @os_aws.launch_server(instance_data[:image_id], instance_data[:instance_type])
+        @os_aws.launch_server(instance_data[:image_id], instance_data[:instance_type], {:user_id => user_id})
 
         puts @os_aws.server.to_os_hash.to_json
 
@@ -80,21 +102,21 @@ module OpenStudio
         puts "ssh -i #{@local_key_file_name} ubuntu@#{@os_aws.server.data[:dns]}"
       end
 
-      def create_workers(number_of_instances, instance_data = {})
+      def create_workers(number_of_instances, instance_data = {}, user_id="unknown_user")
         defaults = {instance_type: "m2.4xlarge"}
         instance_data = defaults.merge(instance_data)
 
         if instance_data[:image_id].nil?
           if instance_data[:instance_type] =~ /cc2|c3/
-            instance_data[:image_id] = @default_amis['cc2worker']
+            instance_data[:image_id] = @default_amis[:cc2worker]
           else
-            instance_data[:image_id] = @default_amis['worker']
+            instance_data[:image_id] = @default_amis[:worker]
           end
         end
 
         raise "Can't create workers without a server instance running" if @os_aws.server.nil?
 
-        @os_aws.launch_workers(instance_data[:image_id], instance_data[:instance_type], number_of_instances)
+        @os_aws.launch_workers(instance_data[:image_id], instance_data[:instance_type], number_of_instances, {:user_id => user_id})
 
         ## append the information to the server_data hash that already exists
         #@server_data[:instance_type] = instance_data[:instance_type]

data/lib/openstudio/aws/version.rb

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

data/lib/openstudio/lib/ami_list.rb

@@ -21,11 +21,25 @@
 # 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
+  ]
+  
+  def initialize(version = 1, options = {})
+    invalid_options = options.keys - VALID_OPTIONS
+    if invalid_options.any?
+      raise ArgumentError, "invalid option(s): #{invalid_options.join(', ')}"
+    end
 
-  def initialize(version = 1, openstudio_version = 'default', openstudio_server_version = 'default')
-    @version = 1
-    @openstudio_version = openstudio_version.to_sym
-    @openstudio_server_version = openstudio_server_version.to_sym
+    # merge in some defaults
+    defaults = {
+        :openstudio_version => 'default', 
+        :openstudio_server_version => 'default',
+        :host => 'developer.nrel.gov',
+        :url => '/downloads/buildings/openstudio/server'
+    }
+    @version = version
+    @options = defaults.merge(options)
   end
 
   def list
@@ -36,7 +50,7 @@ class OpenStudioAmis
     else
       raise "Unknown api version command #{command}"
     end
-    
+
     json
   end
 
@@ -57,14 +71,14 @@ class OpenStudioAmis
   protected
 
   def list_amis_version_1
-    endpoint = '/downloads/buildings/openstudio/rsrc/amis.json'
+    endpoint = "#{@options[:url]}/amis_v1.json"
     json = retrieve_json(endpoint)
 
     json
   end
 
   def list_amis_version_2
-    endpoint = '/downloads/buildings/openstudio/rsrc/amis_v2.json'
+    endpoint = "#{@options[:url]}/amis_v2.json"
 
     json = retrieve_json(endpoint)
     json
@@ -72,25 +86,33 @@ class OpenStudioAmis
 
   def get_ami_version_1()
     json = list_amis_version_1
-    version = json.has_key?(@openstudio_version) ? @openstudio_version : 'default'
+    version = json.has_key?(@options[:openstudio_version].to_sym) ? @options[:openstudio_version].to_sym : 'default'
 
     json[version]
   end
 
   def get_ami_version_2()
     json = list_amis_version_2
-    version = json.has_key?(@openstudio_version) ? @openstudio_version : 'default'
+    
+    amis = nil
+    if @options[:openstudio_server_version].to_sym == :default
+      # just grab the most recent server
+      key, value = json[:openstudio_server].first
+      amis = value[:amis]
+      #puts json.inspect
+    else
+      value = json[:openstudio_server][@options[:openstudio_server_version].to_sym]
+      amis = value[:amis]
+    end
 
-    #logic logic
+    amis
   end
 
   private
-  
-  
 
   def retrieve_json(endpoint)
     result = nil
-    resp = Net::HTTP.get_response('developer.nrel.gov', endpoint)
+    resp = Net::HTTP.get_response(@options[:host], endpoint)
     if resp.code == '200'
       result = JSON.parse(resp.body, :symbolize_names => true)
     else

data/lib/openstudio/lib/openstudio_aws_instance.rb

@@ -41,7 +41,7 @@ class OpenStudioAwsInstance
     @proxy = proxy 
   end
 
-  def launch_instance(image_id, instance_type, user_data)
+  def launch_instance(image_id, instance_type, user_data, user_id)
     #logger.info("user_data #{user_data.inspect}")
     instance = {
         :image_id => image_id,
@@ -67,7 +67,8 @@ class OpenStudioAwsInstance
                 {:key => 'Name', :value => "OpenStudio-#{@openstudio_instance_type.capitalize}"}, # todo: abstract out the server and version
                 {:key => 'GroupUUID', :value => @group_uuid},
                 {:key => 'NumberOfProcessors', :value => processors.to_s},
-                {:key => 'Purpose', :value => "OpenStudio#{@openstudio_instance_type.capitalize}"}
+                {:key => 'Purpose', :value => "OpenStudio#{@openstudio_instance_type.capitalize}"},
+                {:key => 'UserID', :value => user_id}
             ]
         }
     )

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -248,16 +248,22 @@ class OpenStudioAwsWrapper
     end
   end
 
-  def launch_server(image_id, instance_type)
+  def launch_server(image_id, instance_type, options = {})
+    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)
 
     raise "image_id is nil" if not image_id
     raise "instance type is nil" if not instance_type
-    @server.launch_instance(image_id, instance_type, user_data)
+    @server.launch_instance(image_id, instance_type, user_data, options[:user_id])
   end
 
-  def launch_workers(image_id, instance_type, num)
+  def launch_workers(image_id, instance_type, num, options = {})
+    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')
@@ -273,7 +279,7 @@ class OpenStudioAwsWrapper
     threads = []
     @workers.each do |worker|
       threads << Thread.new do
-        worker.launch_instance(image_id, instance_type, user_data)
+        worker.launch_instance(image_id, instance_type, user_data, options[:user_id])
       end
     end
     threads.each { |t| t.join }
@@ -355,7 +361,7 @@ class OpenStudioAwsWrapper
     available_amis = describe_amis()
 
     amis = transform_ami_lists(existing_amis, available_amis)
-
+    
     if version == 1
       version1 = {}
 
@@ -376,10 +382,22 @@ class OpenStudioAwsWrapper
       end
 
       # create the default version. First sort, then grab the first hash's values
-      version1.sort_by { |k, _| Semantic::Version.new(k.to_s) }
-      version1[:default] = version1.first[1]    
+      puts JSON.pretty_generate(version1)
+      default_v = nil
+      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  
+        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
     end

data/spec/openstudio-aws/ami_list_spec.rb

@@ -13,7 +13,7 @@ describe OpenStudioAmis do
     end
 
     it "should return specific amis if passed a version" do
-      a = OpenStudioAmis.new(1, "1.2.0")
+      a = OpenStudioAmis.new(1, {:openstudio_version => "1.2.0"})
 
       amis = a.get_amis
 

data/spec/openstudio-aws/aws_spec.rb

@@ -1,23 +1,63 @@
 require 'spec_helper'
 
 describe OpenStudio::Aws::Aws do
-  context "proxy configuration" do
-    before :all do
+  context "ami lists" do
+    it "should allow a different region" do
+      options = {
+          :region => "sa-east-1",
+          :credentials =>
+              {
+                  :access_key_id => "some_random_access_key_id",
+                  :secret_access_key => "some_super_secret_access_key",
+              }
+      }
+      aws = OpenStudio::Aws::Aws.new(options)
+    end
+
+    it "should allow a different region" do
+      options = {
+          :ami_lookup_version => 2
+      }
+      aws = OpenStudio::Aws::Aws.new(options)
+
+      expect(aws.default_amis).not_to be_nil
+    end
+  end
 
+  context "should error" do
+    it "should not find a json" do
+      options = {
+          :ami_lookup_version => 2,
+          :url => '/unknown/url'
+      }
+      expect { aws = OpenStudio::Aws::Aws.new(options) }.to raise_exception
+    end
+  end
+
+  context "version testing" do
+    it "version 2: should find the right AMIs Server 1.3.1" do
+      options = {
+          :ami_lookup_version => 2,
+          :openstudio_server_version => "1.3.1"
+      }
+      aws = OpenStudio::Aws::Aws.new(options)
+      expect(aws.default_amis[:worker]).to eq("ami-39bb8750")
+      expect(aws.default_amis[:server]).to eq("ami-a9bb87c0")
     end
-    
+  end
+
+  context "proxy configuration" do
     it "should create an instance" do
       options = {
           :credentials =>
               {
                   :access_key_id => "some_random_access_key_id",
                   :secret_access_key => "some_super_secret_access_key",
-                  :region => "us-east-1",
-                  :ssl_verify_peer => false
               }
-          }
-      
+      }
+
       @aws = OpenStudio::Aws::Aws.new(options)
+      #puts @aws.inspect
       expect(@aws.os_aws).not_to be_nil
     end
 
@@ -27,8 +67,6 @@ describe OpenStudio::Aws::Aws do
               {
                   :access_key_id => "some_random_access_key_id",
                   :secret_access_key => "some_super_secret_access_key",
-                  :region => "us-east-1",
-                  :ssl_verify_peer => false
               },
           :proxy => {
               :host => "192.168.0.1",
@@ -45,8 +83,6 @@ describe OpenStudio::Aws::Aws do
               {
                   :access_key_id => "some_random_access_key_id",
                   :secret_access_key => "some_super_secret_access_key",
-                  :region => "us-east-1",
-                  :ssl_verify_peer => false
               },
           :proxy => {
               :host => "192.168.0.1",

data/spec/openstudio-aws/aws_wrapper_spec.rb

@@ -67,7 +67,7 @@ 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 eq("ami-89744be0")
+        expect(resp["default".to_sym][:server]).to_not eq("ami-89744be0") 
       end
     end
 

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws ami lists" tests="1" time="0.083118" failures="0" errors="1" skipped="0">
+  <testcase name="OpenStudio::Aws::Aws ami lists should allow a different region" time="0.082912">
+    <failure type="Aws::Errors::MissingRegionError" message="Aws::Errors::MissingRegionError">
+Aws::Errors::MissingRegionError (Aws::Errors::MissingRegionError)
+Aws::Errors::MissingRegionError:
+Aws::Errors::MissingRegionError
+     ./lib/openstudio/lib/openstudio_aws_wrapper.rb:69:in `initialize'
+     ./lib/openstudio/aws/aws.rb:56:in `new'
+     ./lib/openstudio/aws/aws.rb:56:in `initialize'
+     ./spec/openstudio-aws/aws_spec.rb:15:in `new'
+     ./spec/openstudio-aws/aws_spec.rb:15:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

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

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws ami lists" tests="1" time="0.060319" failures="0" errors="1" skipped="0">
+  <testcase name="OpenStudio::Aws::Aws ami lists should allow a different region" time="0.060138">
+    <failure type="Aws::Errors::MissingRegionError" message="Aws::Errors::MissingRegionError">
+Aws::Errors::MissingRegionError (Aws::Errors::MissingRegionError)
+Aws::Errors::MissingRegionError:
+Aws::Errors::MissingRegionError
+     ./lib/openstudio/lib/openstudio_aws_wrapper.rb:69:in `initialize'
+     ./lib/openstudio/aws/aws.rb:57:in `new'
+     ./lib/openstudio/aws/aws.rb:57:in `initialize'
+     ./spec/openstudio-aws/aws_spec.rb:15:in `new'
+     ./spec/openstudio-aws/aws_spec.rb:15:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+  </testcase>
+  <system-out>
+{:ami_lookup_version=&gt;1, :region=&gt;"sa-east-1", :credentials=&gt;{:access_key_id=&gt;"some_random_access_key_id", :secret_access_key=&gt;"some_super_secret_access_key", :ssl_verify_peer=&gt;false}}
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

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

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

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

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

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws ami lists" tests="1" time="0.128722" failures="0" errors="1" skipped="0">
+  <testcase name="OpenStudio::Aws::Aws ami lists should allow a different region" time="0.128541">
+    <failure type="Aws::Errors::MissingRegionError" message="Aws::Errors::MissingRegionError">
+Aws::Errors::MissingRegionError (Aws::Errors::MissingRegionError)
+Aws::Errors::MissingRegionError:
+Aws::Errors::MissingRegionError
+     ./lib/openstudio/lib/openstudio_aws_wrapper.rb:69:in `initialize'
+     ./lib/openstudio/aws/aws.rb:56:in `new'
+     ./lib/openstudio/aws/aws.rb:56:in `initialize'
+     ./spec/openstudio-aws/aws_spec.rb:15:in `new'
+     ./spec/openstudio-aws/aws_spec.rb:15:in `block (3 levels) in &lt;top (required)&gt;'    </failure>
+  </testcase>
+  <system-out>
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

data/spec/reports/SPEC-OpenStudio-Aws-Aws-create-a-new-instance.6.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws create a new instance" tests="5" time="193376.590119" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Aws create a new instance should create a new instance" time="0.001172">
+  </testcase>
+  <testcase name="OpenStudio::Aws::Aws create a new instance should ask the user to create a new config file" time="0.000125">
+  </testcase>
+  <testcase name="OpenStudio::Aws::Aws create a new instance should create a server" time="35.035334">
+  </testcase>
+  <testcase>
+  </testcase>
+  <testcase>
+  </testcase>
+  <system-out>
+{"timestamp":"1390600048","server":{"id":"i-2f15580f","ip":"http://54.234.28.217","dns":"ec2-54-234-28-217.compute-1.amazonaws.com","procs":1}}
+
+Server SSH Command:
+ssh -i ec2_server_key.pem ubuntu@ec2-54-234-28-217.compute-1.amazonaws.com
+
+Worker SSH Command:
+ssh -i ec2_server_key.pem ubuntu@ec2-23-22-87-129.compute-1.amazonaws.com
+
+Waiting for server/worker configurations
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<testsuite name="OpenStudio::Aws::Aws proxy configuration" tests="3" time="0.0314" failures="0" errors="0" skipped="0">
+  <testcase name="OpenStudio::Aws::Aws proxy configuration should create an instance" time="0.006098">
+  </testcase>
+  <testcase name="OpenStudio::Aws::Aws proxy configuration should create a AWS instance with a proxy" time="0.005309">
+  </testcase>
+  <testcase name="OpenStudio::Aws::Aws proxy configuration should create a AWS instance with a proxy with username / password" time="0.019675">
+  </testcase>
+  <system-out>
+{:ami_lookup_version=&gt;1, :region=&gt;"us-east-1", :credentials=&gt;{:access_key_id=&gt;"some_random_access_key_id", :secret_access_key=&gt;"some_super_secret_access_key", :region=&gt;"us-east-1", :ssl_verify_peer=&gt;false}}
+{:ami_lookup_version=&gt;1, :region=&gt;"us-east-1", :credentials=&gt;{:access_key_id=&gt;"some_random_access_key_id", :secret_access_key=&gt;"some_super_secret_access_key", :region=&gt;"us-east-1", :ssl_verify_peer=&gt;false}, :proxy=&gt;{:host=&gt;"192.168.0.1", :port=&gt;8080}}
+{:ami_lookup_version=&gt;1, :region=&gt;"us-east-1", :credentials=&gt;{:access_key_id=&gt;"some_random_access_key_id", :secret_access_key=&gt;"some_super_secret_access_key", :region=&gt;"us-east-1", :ssl_verify_peer=&gt;false}, :proxy=&gt;{:host=&gt;"192.168.0.1", :port=&gt;8080, :username=&gt;"username", :password=&gt;"password"}}
+  </system-out>
+  <system-err>
+  </system-err>
+</testsuite>

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

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