openstudio-aws 0.4.0.pre1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 71ac07185a92efb6e2198f3003ef61c073a2a643
-  data.tar.gz: fd9c920fd7ed2262d455f052889dccff022fca8f
+  metadata.gz: 8b9a12cd70bc592eb64710b398e0dd40bf3cdcd6
+  data.tar.gz: 5510348a79a4a5d21fb1ca2b264bc750c7868c62
 SHA512:
-  metadata.gz: 0272b732564bcef0a8e296912108d19c135334cb90b200e1f414a976de0115ae305288015996d77f22ccd403b39b93632dfb1fc9485c1d5e8b43dc4547b3b37a
-  data.tar.gz: 4f17fb88a5780718a9fa227a804640ee903e5d15e0e8fb48dae9d230d3da7edcde12079d0496261c915a725e94866d4b03c7b6d7bbe9f8ed29cc9a73d4ceb436
+  metadata.gz: 86d37f406f4bb02abd473be6a6b58e5f5ae29e676cb6a87e06723ced3664170844d1817c9081aa9429e3149b7d624a4ff61fe8a300124246bd35224493f19d81
+  data.tar.gz: 573698fb2edfc82c380d17fb2a9b09f21c47fef6c25cebe0ecb260ab1f1f631eecf9ba9ba5ba71fa50c7033ff39bce0e88b0094356973c94b839230f0dae371f

data/.gitignore

@@ -17,4 +17,5 @@ spec/reports
 rubocop-results.xml
 spec/output
 *.pem
-*.pub
+*.pub
+*.config

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 rvm:
+  - 2.1.7
   - 2.0.0
-  - 1.9.3
-  - jruby-19mode # JRuby in 1.9 mode
 script:
   - bundle exec rake spec:no_auth

data/CHANGELOG.md

@@ -1,23 +1,14 @@
 OpenStudio AWS Gem Change Log
 ==================================
 
-Version 0.4.0-pre1
+Version 0.4.0
 -------------
 * When listing the AMI, allow future versions of OpenStudio to return the latest stable version 
-
-Version 0.4.0.alpha3
--------------
-* Load the key name and security groups from the AWS instance information. 
+* Load the key name and security groups from the AWS instance information.
 * Add method on Aws to get the group_uuid 
-
-Version 0.4.0.alpha2
--------------
 * Load worker keys from disk (if they exist) when constructing the OpenStudioAwsWrapper class
 * Have `total_instances_count` return the region and first availability zone
 * Add `describe_all_instances`
-
-Version 0.4.0.alpha1
--------------
 * Add a stable JSON file that can be used to flag which versions of the server are stable (used by OpenStudio PAT).
 * Remove all puts and replace with logger. This is required because OpenStudio PAT reads the result from the command line.
 * Add the method `describe_availability_zones` to the root AWS class
@@ -26,7 +17,15 @@ Version 0.4.0.alpha1
 * Add method to `delete_key_pair`
 * Add launch time to the server data struct
 * Add cloud watch class to calculate the cost
-* Add save_directory to override the default path to save private keys and server configuration files 
+* Add save_directory to override the default path to save private keys and server configuration files
+* Remove old AMIs in the AMI List (versions with 0.0.x)
+* Place previous stable AMI version in the list for OpenStudio
+* Remove support for Ruby 1.9. Add support for Ruby 2.1.
+
+Version 0.3.2
+-------------
+* Prefer use of the access and secret key in the environment variables if defined
+* Support i2 instance ephemeral storage. These instances will take a bit longer to startup because the volumes are not yet created.
 
 Version 0.3.1
 -------------

data/Gemfile

@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 gemspec
 
 group :test do
-  gem 'rspec', '~> 3.2.0'
+  gem 'rspec', '~> 3.3'
   gem 'ci_reporter_rspec'
   gem 'rubocop', '~> 0.31'
   gem 'rubocop-checkstyle_formatter', '~> 0.2'

data/lib/openstudio/aws/aws.rb

@@ -307,6 +307,13 @@ module OpenStudio
         @os_cloudwatch.estimated_charges
       end
 
+      # Stop the entire cluster
+      def stop
+        puts "Stoping any instance with group ID: #{@os_aws.group_uuid}"
+
+        stop_instances_by_group_id(@os_aws.group_uuid)
+      end
+
       # Stop running instances
       #
       # @param group_id [String] The unique group identifier for the OpenStudio cluster.
@@ -320,6 +327,17 @@ module OpenStudio
         resp
       end
 
+      # Warning, it appears that this stops all the instances
+      def stop_instances_by_group_id(group_id)
+        instances = @os_aws.describe_running_instances(group_id)
+        ids = instances.map { |k, _| k[:instance_id] }
+
+        puts "Stoping the following instances #{ids}"
+        resp = []
+        resp = @os_aws.stop_instances(ids).to_hash unless ids.empty?
+        resp
+      end
+
       # @params(ids): array of instance ids
       def terminate_instances(ids)
         logger.info "Terminating the following instances #{ids}"
@@ -328,7 +346,7 @@ module OpenStudio
         resp
       end
 
-      # Warning, this appears that it terminates all the instances
+      # Warning, it appears that this terminates all the instances
       def terminate_instances_by_group_id(group_id)
         fail 'Group ID not defined' unless group_id
 

data/lib/openstudio/aws/config.rb

@@ -1,38 +1,57 @@
 module OpenStudio
   module Aws
     class Config
+      include Logging
+
       attr_accessor :access_key
       attr_accessor :secret_key
 
       def initialize(yml_config_file = nil)
-        @yml_config_file = yml_config_file
-        @config = nil
+        # If the AWS keys are set in the env variable and the yml_config_file is nil, then use those keys
+        @access_key = ENV['AWS_ACCESS_KEY_ID'] if ENV['AWS_ACCESS_KEY_ID']
+        @secret_key = ENV['AWS_SECRET_ACCESS_KEY'] if ENV['AWS_SECRET_ACCESS_KEY']
+
+        if @access_key && @secret_key && yml_config_file.nil?
+          logger.info 'Using AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY from environment variables'
+        else
+          # Otherwise read the file
+          logger.info 'Reading AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY from aws config file'
+
+          @yml_config_file = yml_config_file
+          @config = nil
+
+          @yml_config_file = File.join(File.expand_path('~'), 'aws_config.yml') if @yml_config_file.nil?
 
-        if @yml_config_file.nil?
-          @yml_config_file = File.join(File.expand_path('~'), 'aws_config.yml')
           unless File.exist?(@yml_config_file)
             write_config_file
-            fail "No Config File in user home directory. A template has been added, please edit and save: #{@yml_config_file}"
+            fail "Config file not found. A template has been added, please edit and save: #{@yml_config_file}"
             exit 1
           end
-        end
 
-        begin
-          @config = YAML.load(File.read(@yml_config_file))
-          @access_key = @config['access_key_id']
-          @secret_key = @config['secret_access_key']
-        rescue
-          raise "Couldn't read config file #{@yml_config_file}. Delete file then recreate by rerunning script"
+          begin
+            @config = YAML.load(File.read(@yml_config_file))
+
+            # always convert to symbolized hash
+            @config = @config.inject({}) { |a, (k, v)| a[k.to_sym] = v; a }
+
+            @access_key = @config[:access_key_id]
+            @secret_key = @config[:secret_access_key]
+          rescue
+            raise "Couldn't read config file #{@yml_config_file}. Delete file then recreate by rerunning script"
+          end
         end
       end
 
       private
 
       def write_config_file
-        File.open(@yml_config_file, 'w') do |f|
-          f << "access_key_id: YOUR_ACCESS_KEY_ID\n"
-          f << "secret_access_key: YOUR_SECRET_ACCESS_KEY\n"
-        end
+        # create the file
+        data = {
+          access_key_id: 'YOUR_ACCESS_KEY_ID',
+          secret_access_key: 'YOUR_SECRET_ACCESS_KEY'
+        }
+
+        File.open(@yml_config_file, 'w') { |f| f << data.to_yaml }
       end
     end
   end

data/lib/openstudio/aws/version.rb

@@ -1,5 +1,5 @@
 module OpenStudio
   module Aws
-    VERSION = '0.4.0.pre1'
+    VERSION = '0.4.0'
   end
 end

data/lib/openstudio/lib/ami_list.rb

@@ -1,6 +1,5 @@
-# NOTE: Do not modify this file as it is copied over. Modify the source file and rerun rake import_files
 ######################################################################
-#  Copyright (c) 2008-2014, Alliance for Sustainable Energy.
+#  Copyright (c) 2008-2015, Alliance for Sustainable Energy.
 #  All rights reserved.
 #
 #  This library is free software; you can redistribute it and/or
@@ -119,10 +118,11 @@ class OpenStudioAmis
         stable = nil
         if json[:openstudio][@options[:openstudio_version].to_sym]
           stable = json[:openstudio][@options[:openstudio_version].to_sym][:stable]
+          logger.info "The stable version in the JSON is #{stable}"
         end
 
         if stable
-          value = json[:openstudio][@options[:openstudio_version].to_sym][stable.to_sym]
+          value = json[:openstudio_server][stable.to_sym]
           amis = value[:amis]
         else
           logger.info "Could not find a stable version for OpenStudio version #{@options[:openstudio_version]}. "\
@@ -130,12 +130,14 @@ class OpenStudioAmis
 
           json[:openstudio].each do |os_version, values|
             next if os_version == :default
+
             if values.key? :stable
               # don't check versions newer than what we are requesting
               next if os_version.to_s.to_version > @options[:openstudio_version].to_s.to_version
+
               stable = json[:openstudio][os_version][:stable]
               logger.info "Found a stable version for OpenStudio version #{os_version} with OpenStudio Server version #{stable}"
-              value = values[stable.to_sym]
+              value = json[:openstudio_server][stable.to_sym]
               amis = value[:amis]
 
               break

data/lib/openstudio/lib/ami_stable_version.json

@@ -1,5 +1,10 @@
 {
   "openstudio": {
+    "1.9.1": "1.12.13",
+    "1.9.0": "1.12.12",
+    "1.8.4": "1.12.5",
+    "1.8.3": "1.12.4",
+    "1.8.2": "1.12.3",
     "1.8.1": "1.12.2",
     "1.8.0": "1.12.1",
     "1.7.1": "1.11.0-rc3",

data/lib/openstudio/lib/openstudio_aws_instance.rb

@@ -1,5 +1,5 @@
 ######################################################################
-#  Copyright (c) 2008-2014, Alliance for Sustainable Energy.
+#  Copyright (c) 2008-2015, Alliance for Sustainable Energy.
 #  All rights reserved.
 #
 #  This library is free software; you can redistribute it and/or
@@ -35,7 +35,7 @@ class OpenStudioAwsInstance
     @key_pair_name = key_pair_name
     @security_groups = security_groups
     @group_uuid = group_uuid.to_s
-    @init_timestamp = Time.now  # This is the timestamp and is typically just tracked for the server
+    @init_timestamp = Time.now # This is the timestamp and is typically just tracked for the server
     @private_key = private_key
     @private_key_file_name = private_key_file_name
     @proxy = proxy
@@ -390,7 +390,7 @@ class OpenStudioAwsInstance
   rescue SystemCallError, Timeout::Error => e
     # port 22 might not be available immediately after the instance finishes launching
     sleep 10
-    logger.info('Timeout.  Perhaps there is a communication error to EC2?  Will try again')
+    logger.info('Timeout.  Perhaps there is a communication error to EC2?  Will try again in 10 seconds')
     retry
   end
 

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -17,24 +17,6 @@
 #  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 ######################################################################
 
-######################################################################
-# == Synopsis
-#
-#   Uses the aws-sdk gem to communicate with AWS
-#
-# == Usage
-#
-#  ruby aws.rb access_key secret_key us-east-1 EC2 launch_server "{\"instance_type\":\"t1.micro\"}"
-#
-#  ARGV[0] - Access Key
-#  ARGV[1] - Secret Key
-#  ARGV[2] - Region
-#  ARGV[3] - Service (e.g. "EC2" or "CloudWatch")
-#  ARGV[4] - Command (e.g. "launch_server")
-#  ARGV[5] - Optional json with parameters associated with command
-#
-######################################################################
-
 require_relative 'openstudio_aws_logger'
 
 class OpenStudioAwsWrapper
@@ -53,8 +35,7 @@ class OpenStudioAwsWrapper
   VALID_OPTIONS = [:proxy, :credentials]
 
   def initialize(options = {}, group_uuid = nil)
-    @group_uuid = group_uuid || (SecureRandom.uuid).gsub('-', '')
-    logger.info "GroupUUID is #{@group_uuid}"
+    @group_uuid = group_uuid || (SecureRandom.uuid).delete('-')
 
     @security_groups = []
     @key_pair_name = nil
@@ -218,22 +199,17 @@ class OpenStudioAwsWrapper
     instance_data
   end
 
-  def describe_amis(filter = nil, image_ids = [], owned_by_me = true)
+  # Describe the list of AMIs adn return the hash.
+  # @param [Array] image_ids: List of image ids to find. If empty, then will find all images.
+  # @param [Boolean] owned_by_me: Find only the images owned by the current user?
+  # @return [Hash]
+  def describe_amis(image_ids = [], owned_by_me = true)
     resp = nil
 
-    # TODO: test the filter.  i don't think that it is exposed in the AWS gem?
     if owned_by_me
-      if filter
-        resp = @aws.describe_images(owners: [:self], filter: filter).data
-      else
-        resp = @aws.describe_images(owners: [:self]).data
-      end
+      resp = @aws.describe_images(owners: [:self]).data
     else
-      if filter
-        resp = @aws.describe_images(filter: filter).data
-      else
-        resp = @aws.describe_images(image_ids: image_ids).data
-      end
+      resp = @aws.describe_images(image_ids: image_ids).data
     end
 
     resp = resp.to_hash
@@ -242,11 +218,15 @@ class OpenStudioAwsWrapper
     resp[:images].each do |image|
       image[:tags_hash] = {}
       image[:tags_hash][:tags] = []
-      image[:tags].each do |tag|
-        if tag[:value]
-          image[:tags_hash][tag[:key].to_sym] = tag[:value]
-        else
-          image[:tags_hash][:tags] << tag[:key]
+
+      # If the image is being created then its tags may be empty
+      if image[:tags]
+        image[:tags].each do |tag|
+          if tag[:value]
+            image[:tags_hash][tag[:key].to_sym] = tag[:value]
+          else
+            image[:tags_hash][:tags] << tag[:key]
+          end
         end
       end
     end
@@ -254,6 +234,8 @@ class OpenStudioAwsWrapper
     resp
   end
 
+  # Stop specific instances based on the instance_ids
+  # @param [Array] ids: Array of ids to stop
   def stop_instances(ids)
     resp = @aws.stop_instances(
       instance_ids: ids,
@@ -549,8 +531,6 @@ class OpenStudioAwsWrapper
 
       # 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 amis[:openstudio_server][key][:deprecate]
-
         a = amis[:openstudio_server][key]
         # this will override any of the old ami/os version
         version1[a[:openstudio_version].to_sym] = a[:amis]
@@ -568,20 +548,33 @@ class OpenStudioAwsWrapper
       # don't need to transform anything right now, only flag which ones are stable version so that the uploaded ami JSON has the
       # stable server for OpenStudio PAT to use.
       stable = JSON.parse File.read(File.join(File.dirname(__FILE__), 'ami_stable_version.json')), symbolize_names: true
-      # go through and tag the versions of the openstudio instances that are stable
 
+      # go through and tag the versions of the openstudio instances that are stable,
       stable[:openstudio].each do |k, v|
         if amis[:openstudio][k.to_s] && amis[:openstudio][k.to_s][v.to_sym]
           amis[:openstudio][k.to_s][:stable] = v
         end
       end
 
+      # I'm not sure what the below code is trying to accomplish. Are we even using the default?
       k, v = stable[:openstudio].first
       if k && v
         if amis[:openstudio][k.to_s]
           amis[:openstudio][:default] = v
         end
       end
+
+      # now go through and if the OpenStudio version does not have a stable key, then assign it the most recent
+      # stable AMI. This allows for easy testing so a new version of OpenStudio can use an existing AMI.
+      stable[:openstudio].each do |stable_openstudio, stable_server|
+        amis[:openstudio].each do |k, v|
+          next if k == :default
+
+          if k.to_s.to_version > stable_openstudio.to_s.to_version && v[:stable].nil?
+            amis[:openstudio][k.to_s][:stable] = stable_server.to_s
+          end
+        end
+      end
     end
 
     amis
@@ -606,7 +599,8 @@ class OpenStudioAwsWrapper
     h
   end
 
-  # take the base version and increment the patch until
+  # take the base version and increment the patch until.
+  # TODO: DEPRECATE
   def get_next_version(base, list_of_svs)
     b = base.to_version
 
@@ -634,8 +628,8 @@ class OpenStudioAwsWrapper
       sv = ami[:tags_hash][:openstudio_server_version]
 
       if sv.nil? || sv == ''
-        logger.info 'found nil version, incrementing from 0.0.1'
-        sv = get_next_version('0.0.1', list_of_svs)
+        logger.info 'found nil Server Version, ignoring'
+        next
       end
       list_of_svs << sv
 
@@ -646,11 +640,9 @@ class OpenStudioAwsWrapper
       a[:amis] = {} unless a[:amis]
 
       # fill in data (this will override data currently)
-      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]
@@ -687,29 +679,8 @@ class OpenStudioAwsWrapper
       end
     end
 
-    # merge in the existing AMIs the existing amis into the 'unknown category, but don't flag them as 'deprecate'
-    existing.keys.each do |ami_key|
-      next if ami_key == 'default'.to_sym # ignore default
-
-      # 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] ||= {}
-      a = amis[:openstudio_server][next_version.to_sym]
-      a[:amis] = {} unless 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 server section
     amis[:openstudio_server].keys.each do |key|
-      next if key.to_s.to_version.satisfies('0.0.*')
-
       a = amis[:openstudio_server][key]
       ov = a[:openstudio_version]
 

data/lib/openstudio/lib/server_script.sh.template

@@ -44,12 +44,28 @@ chmod 775 /usr/local/bin/ec2-metadata
 mkdir -p /etc/openstudio-server
 ec2-metadata -a -i -t -h -o -z -p -v > /etc/openstudio-server/instance.yml
 
+# make sure supervisor is running
+sudo service supervisor start
+
 # stop the various services that use mongo
 service delayed_job stop
+supervisorctl stop delayed_job
 service apache2 stop
 service mongodb stop
 service mongod stop
 
+# make sure the the /mnt directory exists if i2 instances.
+# For now this assumes that the volume is xvdb. In the future this
+# should be dynamic
+if ec2-metadata --instance-type | grep -q 'i2.'; then
+  mkfs.ext4 /dev/xvdb
+  mkdir -p /mnt
+  mount -t ext4 /dev/xvdb /mnt
+
+  echo "/dev/xvdb /mnt auto noatime 0 0" | sudo tee -a /etc/fstab
+  mount -a
+fi
+
 # remove mongo db & add it back
 mkdir -p /mnt/mongodb/data
 chown mongodb:nogroup /mnt/mongodb/data
@@ -118,9 +134,11 @@ find /mnt/openstudio -type f -print0 | xargs -0 chmod 664
 
 # restart rserve
 service Rserve restart
+supervisorctl restart Rserve
 
-# restart delayed jobs
+# start delayed jobs
 service delayed_job start
+supervisorctl start delayed_job
 
 #file flag the user_data has completed
 cat /dev/null > /home/ubuntu/user_data_done

data/lib/openstudio/lib/worker_script.sh.template

@@ -35,6 +35,18 @@ chmod 775 /usr/local/bin/ec2-metadata
 mkdir -p /etc/openstudio-server
 ec2-metadata -a -i -t -h -o -z -p -v > /etc/openstudio-server/instance.yml
 
+# make sure the the /mnt directory exists if i2 instances.
+# For now this assumes that the volume is xvdb. In the future this
+# should be dynamic
+if ec2-metadata --instance-type | grep -q 'i2.'; then
+  mkfs.ext4 /dev/xvdb
+  mkdir -p /mnt
+  mount -t ext4 /dev/xvdb /mnt
+
+  echo "/dev/xvdb /mnt auto noatime 0 0" | sudo tee -a /etc/fstab
+  mount -a
+fi
+
 ## Worker Data Configuration -- On Vagrant this is a separate file
 
 rm -f /tmp/snow.log
@@ -63,14 +75,11 @@ find /mnt/openstudio -type f -print0 | xargs -0 chmod 664
 
 ## End Worker Data Configuration
 
-#turn off hyperthreading
-# NL: do not turn off hyperthreading, rather, just limit the number of cores and see if it
-# makes a difference.
-#for cpunum in $(
-#  cat /sys/devices/system/cpu/cpu*/topology/thread_siblings_list |
-#  cut -s -d, -f2- | tr ',' '\n' | sort -un); do
-#    echo 0 > /sys/devices/system/cpu/cpu$cpunum/online
-#done
+# make sure supervisor is running
+sudo service supervisor start
+
+# Rserve is now on the worker nodes for use by measures
+supervisorctl restart Rserve
 
 #file flag the user_data has completed
 cat /dev/null > /home/ubuntu/user_data_done

data/openstudio-aws.gemspec

@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.description = 'Custom classes for configuring clusters for OpenStudio & EnergyPlus analyses'
   s.license = 'LGPL'
 
-  s.required_ruby_version = '>= 1.9.1'
+  s.required_ruby_version = '>= 2.0.0'
   s.required_rubygems_version = '>= 1.3.6'
 
   s.add_dependency 'net-scp', '~> 1.1'
@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'semantic', '~> 1.4'
   s.add_dependency 'sshkey', '~> 1.7'
 
-  s.add_development_dependency 'bundler', '~> 1.7'
   s.add_development_dependency 'rake', '~> 10.4'
 
   s.files         = `git ls-files -z`.split("\x0")

data/spec/aws_instances/aws_spec_api.rb

@@ -252,7 +252,11 @@ describe OpenStudio::Aws::Aws do
       begin
         options = {
           instance_type: 'm3.medium',
-          image_id: SERVER_AMI
+          image_id: SERVER_AMI,
+          tags: [
+            'ci_tests=true',
+            'ServerOnly=true'
+          ]
         }
 
         expect(@aws.save_directory).to eq File.join(File.expand_path('.'), 'spec/output/save_path')
@@ -344,4 +348,45 @@ describe OpenStudio::Aws::Aws do
       @aws.terminate
     end
   end
+
+  context 'i2-instances' do
+    before :all do
+      @config = OpenStudio::Aws::Config.new
+      @aws = OpenStudio::Aws::Aws.new
+
+      @group_id = nil
+    end
+
+    it 'should create an i2 instance and mount the storage' do
+      begin
+        options = {
+          instance_type: 'i2.xlarge',
+          image_id: SERVER_AMI,
+          tags: [
+            'ci_tests=true',
+            'ServerOnly=true'
+          ]
+        }
+
+        expect { @aws.create_workers(0) }.to raise_error "Can't create workers without a server instance running"
+
+        test_pem_file = 'ec2_server_key.pem'
+        FileUtils.rm_f test_pem_file if File.exist? test_pem_file
+        FileUtils.rm_f 'server_data.json' if File.exist? 'server_data.json'
+
+        @aws.create_server(options)
+
+        # Still have to call "create workers" or the configuration won't happen.
+        @aws.create_workers(0, options)
+
+        h = @aws.os_aws.server.to_os_hash
+
+        shell = @aws.server.shell_command('df -h | grep /dev/xvdb.*/mnt')
+        expect(shell).not_to be_nil
+        expect(shell).to eq /\/dev\/xvdb.*\/mnt/
+      ensure
+        @aws.terminate_instances_by_group_id(h[:group_id])
+      end
+    end
+  end
 end

data/spec/openstudio-aws/ami_list_spec.rb

@@ -43,7 +43,7 @@ describe OpenStudioAmis do
   end
 
   context 'version 2' do
-    it 'should return openstudio version 1.7.1 stable & default versions correctly when 1.7.5 is passed' do
+    it 'should return openstudio version 1.7.1 when stable is passed to 1.7.5' do
       a = OpenStudioAmis.new(2, openstudio_version: '1.7.5', stable: true)
 
       amis = a.get_amis

data/spec/openstudio-aws/aws_wrapper_spec.rb

@@ -49,12 +49,12 @@ describe OpenStudioAwsWrapper do
 
     context 'create new ami json' do
       it 'should describe existing AMIs' do
-        resp = @aws.os_aws.describe_amis(nil, nil, true)
-        expect(resp[:images].length).to be >= 3
+        resp = @aws.os_aws.describe_amis
+        expect(resp[:images].length).to be >= 10
       end
 
       it 'should describe a specific image' do
-        resp = @aws.os_aws.describe_amis(nil, ['ami-39bb8750'], false)
+        resp = @aws.os_aws.describe_amis(['ami-39bb8750'], false)
         expect(resp[:images].first[:image_id]).to eq('ami-39bb8750')
         expect(resp[:images].first[:tags_hash][:user_uuid]).to eq('jenkins-139LADFJ178')
         expect(resp[:images].first[:tags_hash][:openstudio_server_version]).to eq('1.3.1')
@@ -62,10 +62,10 @@ describe OpenStudioAwsWrapper do
     end
 
     context 'version 1' do
-      it 'should create a new json' do
+      it 'should create a new json and return the right server versions' 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['1.9.0'.to_sym][:server]).to eq('ami-f3611996')
         expect(resp['default'.to_sym][:server]).to_not eq('ami-89744be0')
       end
     end
@@ -103,7 +103,6 @@ describe OpenStudioAwsWrapper do
 
     it 'should create security group' do
       sg = @aws.os_aws.create_or_retrieve_default_security_group
-      pp sg
       expect(sg).to_not be nil
     end
   end

data/spec/openstudio-aws/config_spec.rb

@@ -6,5 +6,49 @@ describe OpenStudio::Aws::Config do
       @config = OpenStudio::Aws::Config.new
       expect(@config).not_to be_nil
     end
+
+    it 'should create a new file' do
+      local_file = 'test.config'
+      File.delete local_file if File.exist? local_file
+
+      expect { OpenStudio::Aws::Config.new local_file }.to raise_error /Config file not found. A template has been added, please edit and save: test.config/
+      expect(File.exist?(local_file)).to eq true
+
+      # read the file and make sure that the template is there
+      config = YAML.load(File.read(local_file))
+      expect(config[:access_key_id]).to eq 'YOUR_ACCESS_KEY_ID'
+      expect(config[:secret_access_key]).to eq 'YOUR_SECRET_ACCESS_KEY'
+    end
+
+    it 'should read old format' do
+      # make sure that we can read the old format which has non-symoblized keys
+      local_file = 'test_custom_old.config'
+
+      data = {
+        'access_key_id' =>  'abcd',
+        'secret_access_key' => 'efgh'
+      }
+
+      File.open(local_file, 'w') { |f| f << data.to_yaml }
+      config = OpenStudio::Aws::Config.new local_file
+      expect(config.access_key).to eq 'abcd'
+      expect(config.secret_key).to eq 'efgh'
+    end
+
+    it 'should read a custom file' do
+      local_file = 'test_custom.config'
+
+      # create the file
+      data = {
+        access_key_id: 'random_key',
+        secret_access_key: 'random_secret_key'
+      }
+
+      File.open(local_file, 'w') { |f| f << data.to_yaml }
+
+      config = OpenStudio::Aws::Config.new local_file
+      expect(config.access_key).to eq 'random_key'
+      expect(config.secret_key).to eq 'random_secret_key'
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.4.0.pre1
+  version: 0.4.0
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp
@@ -66,20 +66,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.7'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +132,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - '>='
@@ -154,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
 summary: Start AWS EC2 instances for running distributed OpenStudio-based analyses