openstudio-aws 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 62fe65f799f5982237127e58ec68bdd92ed883e1
-  data.tar.gz: fc6ece5979bc471e2ef8c5ca67d02ad9ebb5f1e8
+  metadata.gz: 58446e6c6b933ab0dd7e9b37662135ed69f49b30
+  data.tar.gz: 5d3a66b33ae75198773aa12370045ef584e8da1e
 SHA512:
-  metadata.gz: e01949a6660d24ebce0feafbe9a46f34e389ef302bcb015f92f4bbf9619b988f17ff63c9722de7b4d423503cd2d3ba791e9f427b0864026e24ba3f081ed359f8
-  data.tar.gz: a6f8f3a8d246b3bafbc1c61be9ecbba0ebc6c116b09a404ccac45c12826a0e53ca4a3584ac0164d1d63b72672bffd357a6dfaef5872a1623e5ed4c49e126642f
+  metadata.gz: 48ab27614c9e80e4dd8ffb0edf8afbc1ce9f3017dd8c94f56eb33e531136c263fb0815638bc9c66ce5e2c78e40dfb19d21481518cc4a66d36ec024816870256f
+  data.tar.gz: 5668f2229c8e525d22f64ae1796b512941dc8cb9f6680759ab7c0129b52f6d707cbf347363d1d4cf4381a218da5b4871703b6694e4a66d8c62c1ee18d9b35584

data/.gitignore

@@ -0,0 +1,20 @@
+.DS_Store
+.bundle
+.idea
+.ruby-version
+*.swp
+build
+Gemfile.lock
+*.pem
+*.gem
+server_data.json
+worker_data.json
+tmp/*
+aws.log
+spec/reports
+~$*
+*.receipt
+rubocop-results.xml
+*.pem
+*.pub
+*.config

data/.rubocop.yml

@@ -0,0 +1,133 @@
+AllCops:
+  Exclude:
+    - 'doc/**/*'
+
+# ==================== Linters ====================
+Lint/AmbiguousOperator:
+  Enabled: true
+
+Lint/BlockAlignment:
+  Enabled: true
+
+Lint/ParenthesesAsGroupedExpression:
+  Enabled: true
+
+Lint/RequireParentheses:
+  Enabled: true
+
+# Offense count: 1
+Lint/UnreachableCode:
+  Enabled: false
+
+# Offense count: 51
+Lint/UselessAssignment:
+  Enabled: true
+
+# ==================== Styles / Metrics====================
+# Offense count: 4
+Metrics/BlockNesting:
+  Max: 4
+
+# Offense count: 18
+# Configuration parameters: CountComments.
+Metrics/ClassLength:
+  Max: 500
+
+# Offense count: 27
+Metrics/CyclomaticComplexity:
+  Max: 48
+
+# Offense count: 974
+Metrics/LineLength:
+  Max: 1200
+
+# Offense count: 87
+# Configuration parameters: CountComments.
+Metrics/MethodLength:
+  Max: 350
+
+# Offense count: 1
+# Configuration parameters: CountKeywordArgs.
+Metrics/ParameterLists:
+  Max: 8
+
+# ==================== Disabled on Purpose ====================
+# Offense count: 3
+Style/AccessorMethodName:
+  Enabled: true
+
+# Need to allow indented case statements
+# Offense count: 9
+# Configuration parameters: IndentWhenRelativeTo, SupportedStyles, IndentOneStep.
+Style/CaseIndentation:
+  Enabled: false
+
+# Offense count: 18
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+# Offense count: 2
+Style/ClassVars:
+  Enabled: false
+
+# Offense count: 42
+Style/Documentation:
+  Enabled: false
+
+# Offense count: 1
+Style/EachWithObject:
+  Enabled: false
+
+# Offense count: 2
+# Configuration parameters: AllowedVariables.
+Style/GlobalVars:
+  Enabled: false
+
+# Offense count: 7
+# Configuration parameters: MinBodyLength.
+Style/GuardClause:
+  Enabled: true
+
+# Offense count: 17
+# Configuration parameters: MaxLineLength.
+Style/IfUnlessModifier:
+  Enabled: false
+
+# Do NOT enable.  For some reason this is catchy any next which I feel are okay.
+# Offense count: 18
+# Configuration parameters: EnforcedStyle, SupportedStyles.
+Style/Next:
+  Enabled: false
+
+# Do NOT enable this because it appears $? is different than $CHILD_STATUS.
+# Offense count: 7
+# Cop supports --auto-correct.
+Style/SpecialGlobalVars:
+  Enabled: false
+
+# More Changes per DLM -- pulled from https://github.com/bbatsov/rubocop/blob/master/config/enabled.yml
+Style/RedundantReturn:
+  Description: 'Do not use return where it is not required.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#no-explicit-return'
+  Enabled: false
+
+Style/NumericLiterals:
+  Description: 'Add underscores to large numeric literals to improve readability.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscores-in-numerics'
+  Enabled: false
+
+Lint/UnusedBlockArgument:
+  Description: 'Checks for unused block arguments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
+  Enabled: false
+
+Lint/UnusedMethodArgument:
+  Description: 'Checks for unused method arguments.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
+  Enabled: false
+
+Lint/UselessAssignment:
+  Description: 'Checks for useless assignment to a local variable.'
+  StyleGuide: 'https://github.com/bbatsov/ruby-style-guide#underscore-unused-vars'
+  Enabled: false

data/.travis.yml

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

data/CHANGELOG.md

@@ -0,0 +1,144 @@
+OpenStudio AWS Gem Change Log
+==================================
+
+Version 0.3.2 (Unreleased)
+-------------
+* Add a stable JSON file that can be used to flag which versions of the server are stable (used by OpenStudio PAT).
+* Add the method `describe_availability_zones` to the root AWS class
+* 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
+-------------
+* Allow for URL redirections since the developer.nrel.gov is now on aws
+
+Version 0.3.0
+-------------
+* Update aws-sdk-core-ruby to 2.0.20.
+* Add VPC
+* Use private ip addresses for AWS based communication
+* Change single security group to an array
+* Allow multiple security groups to be used
+* Add method to save the cluster JSON
+* Add top level terminate method to delete the machine that belong to the cluster (based on group uuid)
+* Fix setting the group uuid when loading an existing cluster JSON file
+* Upload public/private key for worker-node communication
+* Change hosts file to use openstudio.server (not master). This will prevent older AMIs to not work with this gem'
+
+Version 0.2.6
+-------------
+* Don't pass in a predefined availability zone. Make sure that the workers are placed in the server's zone.
+
+Version 0.2.5
+-------------
+* Enable i3 instances on AWS for large storage
+
+Version 0.2.4
+-------------
+* Allow custom instance tags when starting an instance
+* Allow no workers
+
+Version 0.2.3
+-------------
+* No longer support cc2 instances. The HVM instances are preferred and don't need a different cluster instance.
+
+Version 0.2.2
+-------------
+* aws-sdk-core-ruby rc15 has bug for windows. Force version rc14
+
+Version 0.2.1
+-------------
+* [BUG FIX] Fix issue with security groups with new AWS accounts
+
+Version 0.2.0
+-------------
+* Unzip mongoid models to a model subdirectory. 
+* Support user specified private keys
+* Force region and availability zone to be the same
+* Update launch scripts for workflow gem bundler
+* Re-enable m2 generation machines because of larger volumes
+* Allow uploading, shelling, and downloading from base OpenStudio::Aws Object
+* Timestamp in JSON instance is now an integer (epoch time)
+* GroupUUID is now an actual UUID instead of a timestamp in seconds (removes race condition when spinning up clusters in parallel)
+* Changes to support upcoming aws-sdk-core version 2.0
+
+Version 0.1.26
+--------------
+* Fix underscore in the port range for security groups
+
+Version 0.1.23-25
+--------------
+* Delay the starting of MongoDB for 15 seconds on boot because of the pre-allocation of journals
+* Code cleanup
+
+Version 0.1.22
+--------------
+* Update Worker and Server Scripts to remove world writable warning
+
+Version 0.1.21
+--------------
+* Test AWS Ruby API RC6
+* Update pricing information
+
+Version 0.1.20
+--------------
+* Always enable the true flag for the master node running as a server
+
+Version 0.1.17/18/19
+-------------------
+* Fix the sorting of AMIs
+* Fix default URL and point to rsrc (not server) on developer.nrel.gov
+
+Version 0.1.16
+--------------
+* Fix tests
+* Add option parsing to AMI list
+* Better Support of Version 2 AMI listing
+
+Version 0.1.14/15
+-------------
+* Add basic support for proxies for Net::SSH and Net::SCP (need to add for AWS still)
+* Add AMI json list of available AMIs for version 1 & 2
+
+Version 0.1.13
+--------------
+* Add defaulted argument for the name of the server_json file to create_server
+
+Version 0.1.12
+--------------
+* Use HVM version when instance type is cc.* or c.*
+
+Version 0.1.11
+-------------
+* AMI lookup is now defaulted.  
+
+Version 0.1.8/9
+-------------
+* Use new version of AWS-SDK-Ruby (core).  Break out into several classes.
+
+Version 0.1.7
+-------------
+* Bump version of aws-sdk. Package a custom gem that doesn't require JSON as a gemspec dependency
+
+Version 0.1.6
+-------------
+* Update os-aws.rb script to the most recent version in OpenStudio repo
+
+Version 0.1.4
+-------------
+* Package custom AWS gem locally
+
+Version 0.1.3
+-------------
+* Now depends on json_pure for window users
+
+Version 0.1.1
+-------------
+* Updated to OpenStudio Server Version 1.1.4
+
+Version 0.1
+-----------
+Initial release.
+
+
+

data/Gemfile

@@ -0,0 +1,10 @@
+source 'http://rubygems.org'
+
+gemspec
+
+group :test do
+  gem 'rspec', '~> 3.3'
+  gem 'ci_reporter_rspec'
+  gem 'rubocop', '~> 0.31'
+  gem 'rubocop-checkstyle_formatter', '~> 0.2'
+end

data/License.txt

@@ -0,0 +1,65 @@
+Copyright (c) 2008-2013, Alliance for Sustainable Energy.
+All rights reserved.
+
+                                   NOTICE
+
+This computer software (Software) is code in development prepared by the 
+Alliance for Sustainable Energy, (hereinafter the "Contractor"), under 
+Contract DE-AC36-08GO28308 (Contract) with the Department of Energy (DOE).  
+The United States Government has been granted for itself and others acting 
+on its behalf a paid-up, non-exclusive, irrevocable, worldwide license in 
+the Software to reproduce, prepare derivative works, and perform publicly 
+and display publicly.  Beginning five (5) years after the date permission 
+to assert copyright is obtained from the DOE, and subject to any 
+subsequent five (5) year renewals, the United States Government is granted 
+for itself and others acting on its behalf a paid-up, non-exclusive, 
+irrevocable, worldwide license in the Software to reproduce, prepare 
+derivative works, distribute copies to the public, perform publicly and 
+display publicly, and to permit others to do so.  If the Contractor ceases 
+to make this computer software available, it may be obtained from DOE's 
+Office of Scientific and Technical Information's Energy Science and 
+Technology Software Center (ESTSC) at P.O. Box 1020, Oak Ridge, TN 37831-
+1020.
+
+                                 DISCLAIMER
+
+THIS SOFTWARE IS PROVIDED BY THE CONTRACTOR "AS IS" AND ANY EXPRESS OR 
+IMPLIED WARRANTIES, INCLUDING BUT NOT LIMITED TO, THE IMPLIED WARRANTIES 
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN 
+NO EVENT SHALL THE CONTRACTOR OR THE U.S. GOVERNMENT BE LIABLE FOR ANY 
+SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER, 
+INCLUDING BUT NOT LIMITED TO CLAIMS ASSOCIATED WITH THE LOSS OF DATA OR 
+PROFITS, WHICH MAY RESULT FROM AN ACTION IN CONTRACT, NEGLIGENCE OR OTHER 
+TORTIOUS CLAIM THAT ARISES OUT OF OR IN CONNECTION WITH THE ACCESS, USE OR 
+PERFORMANCE OF THIS SOFTWARE.
+
+YOU AGREE TO INDEMNIFY DOE/NREL/ALLIANCE, AND ITS SUBSIDIARIES, 
+AFFILIATES, OFFICERS, AGENTS, AND EMPLOYEES AGAINST ANY CLAIM OR DEMAND, 
+INCLUDING REASONABLE ATTORNEYS' FEES, RELATED TO YOUR USE OF THESE DATA.
+
+DOE/NREL/Alliance is not obligated to provide the user with any support, 
+consulting, training or assistance of any kind with regard to the use of 
+these Data or to provide the user with any updates, revisions or new 
+versions of these Data.
+
+The names DOE/NREL/Alliance may not be used in any advertising or 
+publicity to endorse or promote any products or commercial entities unless 
+specific written permission is obtained from DOE/NREL/Alliance.
+
+
+                            OPEN SOURCE LICENSE
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details here.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+

data/README.md

@@ -1,7 +1,7 @@
 OpenStudio AWS Gem
 ==================
 
-[![Dependency Status](https://www.versioneye.com/user/projects/540a30dbccc023fe760002c9/badge.svg?style=flat)](https://www.versioneye.com/user/projects/540a30dbccc023fe760002c9)
+[![Build Status](https://travis-ci.org/NREL/OpenStudio-aws-gem.svg?branch=develop)](https://travis-ci.org/NREL/OpenStudio-aws-gem) [![Dependency Status](https://www.versioneye.com/user/projects/540a30dbccc023fe760002c9/badge.svg?style=flat)](https://www.versioneye.com/user/projects/540a30dbccc023fe760002c9)
 
 OpenStudio AWS uses the OpenStudio AWS ruby class to launch a server and multiple workers for doing 
 OpenStudio/EnergyPlus Analyses using Amazon AWS/EC2

data/Rakefile

@@ -4,26 +4,14 @@ Bundler.setup
 require 'rake'
 require 'rspec/core/rake_task'
 
-$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
-require 'openstudio/aws/version'
-
-task gem: :build
-task :build do
-  system 'gem build openstudio-aws.gemspec'
-end
+# Always create spec reports
+require 'ci/reporter/rake/rspec'
 
-desc 'build and install gem locally'
-task install: :build do
-  system "gem install openstudio-aws-#{OpenStudio::Aws::VERSION}.gem --no-ri --no-rdoc"
-end
+# Gem tasks
+require 'bundler/gem_tasks'
 
-desc 'build and release the gem using rubygems and git tags'
-task release: :build do
-  system "git tag -a v#{OpenStudio::Aws::VERSION} -m 'Tagging #{OpenStudio::Aws::VERSION}'"
-  system 'git push --tags'
-  system "gem push openstudio-aws-#{OpenStudio::Aws::VERSION}.gem"
-  system "rm openstudio-aws-#{OpenStudio::Aws::VERSION}.gem"
-end
+$LOAD_PATH.unshift File.expand_path('../lib', __FILE__)
+require 'openstudio-aws'
 
 RSpec::Core::RakeTask.new('spec') do |spec|
   spec.rspec_opts = %w(--format progress --format CI::Reporter::RSpec)
@@ -35,44 +23,40 @@ RSpec::Core::RakeTask.new('spec:api') do |spec|
   spec.pattern = 'spec/**/*_spec_api.rb'
 end
 
-task default: :spec
+RSpec::Core::RakeTask.new('spec:no_auth') do |spec|
+  spec.rspec_opts = %w(--format progress --format CI::Reporter::RSpec)
 
-desc 'import files from other repos'
-task :import_files do
-  puts 'Importing data from other repos until this repo is self contained'
-  # Copy data from github openstudio source
+  file_list = FileList['spec/**/*_spec.rb']
+  file_list = file_list.exclude('spec/**/aws_wrapper_spec.rb')
+  file_list = file_list.exclude('spec/**/aws_spec.rb')
+  file_list = file_list.exclude('spec/**/config_spec.rb')
 
-  # this has been forked at the moment until openstudio team supports the new aws-sdk gem
-  # os_file = "./lib/openstudio/lib/os-aws.rb"
-  # system "curl -S -s -L -o #{os_file} https://raw.github.com/NREL/OpenStudio/develop/openstudiocore/ruby/cloud/aws.rb.in"
-  # if File.exists?(os_file)
-  #  system "ruby -i -pe 'puts \"# NOTE: Do not modify this file as it is copied over. Modify the source file and rerun rake import_files\" if $.==1' #{os_file}"
-  #  system "sed -i '' 's/\${CMAKE_VERSION_MAJOR}.\${CMAKE_VERSION_MINOR}.\${CMAKE_VERSION_PATCH}/#{OpenStudio::Aws::OPENSTUDIO_VERSION}/g' #{os_file}"
-  # end
-  #
-  os_file = './lib/openstudio/lib/mongoid.yml.template'
-  system "curl -S -s -L -o #{os_file} https://raw.github.com/NREL/OpenStudio/develop/openstudiocore/ruby/cloud/mongoid.yml.template"
+  spec.pattern = file_list
+end
 
-  os_file = './lib/openstudio/lib/server_script.sh'
-  system "curl -S -s -L -o #{os_file} https://raw.github.com/NREL/OpenStudio/develop/openstudiocore/ruby/cloud/server_script.sh"
-  if File.exist?(os_file)
-    system "ruby -i -pe 'puts \"# NOTE: Do not modify this file as it is copied over. Modify the source file and rerun rake import_files\" if $.==2' #{os_file}"
-  end
+task 'spec' => 'ci:setup:rspec'
+task 'spec:api' => 'ci:setup:rspec'
+task 'spec:no_auth' => 'ci:setup:rspec'
 
-  os_file = './lib/openstudio/lib/worker_script.sh.template'
-  system "curl -S -s -L -o #{os_file} https://raw.github.com/NREL/OpenStudio/develop/openstudiocore/ruby/cloud/worker_script.sh.template"
-  if File.exist?(os_file)
-    system "ruby -i -pe 'puts \"# NOTE: Do not modify this file as it is copied over. Modify the source file and rerun rake import_files\" if $.==2' #{os_file}"
-  end
-end
+task default: :spec
 
-desc 'uninstall all openstudio-aws gems'
-task :uninstall do
-  system 'gem uninstall openstudio-aws -a'
-end
+desc 'list out the AMIs for OpenStudio'
+task :list_amis do
+  @aws = OpenStudio::Aws::Aws.new
+
+  dest_root = 'build/server/api'
+  f = "#{dest_root}/v1/amis.json"
+  File.delete(f) if File.exist?(f)
+  FileUtils.mkdir_p File.dirname(f) unless Dir.exist? File.dirname(f)
+  File.open(f, 'w') { |f| f << JSON.pretty_generate(@aws.os_aws.create_new_ami_json(1)) }
 
-desc 'reinstall the gem (uninstall, build, and reinstall'
-task reinstall: [:uninstall, :install]
+  f = "#{dest_root}/v2/amis.json"
+  File.delete(f) if File.exist?(f)
+  FileUtils.mkdir_p File.dirname(f) unless Dir.exist? File.dirname(f)
+  h = @aws.os_aws.create_new_ami_json(2)
+  File.open(f, 'w') { |f| f << JSON.pretty_generate(h) }
+  puts JSON.pretty_generate(h)
+end
 
 require 'rubocop/rake_task'
 desc 'Run RuboCop on the lib directory'

data/lib/openstudio/aws/aws.rb

@@ -3,7 +3,7 @@ module OpenStudio
   module Aws
     VALID_OPTIONS = [
       :proxy, :credentials, :ami_lookup_version, :openstudio_version,
-      :openstudio_server_version, :region, :ssl_verify_peer, :host, :url
+      :openstudio_server_version, :region, :ssl_verify_peer, :host, :url, :stable
     ]
 
     class Aws
@@ -25,9 +25,7 @@ module OpenStudio
         defaults = {
           ami_lookup_version: 1,
           region: 'us-east-1',
-          ssl_verify_peer: false,
-          host: 'developer.nrel.gov',
-          url: '/downloads/buildings/openstudio/api'
+          ssl_verify_peer: false
         }
         options = defaults.merge(options)
 
@@ -67,7 +65,7 @@ module OpenStudio
 
         @os_aws = OpenStudioAwsWrapper.new(options)
 
-        @instances_json = nil
+        @instances_filename = nil
 
         # this will grab the default version of openstudio ami versions
         # get the arugments for the AMI lookup
@@ -76,6 +74,7 @@ module OpenStudio
         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]
+        ami_options[:stable] = options[:stable] if options[:stable]
 
         @default_amis = OpenStudioAmis.new(options[:ami_lookup_version], ami_options).get_amis
       end
@@ -87,7 +86,7 @@ module OpenStudio
       # end
 
       # command line call to create a new instance.  This should be more tightly integrated with teh os-aws.rb gem
-      def create_server(options = {}, instances_json = 'server_data.json')
+      def create_server(options = {}, instances_filename = 'server_data.json')
         defaults = {
           instance_type: 'm2.xlarge',
           security_groups: [],
@@ -150,8 +149,8 @@ module OpenStudio
 
         @os_aws.launch_server(options[:image_id], options[:instance_type], server_options)
 
-        @instances_json = instances_json
-        save_cluster_json(@instances_json)
+        @instances_filename = instances_filename
+        save_cluster_json @instances_filename
 
         # Print out some debugging commands (probably work on mac/linux only)
         puts ''
@@ -208,7 +207,7 @@ module OpenStudio
           @os_aws.launch_workers(options[:image_id], options[:instance_type], number_of_instances, worker_options)
 
           # Add the worker data to the JSON
-          save_cluster_json @instances_json
+          save_cluster_json @instances_filename
 
           puts ''
           puts 'Worker SSH Command:'
@@ -235,7 +234,19 @@ module OpenStudio
       # Save a JSON with information about the cluster that was configured.
       # @param filename [String] Path and filename to save the JSON file
       def save_cluster_json(filename)
-        File.open(@instances_json, 'w') { |f| f << JSON.pretty_generate(cluster_info) }
+        File.open(filename, 'w') { |f| f << JSON.pretty_generate(cluster_info) }
+      end
+
+      # Return the availability zones for the AWS region specified in the options hash
+      def describe_availability_zones
+        @os_aws.describe_availability_zones
+      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
 
       # openstudio_instance_type as symbol
@@ -248,6 +259,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)
         puts "Terminating the following instances #{ids}"
@@ -256,7 +278,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)
         instances = @os_aws.describe_running_instances(group_id)
         ids = instances.map { |k, _| k[:instance_id] }