openstudio-aws 0.5.0.rc1 → 0.5.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 08ed2838c540e0945bf7f3e5d43acecad8ec5d59
-  data.tar.gz: 40b2b50ee9ed04c29c30b56ee45e2268947d0891
+  metadata.gz: 8e388aa0be78ded9805099223d0d4b448b1a6830
+  data.tar.gz: 591b32d3e619a3772c972afd6f1bcd04c999d7bb
 SHA512:
-  metadata.gz: d0bd7fe21356210a0b765dd010169fdcb8acdd6024e0887191078f122f0cd8d6f955d3d64cdfa05cbd59480335e75ad5481806e85b6aadb66e6c1ad8fb269a8a
-  data.tar.gz: 23fae6dd410cd52926e1574cdba13bda5def8c7c593623e32ccd698eba0f6741065f527d6e057d5169e303e0475ae8f0b973578db040f075d08dbc4d2a6e1f65
+  metadata.gz: a2f9a92a9a26f0f4ebdc380e8ab16154c7fadadbad159312894e84d370419d659a91805f9cb51d717ecc69e32c641e036192c833420b2e178e7193c749bdb7e6
+  data.tar.gz: 336f34740bdc97c15047d0d43d5629fcc7b63395a18aa0bd6be67d380f0e0bf0278c964fa6f33d8c4b7a85b3716ce0639920b8e8fa966ed4360007c16520d33e

data/lib/openstudio/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Aws
-    VERSION = '0.5.0.rc1'
+    VERSION = '0.5.0.rc2'
   end
 end

data/lib/openstudio/lib/ami_list.rb

@@ -179,20 +179,24 @@ class OpenStudioAmis
   # Return the required docker AMI base box
   def get_ami_version_3
     json = list
-    amis = {}
+    amis = nil
     if @options[:openstudio_version].to_sym == :default && @options[:openstudio_server_version].to_sym == :default
       # grab the most recent openstudio server version - this is not recommended
-      key, value = json[:openstudio_server].first
+      key, value = json[:builds].first
+      amis = {}
       amis[:server] = value[:ami]
       amis[:worker] = value[:ami]
     elsif @options[:openstudio_server_version] != 'default'
-      value = json[:openstudio_server][@options[:openstudio_server_version].to_sym]
-      amis[:server] = value[:ami]
-      amis[:worker] = value[:ami]
+      hash_array = json[:builds]
+      hash = hash_array.select { |hash| hash[:name] == @options[:openstudio_server_version] }
+      fail "Multiple | no entries found matching name key `#{@options[:openstudio_server_version]}`" unless hash.length == 1
+      amis = {}
+      amis[:server] = hash.first[:ami]
+      amis[:worker] = hash.first[:ami]
     elsif @options[:openstudio_version] != 'default'
       fail 'Currently the openstudio_version lookup is not supported in v3.'
     end
-
+    fail 'The requested AMI key is NULL.' if amis[:server] == nil
     logger.info "AMI IDs are #{amis}" if amis
 
     amis

data/spec/openstudio-aws/ami_list_spec.rb

@@ -14,12 +14,11 @@ describe OpenStudioAmis do
     end
 
     it 'should return specific amis if passed a version' do
-      a = OpenStudioAmis.new(1, openstudio_version: '1.2.1')
+      a = OpenStudioAmis.new(1, openstudio_version: '1.13.2')
       amis = a.get_amis
 
-      expect(amis[:server]).to eq('ami-89744be0')
-      expect(amis[:worker]).to eq('ami-37744b5e')
-      expect(amis[:cc2worker]).to eq('ami-51744b38')
+      expect(amis[:server]).to eq('ami-e7a1bbf0')
+      expect(amis[:worker]).to eq('ami-e0a1bbf7')
     end
 
     it 'should list all amis' do
@@ -30,14 +29,14 @@ describe OpenStudioAmis do
   end
 
   context 'version 2' do
-    it 'should return openstudio server version 1.8.0 correctly' do
-      a = OpenStudioAmis.new(2, openstudio_server_version: '1.8.0')
+    it 'should return openstudio server version 1.21.14 correctly' do
+      a = OpenStudioAmis.new(2, openstudio_server_version: '1.21.14')
 
       amis = a.get_amis
 
-      expect(amis[:server]).to eq('ami-3c0fbf54')
-      expect(amis[:worker]).to eq('ami-040ebe6c')
-      expect(amis[:cc2worker]).to eq('ami-040ebe6c')
+      expect(amis[:server]).to eq('ami-43a74255')
+      expect(amis[:worker]).to eq('ami-24a04532')
+      expect(amis[:cc2worker]).to eq(nil)
     end
   end
 

data/spec/openstudio-aws/aws_spec.rb

@@ -25,17 +25,6 @@ describe OpenStudio::Aws::Aws do
 
       expect(aws.default_amis).not_to be_nil
     end
-
-    it 'should find the cc2 instances' do
-      options = {
-        ami_lookup_version: 2,
-        openstudio_server_version: '1.5.0'
-      }
-      aws = OpenStudio::Aws::Aws.new(options)
-
-      expect(aws.determine_image_type('cc2.2xlarge')).to eq 'ami-e582948c'
-      expect(aws.determine_image_type('c3.2xlarge')).to eq 'ami-918294f8'
-    end
   end
 
   context 'should error' do
@@ -49,14 +38,14 @@ describe OpenStudio::Aws::Aws do
   end
 
   context 'version testing' do
-    it 'version 2: should find the right AMIs Server 1.3.1' do
+    it 'version 2: should find the right AMIs Server 1.21.15' do
       options = {
         ami_lookup_version: 2,
-        openstudio_server_version: '1.3.1'
+        openstudio_server_version: '1.21.15'
       }
       aws = OpenStudio::Aws::Aws.new(options)
-      expect(aws.default_amis[:worker]).to eq('ami-39bb8750')
-      expect(aws.default_amis[:server]).to eq('ami-a9bb87c0')
+      expect(aws.default_amis[:worker]).to eq('ami-ccb35ada')
+      expect(aws.default_amis[:server]).to eq('ami-54b45d42')
     end
   end
 

data/spec/openstudio-aws/aws_wrapper_spec.rb

@@ -73,9 +73,9 @@ describe OpenStudioAwsWrapper 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.8.0'.to_sym][:amis][:server]).to eq('ami-3c0fbf54')
-        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)
+        expect(resp[:openstudio_server]['1.21.4'.to_sym][:amis][:server]).to eq('ami-e7a1bbf0')
+        expect(resp[:openstudio_server]['1.21.4'.to_sym][:openstudio_version_sha]).to eq('6103d54380')
+        expect(resp[:openstudio_server]['1.21.4'.to_sym][:tested]).to eq(false)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.5.0.rc1
+  version: 0.5.0.rc2
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp