beaker-aws 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25ed7d4088360b6932af6030241fbec171819c1f
-  data.tar.gz: 5a087caf648e84fc6886f7cb77aea9c430569fa5
+  metadata.gz: 9b39f1ca1a2bdc0a2a8e75730e76cd69d4cc934c
+  data.tar.gz: 7759619b5826a06b6f575315504c98aec4b91266
 SHA512:
-  metadata.gz: 0e8141e8939e84487128d04be5315dd7e3ac747076d6a01201aa75d16ede330650c06eed48d8d6ef1b052ef8c32abe80a3993db562866492f3d33212ae838263
-  data.tar.gz: bc3a0e59c45667e3a38939a7f8896f404a4997facf5dc7942f826385af689dbf915d6a1424add235ee2c6a32de41212aba0a53a32250e1e410b168974190da71
+  metadata.gz: 8fc76af69f00c9454c590af3bf8bcb1e79dfd0955a2f025b65820bc80d4af3a55bed483d5fb0c21b98212f0c29050a667c896e7514dbf5e11fe8cdf579e55d39
+  data.tar.gz: f75390cb0aeddbf63c8764c19e806c110f98f3d26077a0143386576d9728aa0f763158912676c588849e4aad2ffee408638c5fb6a72d25e0f8fc8db4fded007a

data/lib/beaker-aws/version.rb

@@ -1,3 +1,3 @@
 module BeakerAws
-  VERSION = '0.8.1'
+  VERSION = '0.9.0'
 end

data/lib/beaker/hypervisor/aws_sdk.rb

@@ -65,11 +65,19 @@ module Beaker
       # Perform the main launch work
       launch_all_nodes()
 
-      wait_for_status_netdev()
-
       # Add metadata tags to each instance
+      # tagging early as some nodes take longer
+      # to initialize and terminate before it has
+      # a chance to provision
       add_tags()
 
+      # adding the correct security groups to the
+      # network interface, as during the `launch_all_nodes()`
+      # step they never get assigned, although they get created
+      modify_network_interface()
+
+      wait_for_status_netdev()
+
       # Grab the ip addresses and dns from EC2 for each instance to use for ssh
       populate_dns()
 
@@ -352,6 +360,10 @@ module Beaker
         :instance_initiated_shutdown_behavior => "terminate",
       }
       if assoc_pub_ip_addr
+        # this never gets created, so they end up with
+        # default security group which only allows for
+        # ssh access from outside world which
+        # doesn't work well with remote devices etc.
         config[:network_interfaces] = [{
           :subnet_id => subnet_id,
           :groups => [security_group.group_id, ping_security_group.group_id],
@@ -485,7 +497,7 @@ module Beaker
       # Wait for each node to reach status :running
       @logger.notify("aws-sdk: Waiting for all hosts to be #{state_name}")
       instances.each do |x|
-        name = x[:host].name
+        name = x[:host] ? x[:host].name : x[:name]
         instance = x[:instance]
         @logger.notify("aws-sdk: Wait for node #{name} to be #{state_name}")
         # Here we keep waiting for the machine state to reach 'running' with an
@@ -530,9 +542,9 @@ module Beaker
           wait_for_status(:running, @hosts)
 
           wait_for_status(nil, @hosts) do |instance|
-            instance_status_collection = instance.client.describe_instance_status({:instance_ids => [instance.instance_id]})
-            first_instance = instance_status_collection.reservations.first.instances.first
-            first_instance[:system_status][:status] == "ok"
+            instance_status_collection = client.describe_instance_status({:instance_ids => [instance.instance_id]})
+            first_instance = instance_status_collection.first[:instance_statuses].first
+            first_instance[:instance_status][:status] == "ok" if first_instance
           end
 
           break
@@ -587,6 +599,33 @@ module Beaker
       nil
     end
 
+    # Add correct security groups to hosts network_interface
+    # as during the create_instance stage it is too early in process
+    # to configure
+    #
+    # @return [void]
+    # @api private
+    def modify_network_interface
+      @hosts.each do |host|
+        instance = host['instance']
+        host['sg_cidr_ips'] = host['sg_cidr_ips'] || '0.0.0.0/0';
+        sg_cidr_ips = host['sg_cidr_ips'].split(',')
+
+        # Define tags for the instance
+        @logger.notify("aws-sdk: Update network_interface for #{host.name}")
+
+        security_group = ensure_group(instance[:network_interfaces].first, Beaker::EC2Helper.amiports(host), sg_cidr_ips)
+        ping_security_group = ensure_ping_group(instance[:network_interfaces].first, sg_cidr_ips)
+
+        client.modify_network_interface_attribute(
+          :network_interface_id => "#{instance[:network_interfaces].first[:network_interface_id]}",
+          :groups => [security_group.group_id, ping_security_group.group_id],
+        )
+      end
+
+      nil
+    end
+
     # Populate the hosts IP address from the EC2 dns_name
     #
     # @return [void]
@@ -692,13 +731,17 @@ module Beaker
         end
         backoff_sleep(tries)
       end
-      host['user'] = 'root'
-      host.close
+      host['user'] = 'admin'
       sha256 = Digest::SHA256.new
-      password = sha256.hexdigest((1..50).map{(rand(86)+40).chr}.join.gsub(/\\/,'\&\&'))
-      host['ssh'] = {:password => password}
-      host.exec(Command.new("echo -e '#{password}\\n#{password}' | tmsh modify auth password admin"))
+      password = sha256.hexdigest((1..50).map{(rand(86)+40).chr}.join.gsub(/\\/,'\&\&')) + 'password!'
+      # disabling password policy to account for the enforcement level set
+      # and the generated password is sometimes too `01070366:3: Bad password (admin): BAD PASSWORD: \
+      # it is too simplistic/systematic`
+      host.exec(Command.new('modify auth password-policy policy-enforcement disabled'))
+      host.exec(Command.new("modify auth user admin password #{password}"))
       @logger.notify("f5: Configured admin password to be #{password}")
+      host.close
+      host['ssh'] = {:password => password}
     end
 
     # Enables root access for a host on an netscaler platform
@@ -730,7 +773,7 @@ module Beaker
           elsif host['platform'] =~ /windows/
             @logger.notify('aws-sdk: Change hostname on windows is not supported.')
           else
-            next if host['platform'] =~ /netscaler/
+            next if host['platform'] =~ /f5-|netscaler/
             host.exec(Command.new("hostname #{host.name}"))
             if host['vmname'] =~ /^amazon/
               # Amazon Linux requires this to preserve host name changes across reboots.
@@ -751,7 +794,7 @@ module Beaker
           elsif host['platform'] =~ /windows/
             @logger.notify('aws-sdk: Change hostname on windows is not supported.')
           else
-            next if host['platform'] =~ /netscaler/
+            next if host['platform'] =~ /ft-|netscaler/
             host.exec(Command.new("hostname #{host.hostname}"))
             if host['vmname'] =~ /^amazon/
               # See note above

data/spec/beaker/hypervisor/aws_sdk_spec.rb

@@ -119,6 +119,7 @@ module Beaker
       before :each do
         expect(aws).to receive(:launch_all_nodes)
         expect(aws).to receive(:add_tags)
+        expect(aws).to receive(:modify_network_interface)
         expect(aws).to receive(:populate_dns)
         expect(aws).to receive(:enable_root_on_hosts)
         expect(aws).to receive(:set_hostnames)
@@ -702,7 +703,7 @@ module Beaker
         allow( aws ).to receive( :backoff_sleep )
         sha_mock = Object.new
         allow( Digest::SHA256 ).to receive( :new ).and_return(sha_mock)
-        expect( sha_mock ).to receive( :hexdigest ).once()
+        expect( sha_mock ).to receive( :hexdigest ).and_return('thistest').once()
         enable_root_f5
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beaker-aws
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Rishi Javia, Kevin Imber, Tony Vu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-21 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec