openstudio-aws 0.4.0.alpha1 → 0.4.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0caae029f8b89a624ac2eae705dd9116f6fb73d6
-  data.tar.gz: 9027677347681dfda91f3b57bdf4266ec4da5822
+  metadata.gz: eba77b1f1302604cb57c69a087796ead6aaf2c98
+  data.tar.gz: 113a23d7859a8da882a7f5e426098cbf6ed61986
 SHA512:
-  metadata.gz: 92220c6aa21ced920173e584686c10546bc92bb2c2d5668dc911668ffd7fb5c38ea34e4c82793f329e2a0d37d19602667afb03a76c81224ac9bfb004244f815b
-  data.tar.gz: c8b09f832050cc296425ee4a08b1cb95fba8002dd151a794b0fab0895afdf8752b197da29e7a476148ebdb827ae6fc6bd25ce05227ebf66968b93327bd138d58
+  metadata.gz: b01c424a5369cddce55c78adfb87b3c330158faa4e0b25f7148106c5947db6f8df7dbd91e4d1e3d4749e6548476743b5edd5865477e3b864b6d034539a3c8bab
+  data.tar.gz: 99026903cb962cbb0e8990aa97236ce645336346d1977be7027a4aee58757768d835b4869957dd5965f4629ee0f17dc2da1f62ede3c3fb803873253181e87333

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 OpenStudio AWS Gem Change Log
 ==================================
 
+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).

data/lib/openstudio/aws/aws.rb

@@ -294,6 +294,11 @@ module OpenStudio
         @os_aws.describe_instances
       end
 
+      # List the description of all instances on AWS in the predefined region
+      def describe_all_instances
+        @os_aws.describe_all_instances
+      end
+
       # Return the list of all the instances that are running on the account in the availablity zone
       def total_instances_count
         @os_aws.total_instances_count
@@ -327,7 +332,7 @@ module OpenStudio
 
       # Warning, this appears that it terminates all the instances
       def terminate_instances_by_group_id(group_id)
-        fail "Group ID not defined" unless group_id
+        fail 'Group ID not defined' unless group_id
 
         instances = @os_aws.describe_running_instances(group_id)
         logger.info instances

data/lib/openstudio/aws/version.rb

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

data/lib/openstudio/lib/ami_list.rb

@@ -122,7 +122,7 @@ class OpenStudioAmis
           amis = value[:amis]
         else
           logger.info "Could not find a stable version for OpenStudio version #{@options[:openstudio_version]}. "\
-                      "Looking up older versions to find the latest stable." unless stable
+                      'Looking up older versions to find the latest stable.' unless stable
 
           json[:openstudio].each do |os_version, values|
             next if os_version == :default

data/lib/openstudio/lib/openstudio_aws_instance.rb

@@ -269,8 +269,6 @@ class OpenStudioAwsInstance
     processors = 1
     if lookup.key?(instance)
       processors = lookup[instance]
-    else
-      # logger.warn "Could not find the number of processors for instance type of #{instance}" if logger
     end
 
     if @openstudio_instance_type == :server

data/lib/openstudio/lib/openstudio_aws_wrapper.rb

@@ -59,8 +59,17 @@ class OpenStudioAwsWrapper
     @security_groups = []
     @key_pair_name = nil
     @private_key_file_name = nil
+    @region = options[:region] || 'unknown-region'
 
-    @worker_keys = SSHKey.generate
+    # If the keys exist in the directory then load those, otherwise create new ones.
+    work_dir = options[:save_directory] || '.'
+    if File.exist?(File.join(work_dir, 'ec2_worker_key.pem')) && File.exist?(File.join(work_dir, 'ec2_worker_key.pub'))
+      logger.info "Worker keys already exist, loading from #{work_dir}"
+      @worker_keys = SSHKey.new(File.read(File.join(work_dir, 'ec2_worker_key.pem')))
+    else
+      logger.info 'Generating new worker keys'
+      @worker_keys = SSHKey.generate
+    end
 
     @private_key = nil # Private key data
 
@@ -121,9 +130,15 @@ class OpenStudioAwsWrapper
   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 }
+    availability_zone = resp.instance_statuses.length > 0 ? resp.instance_statuses.first.availability_zone : 'no_instances'
+
+    { total_instances: resp.instance_statuses.length, region: @region, availability_zone: availability_zone }
+  end
+
+  def describe_all_instances
+    resp = @aws.describe_instance_status
+
+    resp
   end
 
   # describe the instances by group id (this is the default method)
@@ -377,8 +392,7 @@ class OpenStudioAwsWrapper
       user_id: 'unknown_user',
       tags: [],
       ebs_volume_size: nil,
-      availability_zone: @server.data.availability_zone,
-      worker_public_key: ''
+      availability_zone: @server.data.availability_zone
     }
     launch_options = defaults.merge(launch_options)
 

data/spec/aws_instances/aws_spec_api.rb

@@ -69,9 +69,9 @@ describe OpenStudio::Aws::Aws do
 
     after :all do
       if File.exist? 'server_data.json'
-      	j = JSON.parse(File.read('server_data.json'), symbolize_names: true)
+        j = JSON.parse(File.read('server_data.json'), symbolize_names: true)
 
-      	@aws.terminate_instances_by_group_id(j[:group_id])
+        @aws.terminate_instances_by_group_id(j[:group_id])
       end
     end
   end
@@ -85,9 +85,9 @@ describe OpenStudio::Aws::Aws do
     end
 
     it 'should create a server' do
-      options = { 
-      	instance_type: 'm3.medium', 
-      	image_id: SERVER_AMI 
+      options = {
+        instance_type: 'm3.medium',
+        image_id: SERVER_AMI
       }
 
       @aws.create_server(options)
@@ -133,9 +133,9 @@ describe OpenStudio::Aws::Aws do
 
     after :all do
       if File.exist? 'server_data.json'
-      	j = JSON.parse(File.read('server_data.json'), symbolize_names: true)
+        j = JSON.parse(File.read('server_data.json'), symbolize_names: true)
 
-      	@aws.terminate_instances_by_group_id(j[:group_id])
+        @aws.terminate_instances_by_group_id(j[:group_id])
       end
     end
   end
@@ -279,5 +279,15 @@ describe OpenStudio::Aws::Aws do
 
       # verify that the instances are dead -- how?
     end
+
+    it 'should load in the worker keys if exist on disk' do
+      options = {
+        save_directory: 'spec/output/save_path'
+      }
+      @aws_2 = OpenStudio::Aws::Aws.new(options)
+
+      expect(@aws_2.os_aws.worker_keys.private_key).not_to be_nil
+      expect(@aws_2.os_aws.worker_keys.public_key).not_to 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',

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openstudio-aws
 version: !ruby/object:Gem::Version
-  version: 0.4.0.alpha1
+  version: 0.4.0.alpha2
 platform: ruby
 authors:
 - Nicholas Long
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-10 00:00:00.000000000 Z
+date: 2015-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-scp