openstudio-aws 0.3.2 → 0.4.0.alpha1

data/lib/openstudio/lib/openstudio_aws_wrapper.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
@@ -54,7 +53,8 @@ class OpenStudioAwsWrapper
   VALID_OPTIONS = [:proxy, :credentials]
 
   def initialize(options = {}, group_uuid = nil)
-    @group_uuid = group_uuid || (SecureRandom.uuid).delete('-')
+    @group_uuid = group_uuid || (SecureRandom.uuid).gsub('-', '')
+    logger.info "GroupUUID is #{@group_uuid}"
 
     @security_groups = []
     @key_pair_name = nil
@@ -118,15 +118,44 @@ class OpenStudioAwsWrapper
     describe_availability_zones.to_json
   end
 
-  def describe_total_instances
+  def total_instances_count
     resp = @aws.describe_instance_status
 
+    # TODO: make this return the region not the availability zone
     region = resp.instance_statuses.length > 0 ? resp.instance_statuses.first.availability_zone : 'no_instances'
     { total_instances: resp.instance_statuses.length, region: region }
   end
 
-  def describe_total_instances_json
-    describe_total_instances.to_json
+  # describe the instances by group id (this is the default method)
+  def describe_instances
+    resp = nil
+    if group_uuid
+      resp = @aws.describe_instances(
+        filters: [
+          # {name: 'instance-state-code', values: [0.to_s, 16.to_s]}, # running or pending -- any state
+          { name: 'tag-key', values: ['GroupUUID'] },
+          { name: 'tag-value', values: [group_uuid.to_s] }
+        ]
+      )
+    else
+      resp = @aws.describe_instances
+    end
+
+    # Any additional filters
+    instance_data = nil
+    if resp
+      instance_data = []
+      resp.reservations.each do |r|
+        r.instances.each do |i|
+          i_h = i.to_hash
+          if i_h[:tags].any? { |h| (h[:key] == 'GroupUUID') && (h[:value] == group_uuid.to_s) }
+            instance_data << i_h
+          end
+        end
+      end
+    end
+
+    instance_data
   end
 
   # return all of the running instances, or filter by the group_uuid & instance type
@@ -220,13 +249,14 @@ class OpenStudioAwsWrapper
   end
 
   def terminate_instances(ids)
+    resp = nil
     begin
       resp = @aws.terminate_instances(
         instance_ids: ids
       )
     rescue Aws::EC2::Errors::InvalidInstanceIDNotFound
       # Log that the instances couldn't be found?
-      return resp = { error: 'instances could not be found' }
+      resp = { error: 'instances could not be found' }
     end
 
     resp
@@ -263,12 +293,26 @@ class OpenStudioAwsWrapper
     logger.info("create key pair: #{@key_pair_name}")
   end
 
+  # Delete the key pair from aws
+  def delete_key_pair(key_pair_name = nil)
+    tmp_name = key_pair_name || "os-key-pair-#{@group_uuid}"
+    resp = nil
+    begin
+      logger.info "Trying to delete key pair #{tmp_name}"
+      resp = @aws.delete_key_pair(key_name: tmp_name)
+    rescue
+      logger.info "could not delete the key pair '#{tmp_name}'"
+    end
+
+    resp
+  end
+
   def load_private_key(filename)
     unless File.exist? filename
       # check if the file basename exists in your user directory
       filename = File.expand_path("~/.ssh/#{File.basename(filename)}")
       if File.exist? filename
-        puts "Found key of same name in user's home ssh folder #{filename}"
+        logger.info "Found key of same name in user's home ssh folder #{filename}"
         # using the key in your home directory
       else
         fail "Could not find private key #{filename}" unless File.exist? filename
@@ -279,11 +323,13 @@ class OpenStudioAwsWrapper
     @private_key = File.read(filename)
   end
 
-  def save_private_key(filename)
+  def save_private_key(directory = '.', filename = 'ec2_server_key.pem')
     if @private_key
-      @private_key_file_name = File.expand_path filename
-      File.open(filename, 'w') { |f| f << @private_key }
-      File.chmod(0600, filename)
+      @private_key_file_name = File.expand_path "#{directory}/#{filename}"
+      logger.info "Saving server private key in #{@private_key_file_name}"
+      File.open(@private_key_file_name, 'w') { |f| f << @private_key }
+      logger.info 'Setting permissions of server private key to 0600'
+
     else
       fail "No private key found in which to persist with filename #{filename}"
     end
@@ -291,8 +337,15 @@ class OpenStudioAwsWrapper
 
   # save off the worker public/private keys that were created
   def save_worker_keys(directory = '.')
-    File.open("#{directory}/ec2_worker_key.pem", 'w') { |f| f << @worker_keys.private_key }
-    File.open("#{directory}/ec2_worker_key.pub", 'w') { |f| f << @worker_keys.public_key }
+    wk = "#{directory}/ec2_worker_key.pem"
+    logger.info "Saving worker private key in #{wk}"
+    File.open(wk, 'w') { |f| f << @worker_keys.private_key }
+    logger.info 'Setting permissions of worker private key to 0600'
+    File.chmod(0600, wk)
+
+    wk = "#{directory}/ec2_worker_key.pub"
+    logger.info "Saving worker public key in #{wk}"
+    File.open(wk, 'w') { |f| f << @worker_keys.public_key }
   end
 
   def launch_server(image_id, instance_type, launch_options = {})
@@ -397,8 +450,8 @@ class OpenStudioAwsWrapper
     @group_uuid = server_data_hash[:group_id] || @group_uuid
     load_private_key(server_data_hash[:server][:private_key_file_name])
 
-    logger.info "finding the server for groupid of #{group_uuid}"
-    fail 'no group uuid defined either in member variable or method argument' if group_uuid.nil?
+    logger.info "Finding the server for GroupUUID of #{group_uuid}"
+    fail 'no GroupUUID defined either in member variable or method argument' if group_uuid.nil?
 
     # This should really just be a single call to describe running instances
     @server = nil
@@ -417,7 +470,7 @@ class OpenStudioAwsWrapper
         logger.info "Server instance is already defined with instance #{resp[:instance_id]}"
       end
     else
-      puts 'could not find a running server instance'
+      logger.info 'could not find a running server instance'
     end
 
     # find the workers
@@ -538,7 +591,7 @@ class OpenStudioAwsWrapper
       sv = ami[:tags_hash][:openstudio_server_version]
 
       if sv.nil? || sv == ''
-        puts 'found nil version, incrementing from 0.0.1'
+        logger.info 'found nil version, incrementing from 0.0.1'
         sv = get_next_version('0.0.1', list_of_svs)
       end
       list_of_svs << sv
@@ -590,10 +643,8 @@ class OpenStudioAwsWrapper
         end
       end
     end
-    # puts "Current AMIs: #{JSON.pretty_generate(amis)}"
 
     # merge in the existing AMIs the existing amis into the 'unknown category, but don't flag them as 'deprecate'
-    # puts "Existing AMIs: #{JSON.pretty_generate(existing)}"
     existing.keys.each do |ami_key|
       next if ami_key == 'default'.to_sym # ignore default
 
@@ -612,7 +663,6 @@ class OpenStudioAwsWrapper
       a[:openstudio_server_version] = next_version.to_s
     end
 
-    # puts "After merge: #{JSON.pretty_generate(amis)}"
     # flip these around for openstudio server section
     amis[:openstudio_server].keys.each do |key|
       next if key.to_s.to_version.satisfies('0.0.*')
@@ -639,8 +689,6 @@ class OpenStudioAwsWrapper
     end
     amis[:openstudio] = Hash[amis[:openstudio].sort_by { |k, _| k.to_s.to_version }.reverse]
 
-    # puts "After sort: #{JSON.pretty_generate(amis)}"
-
     amis
   end
 end

data/lib/openstudio/lib/openstudio_cloud_watch.rb

@@ -0,0 +1,55 @@
+######################################################################
+#  Copyright (c) 2008-2015, Alliance for Sustainable Energy.
+#  All rights reserved.
+#
+#  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.
+#
+#  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
+######################################################################
+
+require_relative 'openstudio_aws_logger'
+
+class OpenStudioCloudWatch
+  include Logging
+
+  attr_accessor :private_key_file_name
+  attr_accessor :security_groups
+
+  VALID_OPTIONS = [:proxy, :credentials]
+
+  def initialize(options = {})
+    # store an instance variable with the proxy for passing to instances for use in scp/ssh
+    @proxy = options[:proxy] ? options[:proxy] : nil
+
+    # need to remove the prxoy information here
+    @aws = Aws::CloudWatch::Client.new(options[:credentials])
+  end
+
+  def estimated_charges
+    end_time = Time.now.utc
+    start_time = end_time - 86400
+    resp = @aws.get_metric_statistics(
+      dimensions: [
+        { name: 'ServiceName', value: 'AmazonEC2' },
+        { name: 'Currency', value: 'USD' }],
+      metric_name: 'EstimatedCharges',
+      namespace: 'AWS/Billing',
+      start_time: start_time.iso8601,
+      end_time: end_time.iso8601,
+      period: 300,
+      statistics: ['Maximum']
+    )
+
+    resp.data || []
+  end
+end

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

@@ -44,28 +44,12 @@ 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
@@ -134,11 +118,9 @@ find /mnt/openstudio -type f -print0 | xargs -0 chmod 664
 
 # restart rserve
 service Rserve restart
-supervisorctl restart Rserve
 
-# start delayed jobs
+# restart 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,18 +35,6 @@ 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
@@ -75,11 +63,14 @@ find /mnt/openstudio -type f -print0 | xargs -0 chmod 664
 
 ## End Worker Data Configuration
 
-# make sure supervisor is running
-sudo service supervisor start
-
-# Rserve is now on the worker nodes for use by measures
-supervisorctl restart Rserve
+#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
 
 #file flag the user_data has completed
 cat /dev/null > /home/ubuntu/user_data_done

data/lib/openstudio-aws.rb

@@ -16,13 +16,16 @@ begin
 rescue LoadError
   puts 'Failed to load AWS-SDK-CORE gem'
   puts '  try running: gem install aws-sdk-core'
-  exit
+
+  exit 1
 end
 
+require 'openstudio/core_ext/hash'
 require 'openstudio/lib/openstudio_aws_logger'
 require 'openstudio/aws/aws'
 require 'openstudio/aws/config'
 require 'openstudio/aws/version'
 require 'openstudio/lib/openstudio_aws_instance'
 require 'openstudio/lib/openstudio_aws_wrapper'
+require 'openstudio/lib/openstudio_cloud_watch'
 require 'openstudio/lib/ami_list'

data/openstudio-aws.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'net-scp', '~> 1.1'
   s.add_dependency 'aws-sdk-core', '~> 2.0'
-  s.add_dependency 'semantic', '~> 1.3'
-  s.add_dependency 'sshkey', '~> 1.6'
+  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'

data/spec/aws_instances/aws_spec_api.rb

@@ -12,6 +12,7 @@ describe OpenStudio::Aws::Aws do
       @group_id = nil
 
       FileUtils.rm_f 'ec2_server_key.pem' if File.exist? 'ec2_server_key.pem'
+      FileUtils.rm_f 'server_data.json' if File.exist? 'server_data.json'
     end
 
     it 'should create a new instance' do
@@ -27,6 +28,8 @@ describe OpenStudio::Aws::Aws do
 
       @aws.create_server(options)
 
+      @aws.save_cluster_info 'server_data.json'
+
       expect(File.exist?('ec2_server_key.pem')).to be true
       expect(File.exist?('server_data.json')).to be true
       expect(File.exist?('ec2_worker_key.pem')).to be true
@@ -64,19 +67,38 @@ describe OpenStudio::Aws::Aws do
       expect(@aws.os_aws.server).not_to be_nil
     end
 
-    it 'should kill running instances' do
-      # how to test this?
+    after :all do
+      if File.exist? 'server_data.json'
+      	j = JSON.parse(File.read('server_data.json'), symbolize_names: true)
+
+      	@aws.terminate_instances_by_group_id(j[:group_id])
+      end
     end
   end
 
   context 'upload data to a server' do
-    it 'should create a server' do
+    before :all do
+      @group_id = nil
+
       config = OpenStudio::Aws::Config.new
-      aws = OpenStudio::Aws::Aws.new
+      @aws = OpenStudio::Aws::Aws.new
+    end
 
-      options = { instance_type: 'm3.medium', image_id: SERVER_AMI }
+    it 'should create a server' do
+      options = { 
+      	instance_type: 'm3.medium', 
+      	image_id: SERVER_AMI 
+      }
 
-      aws.create_server(options)
+      @aws.create_server(options)
+      @aws.create_workers(0, options)
+
+      @aws.save_cluster_info 'server_data.json'
+
+      h = @aws.os_aws.server.to_os_hash
+      expect(h[:group_id]).to be_a String
+      expect(h[:group_id]).to match /^[\d\S]{32}$/
+      @group_id = h[:group_id]
     end
 
     it 'should upload a file after loading the existing server' do
@@ -90,7 +112,6 @@ describe OpenStudio::Aws::Aws do
       aws2.load_instance_info_from_file('server_data.json')
 
       expect(aws2.os_aws.server.group_uuid).to eq j[:group_id]
-      puts aws2.os_aws.server.inspect
 
       local_file = File.expand_path('spec/resources/upload_me.sh')
       remote_file = '/home/ubuntu/i_uploaded_this_file.sh'
@@ -111,7 +132,11 @@ describe OpenStudio::Aws::Aws do
     end
 
     after :all do
-      # FileUtils.rm_f 'ec2_server_key.pem' if File.exist? 'ec2_server_key.pem'
+      if File.exist? 'server_data.json'
+      	j = JSON.parse(File.read('server_data.json'), symbolize_names: true)
+
+      	@aws.terminate_instances_by_group_id(j[:group_id])
+      end
     end
   end
 
@@ -152,6 +177,8 @@ describe OpenStudio::Aws::Aws do
 
         @aws.create_server(options)
 
+        @aws.save_cluster_info 'server_data.json'
+
         expect(File.exist?('ec2_server_key.pem')).to be true
         expect(File.exist?('server_data.json')).to be true
         expect(@aws.os_aws.server).not_to be_nil
@@ -161,8 +188,6 @@ describe OpenStudio::Aws::Aws do
         expect(h[:group_id]).to match /^[\d\S]{32}$/
         expect(h[:location]).to eq 'AWS'
 
-        puts h.inspect
-
         @group_id = h[:group_id]
       ensure
         @aws.terminate_instances_by_group_id(h[:group_id])
@@ -178,52 +203,10 @@ describe OpenStudio::Aws::Aws do
       @group_id = nil
     end
 
-    it 'should create allow a zero length worker' do
-      begin
-        begin
-          options = {
-            instance_type: 'm3.medium',
-            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
-          expect(h[:group_id]).to be_a String
-          expect(h[:group_id]).to match /^[\d\S]{32}$/
-          expect(h[:location]).to eq 'AWS'
-        ensure
-          @aws.terminate_instances_by_group_id(h[:group_id])
-        end
-      end
-    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
+    it 'should allow a zero length worker' do
       begin
         options = {
-          instance_type: 'i2.xlarge',
+          instance_type: 'm3.medium',
           image_id: SERVER_AMI,
           tags: [
             'ci_tests=true',
@@ -243,13 +226,58 @@ describe OpenStudio::Aws::Aws do
         @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/
+        expect(h[:group_id]).to be_a String
+        expect(h[:group_id]).to match /^[\d\S]{32}$/
+        expect(h[:location]).to eq 'AWS'
       ensure
         @aws.terminate_instances_by_group_id(h[:group_id])
       end
     end
   end
+
+  context 'key locations' do
+    before :all do
+      FileUtils.rm_rf 'spec/output/save_path'
+
+      @config = OpenStudio::Aws::Config.new
+      options = {
+        save_directory: 'spec/output/save_path'
+      }
+      @aws = OpenStudio::Aws::Aws.new(options)
+
+      @group_id = nil
+    end
+
+    it 'should allow a different location for saving aws config files' do
+      begin
+        options = {
+          instance_type: 'm3.medium',
+          image_id: SERVER_AMI
+        }
+
+        expect(@aws.save_directory).to eq File.join(File.expand_path('.'), 'spec/output/save_path')
+
+        @aws.create_server(options)
+
+        @aws.save_cluster_info "#{@aws.save_directory}/server_data.json"
+
+        expect(File.exist?('spec/output/save_path/ec2_server_key.pem')).to be true
+        expect(File.exist?('spec/output/save_path/ec2_worker_key.pem')).to be true
+        expect(File.exist?('spec/output/save_path/ec2_worker_key.pub')).to be true
+        expect(File.exist?('spec/output/save_path/server_data.json')).to be true
+
+        expect(@aws.os_aws.server).not_to be_nil
+        expect(@aws.os_aws.server.data.availability_zone).to match /us-east-../
+
+        h = @aws.os_aws.server.to_os_hash
+        expect(h[:group_id]).to be_a String
+        expect(h[:group_id]).to match /^[\d\S]{32}$/
+        @group_id = h[:group_id]
+      ensure
+        @aws.terminate_instances_by_group_id(@group_id)
+      end
+
+      # verify that the instances are dead -- how?
+    end
+  end
 end

data/spec/openstudio-aws/ami_list_spec.rb

@@ -43,6 +43,15 @@ 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
+      a = OpenStudioAmis.new(2, openstudio_version: '1.7.5', stable: true)
+
+      amis = a.get_amis
+
+      expect(amis[:server]).to eq('ami-845a54ec')
+      expect(amis[:worker]).to eq('ami-3a5a5452')
+    end
+
     it 'should return openstudio version 1.7.1 stable & default versions correctly' do
       a = OpenStudioAmis.new(2, openstudio_version: '1.7.1')
 

data/spec/openstudio-aws/aws_spec.rb

@@ -80,6 +80,18 @@ describe OpenStudio::Aws::Aws do
 
       expect { aws.create_server(options) }.to raise_error /Must pass in the private_key_file_name/
     end
+
+    it 'should create a key in another directory' do
+      options = {}
+      aws = OpenStudio::Aws::Aws.new
+      expect(aws.save_directory).to eq File.expand_path('.')
+
+      options = {
+        save_directory: 'spec/output/save_path'
+      }
+      aws = OpenStudio::Aws::Aws.new(options)
+      expect(aws.save_directory).to eq File.join(File.expand_path('.'), 'spec/output/save_path')
+    end
   end
 
   context 'proxy configuration' do
@@ -92,7 +104,6 @@ describe OpenStudio::Aws::Aws do
       }
 
       @aws = OpenStudio::Aws::Aws.new(options)
-      # puts @aws.inspect
       expect(@aws.os_aws).not_to be_nil
     end
 
@@ -140,4 +151,15 @@ describe OpenStudio::Aws::Aws do
       expect(az[:availability_zone_info].first[:zone_name]).to eq 'us-east-1a'
     end
   end
+
+  context 'total instances' do
+    it 'should describe the total instances' do
+      options = {}
+      aws = OpenStudio::Aws::Aws.new(options)
+      az = aws.total_instances_count
+
+      expect(az[:total_instances]).to_not be_nil
+      expect(az[:region]).to_not be_nil
+    end
+  end
 end

data/spec/openstudio-aws/aws_wrapper_spec.rb

@@ -5,7 +5,7 @@ describe OpenStudioAwsWrapper do
   context 'unauthenticated session' do
     it 'should fail to authenticate' do
       options = {
-        credentials: {
+        credentials:             {
           access_key_id: 'some_random_access_key_id',
           secret_access_key: 'some_super_secret_access_key',
           region: 'us-east-1',
@@ -42,7 +42,7 @@ describe OpenStudioAwsWrapper do
       end
 
       it 'should list number of instances' do
-        resp = @aws.os_aws.describe_total_instances
+        resp = @aws.os_aws.total_instances_count
         expect(resp).not_to be_nil
       end
     end
@@ -103,6 +103,7 @@ 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