danarchy_sys 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59baad97d006ee7aff82b4b2967e07234be91984
-  data.tar.gz: c5a05a4144cd523a29ba0fb7f98dede535fd0b4f
+  metadata.gz: 4aa6e032fcc91f01d05a9e4e5a766c631aaccb8e
+  data.tar.gz: 209fdf53de2e687c9860582e3da9a457c749cb01
 SHA512:
-  metadata.gz: 4edbb2c640b2762d56ceda9cb996f0aa8420441b6eacf377a3a3672fb2c80069565f3a6deaa96c74bfc628123872efe334ee4df7be6401694851903ecdce712a
-  data.tar.gz: 662041f3b1cf5ad712cb3455461529f2f3181af54ff68f76bc05eac091bceb03df5ef36356732dc58c084e157a99f8729755053e04ff87a968a46faaf30c01e0
+  metadata.gz: 71707b82e521b6f6e8e0777b36822f58227edbb812b504a539d68d9c33ae271d6ddbc57ae9bc64fd538935a3ca5e509b407c69ae7c91f0e1c9cecc1a71be2c4b
+  data.tar.gz: 6a94054147211b6fa3f7c0f3aa03201f3eea2e1691ac85a6cefcf7b58285f0740e4614e290c9ca64db278b5358f6495485e3641fcd8524beff8fb43655d1b135

data/lib/danarchy_sys/cli/instance_manager.rb

@@ -14,7 +14,7 @@ class InstanceManager
         return Menus.print_menu('main') if instance == 'main'
       end
 
-      print "#{instance.name} ~: "
+      print "#{instance.name} ~: " if instance
       cmd = gets.chomp
 
       next if cmd.empty?
@@ -67,29 +67,18 @@ class InstanceManager
 
         printf("\n%#{instance.name.size}s %0s %0s\n", instance.name, ' => ', instance.state)
       elsif cmd == 'rebuild'
-        print "Should we rebuild #{instance.name}? (Y/N): "
+        image = PromptsCreateInstance.image(os_compute.images)
+        print "Should we rebuild #{instance.name} with image: #{image.name}? (Y/N): "
         if gets.chomp =~ /^y(es)?$/i
-          image = PromptsCreateInstance.image(os_compute.images)
-          instance.rebuild(image.id, instance.name)
-
-          print "Rebuilding #{instance.name} with #{image.name}"
-          instance = os_compute.instances.get_instance(instance.name)
-          until instance.state == 'ACTIVE'
-            instance = os_compute.instances.get_instance(instance.name)
-            sleep(3)
-            print ' .'
-          end
-
-          addrs = os_compute.instances.get_public_addresses(instance.name)
-          addrs.each { |ip| `ssh-keygen -R #{ip} &>/dev/null` }
+          puts "Rebuilding #{instance.name} with #{image.name}"
+          instance = os_compute.instances.rebuild_instance(instance, image)
           puts "\nRebuild successful!"
         else
           puts "Not rebuilding #{instance.name} at this time."
         end
       elsif cmd == 'connect'
         if instance.state == 'ACTIVE'
-          connect = os_compute.ssh(instance.name)
-          puts connect if connect != true
+          os_compute.ssh(instance.name)          
         else
           puts "Unable to connect: #{instance.name} is not running!"
         end
@@ -103,14 +92,12 @@ class InstanceManager
   end
 
   def self.chooser(os_compute)
-    comp_inst = os_compute.instances
-    instances = comp_inst.all_instances
-    instances_numhash = Helpers.objects_to_numhash(comp_inst.all_instances)
+    instances_numhash = Helpers.objects_to_numhash(os_compute.instances.all_instances)
     instance_name = nil
     instance = nil
 
     # Create a new instances if none exist
-    if instances.empty?
+    if instances_numhash.empty?
       print 'No existing instances were found. Should we create a new one? (Y/N): '
       abort('Exiting!') unless gets.chomp =~ /^y(es)?$/i
       instance = PromptsCreateInstance.create_instance(os_compute, 'nil')
@@ -120,12 +107,12 @@ class InstanceManager
 
     puts 'Available instances:'
     istatus = InstanceStatus.new(os_compute)
-    istatus.all_instances(instances)
+    istatus.all_instances(instances_numhash)
 
     # Loop input until an existing instance is selected
     print 'Enter an instance to manage or enter a name for a new instance: '
 
-    until comp_inst.check_instance(instance_name) == true
+    until instances_numhash.values.collect{|i| i[:name]}.include?(instance_name) # os_compute.instances.check_instance(instance_name) == true
       instance_name = gets.chomp
 
       until instance_name.empty? == false
@@ -146,20 +133,21 @@ class InstanceManager
         instance_name = instances_numhash[instance_name.to_i][:name].to_s
       end
 
-      unless comp_inst.check_instance(instance_name) == true
+      unless instances_numhash.values.collect{|i| i[:name]}.include?(instance_name) # os_compute.instances.check_instance(instance_name) == true
         print "#{instance_name} is not a valid instance.
 Should we create a new instance named #{instance_name}? (Y/N): "
 
         if gets.chomp =~ /^y(es)?$/i
-          PromptsCreateInstance.create_instance(os_compute, instance_name)
+          instance = PromptsCreateInstance.create_instance(os_compute, instance_name)
+          return instance
         else
           puts "Not creating new instance: #{instance_name}."
-          return false
+          return
         end
       end
     end
 
-    instance = comp_inst.get_instance(instance_name)
+    instance = os_compute.instances.get_instance(instance_name)
     Menus.print_menu('instance')
     puts "Managing instance: #{instance_name}\tStatus: #{instance.state}"
     instance

data/lib/danarchy_sys/cli/instance_manager/instance_status.rb

@@ -8,7 +8,7 @@ class InstanceStatus
   def all_instances(instances)
     istats = {}
 
-    instances.map.with_index(1) do |instance, id|
+    instances.each do |id, instance|
       istats[id] = single_instance(instance)
     end
 
@@ -32,29 +32,22 @@ class InstanceStatus
   end
 
   def single_instance(instance)
-    image  = @images.get_image_by_id(instance.image['id'])
-    flavor = @flavors.get_flavor_by_id(instance.flavor['id'])
-
-    image = NilImage.new if image == nil
-
-    istats = { 'name'  => instance.name,
-               'status' => instance.state,
-               'image' => image.name,
-               'vcpus' => flavor.vcpus,
-               'ram'   => flavor.ram,
-               'disk'  => flavor.disk,
-               'keypair' => instance.key_name,
+    image = Helpers.object_to_hash(@images.get_image_by_id(instance[:image]['id']))
+    flavor = Helpers.object_to_hash(@flavors.get_flavor_by_id(instance[:flavor]['id']))
+    
+    image = {:name => 'Not Found'} if image == nil
+
+    istats = { 'name'  => instance[:name],
+               'status' => instance[:state],
+               'image' => image[:name],
+               'vcpus' => flavor[:vcpus],
+               'ram'   => flavor[:ram],
+               'disk'  => flavor[:disk],
+               'keypair' => instance[:key_name],
              }
   end
 
   def _header(format)
     printf("#{format}\n", 'Id', 'Name', 'Status', 'Image', 'VCPUS', 'RAM', 'Disk', 'KeyPair')
   end
-
-  class NilImage
-    def name
-      'Not Found'
-    end
-  end
 end
-

data/lib/danarchy_sys/helpers.rb

@@ -4,10 +4,8 @@ class Helpers
   def self.array_to_numhash(array)
     numbered_hash = {}
     
-    count = 1
-    array.sort.each do |item|
-      numbered_hash[count] = item
-      count += 1
+    array.each.with_index(1) do |item, id|
+      numbered_hash[id] = item
     end
 
     numbered_hash
@@ -23,7 +21,13 @@ class Helpers
     numbered_hash
   end
 
+  def self.object_to_hash(object)
+    return nil if !object
+    object.all_attributes
+  end
+
   def self.objects_to_numhash(objects)
+    return nil if !objects
     numbered_object_hash = {}
 
     objects.map.with_index(1) do | obj, index |

data/lib/danarchy_sys/openstack/compute.rb

@@ -11,10 +11,13 @@ module DanarchySys
         connection = danarchysys_config[:connections][provider.to_sym]
         @settings = danarchysys_config[:global_settings]
         @compute = Fog::Compute::OpenStack.new(connection)
+        @instances = @compute.servers
+        @images = @compute.images(filters: {'status' => ['ACTIVE']})
+        @flavors = @compute.flavors
       end
 
       def instances
-        ComputeInstances.new(@compute, @settings)
+        ComputeInstances.new(@compute, @instances, @settings)
       end
 
       def keypairs
@@ -22,11 +25,11 @@ module DanarchySys
       end
 
       def images
-        ComputeImages.new(@compute)
+        ComputeImages.new(@compute, @images)
       end
 
       def flavors
-        ComputeFlavors.new(@compute)
+        ComputeFlavors.new(@compute, @flavors)
       end
 
       def secgroups
@@ -47,11 +50,14 @@ module DanarchySys
         image_id = instance.image['id']
         image = comp_img.get_image_by_id(image_id)
 
+        ssh = nil
         if image == nil
           puts "Image not found for #{instance.name}! This instance needs to be rebuild with a current image."
-          return fallback_ssh(ipv4, pemfile)          
+          ssh = fallback_ssh(ipv4, pemfile)
         end
 
+        return ssh if ssh == true
+
         # CoreOS is an exception with user as simply 'core' and not 'coreos'
         user = 'ubuntu' if image.name =~ /ubuntu/i
         user = 'debian' if image.name =~ /debian/i
@@ -69,24 +75,25 @@ module DanarchySys
           sleep(5)
           fallback_ssh(ipv4, pemfile)
           attempts += 1
+          puts 'Giving up after 3 tries.' if attempts > 3
         end
+
+        ssh
       end
 
       def fallback_ssh(ipv4, pemfile)
         users = ['ubuntu','debian','centos','fedora','core']
-        ssh = false
+        ssh = nil
 
         users.each do |user|
           puts "Attempting connection as user: #{user} => #{ipv4}"
           connect = "ssh #{user}@#{ipv4} -i '#{pemfile}'"
           ssh = system(connect)
-          return true if ssh == true
+          break if ssh == true
         end
 
-        if ssh == false
-          puts 'Unable to connect after 3 tries!'
-          return false
-        end
+        puts 'Unable to connect! User unknown or SSHd is not running on the instance.' if ssh == false
+        ssh
       end
     end
   end

data/lib/danarchy_sys/openstack/compute/flavors.rb

@@ -1,47 +1,25 @@
 
 # OpenStack Flavor Management
 class ComputeFlavors
-  def initialize(compute)
+  def initialize(compute, flavors)
     @compute = compute
+    @flavors = flavors
   end
 
-  def all_flavors
-    @compute.flavors
+  def all_flavors(*filter)
+    filter = filter.shift || {'status' => ['ACTIVE']}
+    @flavors = @compute.flavors(filters: filter)
   end
 
-  def list_flavors
-    flavors = all_flavors
-    flavor_list = []
-
-    # Get flavor names into array
-    flavors.each do |i|
-      flavor_list.push(i.name.split('.')[1])
-    end
-
-    flavor_list
-  end
-
-  def get_flavor(flavor_name)
-    flavors = all_flavors
-
-    # Get flavor object based on input flavor_name.
-    flavor = 'nil'
-    flavors.each do |f|
-      flavor = f if f.name.end_with?(flavor_name)
-    end
-
-    flavor
+  def get_flavor_by_name(flavor_name)
+    @flavors.collect do |f|
+      f if f.name.end_with?(flavor_name)
+    end.compact!.first
   end
 
   def get_flavor_by_id(flavor_id)
-    flavors = all_flavors
-
-    # Get flavor based on input flavor_id.
-    flavor = 'nil'
-    flavors.each do |i|
-      flavor = i if i.id == flavor_id
-    end
-
-    flavor
+    @flavors.collect do |i|
+      i if i.id == flavor_id
+    end.compact!.first
   end
 end

data/lib/danarchy_sys/openstack/compute/images.rb

@@ -1,39 +1,27 @@
 
 # OpenStack Image Management
 class ComputeImages
-  def initialize(compute)
+  def initialize(compute, images)
     @compute = compute
+    @images = images
   end
 
   def all_images(*filter)
-    filter = filter.shift || {}
-    @compute.images(filters: filter)
-  end
-
-  def list_all_images
-    all_images.collect { |i| i.name }
-  end
-
-  def list_active_images
-    all_images({'status' => 'ACTIVE'})
+    filter = filter.shift || {'status' => ['ACTIVE']}
+    @images = @compute.images(filters: filter)
   end
 
   def get_image_by_name(image_name)
-    all_images({
-                 'status' => 'ACTIVE',
-                 'name'   => image_name
-               }).first
-    # .first may become a problem here
-    # if names are duplicates
+    @images.collect do |i|
+      next unless i.status == 'ACTIVE'
+      next unless i.name == image_name
+      i
+    end.compact!.first
   end
 
   def get_image_by_id(image_id)
-    image = nil
-    
-    all_images.each do |i|
-      image = i if i.id == image_id
-    end
-
-    image
+    @images.collect do |i|
+      i if i.id == image_id
+    end.compact!.first
   end
 end

data/lib/danarchy_sys/openstack/compute/instances.rb

@@ -1,22 +1,25 @@
 
 # OpenStack Instance Management
 class ComputeInstances
-  def initialize(compute, settings)
+  def initialize(compute, instances, settings)
     @compute = compute
+    @instances = instances
     @settings = settings
   end
   
   def all_instances(*filter)
     filter = filter.shift || {}
-    @compute.servers(filters: filter)
+    @instances = @compute.servers(filters: filter)
   end
 
   def list_all_instances
-    all_instances.collect { |i| i.name }
+    @instances.collect { |i| i.name }
   end
 
   def list_active_instances
-    all_instances({ 'status' => ['ACTIVE'] }).collect { |i| i.name }
+    @instances.collect do |i|
+      i.name if i.status == 'ACTIVE'
+    end.compact!
   end
 
   def check_instance(instance_name)
@@ -33,74 +36,56 @@ class ComputeInstances
   end
 
   def get_public_addresses(instance)
-    if instance.class == String
-      instance = get_instance(instance)
-    end
-
+    instance = get_instance(instance) if instance.class == String
     addrs = instance.addresses
-    return false if !addrs['public']
+    return nil if !addrs['public']
     addrs['public'].map{|a| a['addr']}
   end
 
   def get_private_addresses(instance)
-    if instance.class == String
-      instance = get_instance(instance)
-    end
-
+    instance = get_instance(instance) if instance.class == String
     addrs = instance.addresses
-    return false if !addrs['private']
+    return nil if !addrs['private']
     addrs['public'].map{|a| a['addr']}
   end
 
   def pause(instance)
-    if instance.class == String
-      instance = get_instance(instance)
-    end
+    instance = get_instance(instance) if instance.class == String
 
     return false unless instance.state == 'ACTIVE'
     instance.pause
   end
 
   def unpause(instance)
-    if instance.class == String
-      instance = get_instance(instance)
-    end
+    instance = get_instance(instance) if instance.class == String
 
     return false unless instance.state == 'PAUSED'
     instance.start
   end
 
   def suspend(instance)
-    if instance.class == String
-      instance = get_instance(instance)
-    end
+    instance = get_instance(instance) if instance.class == String
 
     return false unless instance.state == 'ACTIVE'
     instance.suspend
   end
 
   def resume(instance)
-    if instance.class == String
-      instance = get_instance(instance)
-    end
+    instance = get_instance(instance) if instance.class == String
 
     return false unless instance.state == 'SUSPENDED'
     instance.start
   end
 
   def start(instance)
-    if instance.class == String
-      instance = get_instance(instance)
-    end
+    instance = get_instance(instance) if instance.class == String
 
     return false unless instance.state == 'SHUTOFF'
     instance.start
   end
 
   def stop(instance)
-    if instance.class == String
-      instance = get_instance(instance)
-    end
+    instance = get_instance(instance) if instance.class == String
 
     return false unless instance.state == 'ACTIVE'
     instance.stop
@@ -116,6 +101,8 @@ class ComputeInstances
                                       user_data: user_data)
     
     # add security_group
+    # add volumes
+    # handle user_data with base64 encoding
 
     # Put error handling from instance_prompts here
     
@@ -123,10 +110,23 @@ class ComputeInstances
     instance
   end
 
-  def delete_instance(instance_name)
-    # check for and delete instance
-    instance = get_instance(instance_name)
+  def rebuild_instance(instance, image)
+    instance = get_instance(instance) if instance.class == String
+
+    instance.rebuild(image.id, instance.name)
+    addrs = [get_public_addresses(instance),
+             get_private_addresses(instance)].flatten.compact!
+    addrs.each { |addr| system("ssh-keygen -R #{addr}") }
+
+    instance.wait_for { ready? }
+    instance
+  end
+
+  def delete_instance(instance)
+    instance = get_instance(instance) if instance.class == String    
     return 1 if instance == false
+
+    instance_name = instance.name
     @compute.delete_server(instance.id)
 
     attempt = 1
@@ -136,6 +136,10 @@ class ComputeInstances
       attempt += 1
     end
 
+    addrs = [get_public_addresses(instance),
+             get_private_addresses(instance)].flatten.compact!
+    addrs.each { |addr| system("ssh-keygen -R #{addr}") }
+
     return true
   end
 end

data/lib/danarchy_sys/version.rb

@@ -1,3 +1,3 @@
 module DanarchySys
-  VERSION = "0.3.2"
+  VERSION = '0.4.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: danarchy_sys
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Dan James
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-31 00:00:00.000000000 Z
+date: 2017-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-openstack
@@ -93,8 +93,6 @@ files:
 - bin/danarchy_sys
 - danarchy_sys.gemspec
 - lib/danarchy_sys.rb
-- lib/danarchy_sys/aws.rb
-- lib/danarchy_sys/aws/compute.rb
 - lib/danarchy_sys/cli.rb
 - lib/danarchy_sys/cli/instance_manager.rb
 - lib/danarchy_sys/cli/instance_manager/instance_status.rb

data/lib/danarchy_sys/aws.rb

@@ -1,9 +0,0 @@
-
-require 'fog/aws'
-
-module DanarchySys
-  module AWS
-    # Load AWS compute requirements
-    require_relative 'aws/compute'
-  end
-end

data/lib/danarchy_sys/aws/compute.rb

@@ -1,13 +0,0 @@
-module DanarchySys
-  module AWS
-    class Compute
-      def initialize(provider)
-        config = ConfigManager.new
-        danarchysys_config = config.load
-        connection = danarchysys_config[:connections][provider]
-        @settings = danarchysys_config[:settings]
-        @compute = Fog::Compute::AWS.new(connection)
-      end
-    end
-  end
-end