corl 0.5.1 → 0.5.2

data/lib/core/mixin/action/keypair.rb

@@ -8,7 +8,7 @@ module Keypair
   # Options
         
   def keypair_config
-    register :private_key, :str, nil, 'corl.core.mixin.action.keypair.options.private_key' do |value|
+    register_str :private_key, nil, 'corl.core.mixin.action.keypair.options.private_key' do |value|
       success = true
       if value
         file = File.expand_path(value)
@@ -25,9 +25,9 @@ module Keypair
       success  
     end
     
-    register :require_password, :bool, false, 'corl.core.mixin.action.keypair.options.require_password'
+    register_bool :require_password, false, 'corl.core.mixin.action.keypair.options.require_password'
     
-    register :key_type, :str, 'RSA', 'corl.core.mixin.action.keypair.options.key_type' do |value|
+    register_str :key_type, 'RSA', 'corl.core.mixin.action.keypair.options.key_type' do |value|
       key_type_choices = [ 'RSA', 'DSA' ]
       unless key_type_choices.include?(value.to_s.upcase)
         warn('corl.core.mixin.action.keypair.errors.key_type', { :value => value, :choices => key_type_choices })
@@ -35,14 +35,14 @@ module Keypair
       end
       true
     end
-    register :key_bits, :int, 2048, 'corl.core.mixin.action.keypair.options.key_bits' do |value|
+    register_int :key_bits, 2048, 'corl.core.mixin.action.keypair.options.key_bits' do |value|
       unless value >= 2048
         warn('corl.core.mixin.action.keypair.errors.key_bits', { :value => value, :required => 2048 })
         next false 
       end
       true     
     end
-    register :key_comment, :str, '', 'corl.core.mixin.action.keypair.options.key_comment'
+    register_str :key_comment, '', 'corl.core.mixin.action.keypair.options.key_comment'
     
     config_subset(keypair_ignore)
   end
@@ -89,7 +89,7 @@ module Keypair
           if key_password
             key_options[:passphrase] = key_password
           else
-            warn('corl.core.mixin.action.keypair.errors.no_password')
+            warn('no_password')
             return nil
           end
         end

data/lib/core/mixin/action/registration.rb

@@ -5,24 +5,52 @@ module Action
 module Registration
         
   #-----------------------------------------------------------------------------
-  # Options
+  # Registration definitions
     
-  def register_node(name, default = nil)
-    name = name.to_sym
+  def register_network_provider(name, default = nil, locale = nil, &code)
+    register_plugin_provider(:CORL, :network, name.to_sym, default, locale, &code)
+  end
+  
+  #---
     
-    register name, :str, default do |value|
-      validate_plugins(:CORL, :node, name, value)
-    end
+  def register_network_providers(name, default = nil, locale = nil, &code)
+    register_plugin_providers(:CORL, :network, name.to_sym, default, locale, &code)
   end
   
   #---
     
-  def register_nodes(name, default = nil)
-    name = name.to_sym
+  def register_network(name, default = nil, locale = nil, &code)
+    register_plugin(:CORL, :network, name.to_sym, default, locale, &code)
+  end
+  
+  #---
+    
+  def register_networks(name, default = nil, locale = nil, &code)
+    register_plugins(:CORL, :network, name.to_sym, default, locale, &code) 
+  end
+  
+  #---
+   
+  def register_node_provider(name, default = nil, locale = nil, &code)
+    register_plugin_provider(:CORL, :node, name.to_sym, default, locale, &code)
+  end
+  
+  #---
+    
+  def register_node_providers(name, default = nil, locale = nil, &code)
+    register_plugin_providers(:CORL, :node, name.to_sym, default, locale, &code)
+  end
+  
+  #---
+    
+  def register_node(name, default = nil, locale = nil, &code)
+    register_plugin(:CORL, :node, name.to_sym, default, locale, &code)
+  end
+  
+  #---
     
-    register name, :array, default do |values|
-      validate_plugins(:CORL, :node, name, values)
-    end
+  def register_nodes(name, default = nil, locale = nil, &code)
+    register_plugins(:CORL, :node, name.to_sym, default, locale, &code) 
   end
 end
 end

data/lib/core/mod/fog_aws_server.rb

@@ -25,15 +25,13 @@ class Server
     rescue Net::SSH::HostKeyMismatch => error
       error.remember_host!
       sleep 0.2
-      reset = true
       retry
       
-    rescue Net::SSH::ConnectionTimeout, Net::SSH::Disconnect => error     
+    rescue Errno::ECONNREFUSED, Net::SSH::ConnectionTimeout, Net::SSH::Disconnect => error   
       if tries > 1
         sleep(sleep_secs)
         
         tries -= 1
-        reset  = true
         retry
       end
     end

data/lib/core/plugin/builder.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Plugin
-class Builder < CORL.plugin_class(:nucleon, :base)
+class Builder < Nucleon.plugin_class(:nucleon, :base)
   
   include Parallel
   

data/lib/core/plugin/cloud_action.rb

@@ -29,7 +29,15 @@ end
 
 module Nucleon
 module Plugin
-class CloudAction < CORL.plugin_class(:nucleon, :action)
+class CloudAction < Nucleon.plugin_class(:nucleon, :action)
+  
+  #-----------------------------------------------------------------------------
+  # Constuctor / Destructor
+  
+  def normalize(reload)
+    super
+    init_network unless reload 
+  end
   
   #-----------------------------------------------------------------------------
   # Property accessor / modifiers
@@ -38,6 +46,16 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
     :corl
   end
   
+  #---
+  
+  def network=network
+    @network = network
+  end
+  
+  def network
+    @network
+  end
+  
   #---
     
   def configure
@@ -51,48 +69,19 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
   # Settings
   
   def node_config
-    node_plugins = CORL.loaded_plugins(:CORL, :node)
+    register_str :net_remote, :edit, 'corl.core.action.options.net_remote'
+    register_network_provider :net_provider, :corl, [ 'corl.core.action.options.net_provider', 'corl.core.action.errors.network_provider' ]
     
-    register :parallel, :bool, true, 'corl.core.action.options.parallel'
-    register :net_remote, :str, :edit, 'corl.core.action.options.net_remote'
-    register :net_provider, :str, :corl, 'corl.core.action.options.net_provider' do |value|
-      value           = value.to_sym
-      network_plugins = CORL.loaded_plugins(:CORL, :network)
-      
-      unless network_plugins.keys.include?(value)
-        warn('corl.core.action.errors.network_provider', { :value => value, :choices => network_plugins.keys.join(", ") })
-        next false 
-      end
-      true
-    end
-    register :node_provider, :str, :local, 'corl.core.action.options.node_provider' do |value|
-      value          = value.to_sym      
-      node_providers = node_plugins.keys
-      
-      unless CORL.vagrant? || node_providers.include?(value)
-        warn('corl.core.action.errors.node_provider', { :value => value, :choices => node_providers.join(", ") })
-        next false
-      end
-      true  
-    end
-    register :nodes, :array, [], 'corl.core.action.options.nodes' do |values|
-      success = true
-      values.each do |value|
-        if info = CORL.plugin_class(:CORL, :node).translate_reference(value)
-          if ! node_plugins.keys.include?(info[:provider].to_sym) || info[:name].empty?
-            warn('corl.core.action.errors.nodes', { :value => value, :provider => info[:provider],  :name => info[:name] })
-            success = false
-          end
-        end
-      end
-      success
-    end
+    register_node_provider :node_provider, :local, [ 'corl.core.action.options.node_provider', 'corl.core.action.errors.node_provider' ]    
+    register_nodes :nodes, [], [ 'corl.core.action.options.nodes', 'corl.core.action.errors.nodes' ]
+    
+    register_bool :parallel, true, 'corl.core.action.options.parallel'
   end
   
   #---
          
   def node_ignore
-    [ :parallel, :net_remote, :net_provider, :node_provider, :nodes ]
+    [ :parallel, :node_provider, :nodes ]
   end
   
   #-----------------------------------------------------------------------------
@@ -107,10 +96,10 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
   def execute(use_network = true, &code)
     if use_network
       super(true, true) do
-        node_exec do |node, network|
+        node_exec do |node|
           hook_config = { :node => node, :network => network }
         
-          code.call(node, network) if code && extension_check(:exec_init, hook_config)
+          code.call(node) if code && extension_check(:exec_init, hook_config)
           myself.status = extension_set(:exec_exit, status, hook_config)
         end
       end
@@ -122,7 +111,7 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
   #---
         
   def node_exec
-    network = init_network
+    init_network(settings[:net_provider]) unless settings[:net_provider].to_sym == network.plugin_provider
     
     #
     # A fork in the road...
@@ -134,7 +123,7 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
         exec_config.delete(:nodes)
               
         result = node.action(plugin_provider, exec_config) do |op, data|
-          execute_remote(node, network, op, data)
+          execute_remote(node, op, data)
         end
         result.status == code.success 
       end
@@ -144,8 +133,10 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
       node = nil
       node = network.local_node if network
       
+      settings[:net_remote] = sanitize_remote(settings[:net_remote]) if settings.has_key?(:net_remote)
+      
       if validate(node, network)
-        yield(node, network) if block_given?
+        yield(node) if block_given?
       else
         puts "\n" + I18n.t('nucleon.core.exec.help.usage') + ': ' + help + "\n" unless quiet?
         myself.status = code.validation_failed 
@@ -155,7 +146,9 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
   
   #---
   
-  def init_network(path = nil)
+  def init_network(provider = nil, path = nil)
+    provider = extension_set(:network_provider, :corl) unless provider
+    
     # Get network configuration path
     if CORL.admin?
       network_path = lookup(:corl_network)
@@ -166,20 +159,19 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
     
     # Load network if it exists
     network_config = extended_config(:network, { :directory => network_path })
-    network        = CORL.network(network_path, network_config, settings[:net_provider])
-    network  
+    @network       = CORL.network(network_path, network_config, provider)
   end
   
   #---
   
-  def execute_remote(node, network, op, data)
+  def execute_remote(node, op, data)
     # Implement in sub classes if needed
     data 
   end
   
   #---
   
-  def ensure_network(network, &block)
+  def ensure_network(&block)
     codes :network_failure
     
     if network
@@ -202,8 +194,26 @@ class CloudAction < CORL.plugin_class(:nucleon, :action)
   #-----------------------------------------------------------------------------
   # Utilities
   
-  def sanitize_remote(network, remote)
-    remote && network.remote(remote) ? remote : nil
+  def sanitize_remote(remote)
+    remote && ( ! network || network.remote(remote) ) ? remote : nil
+  end
+  
+  #---
+  
+  def remote_message(remote)
+    remote ? "#{remote}" : "LOCAL ONLY"
+  end
+  
+  #---
+
+  def parse_property_name(property)
+    property = property.clone
+    
+    if property.size > 1
+      property.shift.to_s + '[' + property.join('][') + ']'
+    else
+      property.shift.to_s
+    end
   end
 end
 end

data/lib/core/plugin/configuration.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Plugin
-class Configuration < CORL.plugin_class(:nucleon, :base)
+class Configuration < Nucleon.plugin_class(:nucleon, :base)
     
   include Mixin::SubConfig
 
@@ -21,6 +21,7 @@ class Configuration < CORL.plugin_class(:nucleon, :base)
     init_subconfig(true) unless reload
     
     logger.info("Setting source configuration project")
+    
     @project = CORL.project(extended_config(:project, {
       :directory     => _delete(:directory, Dir.pwd),
       :url           => _delete(:url),
@@ -29,7 +30,7 @@ class Configuration < CORL.plugin_class(:nucleon, :base)
       :pull          => true,
       :internal_ip   => CORL.public_ip, # Needed for seeding Vagrant VMs
       :manage_ignore => _delete(:manage_ignore, true)
-    }), _delete(:project_provider))
+    }), _delete(:project_provider, nil)) unless reload
         
     _init(:autoload, true)
     _init(:autosave, false)
@@ -164,7 +165,7 @@ class Configuration < CORL.plugin_class(:nucleon, :base)
       
         config.clear if method_config.get(:override, false)
       
-        properties = Config.new
+        properties = Config.new({}, {}, true, false)
         success    = yield(method_config, properties) if block_given?
           
         if success && ! properties.export.empty?

data/lib/core/plugin/fog_machine.rb

@@ -5,9 +5,17 @@ nucleon_require(File.dirname(__FILE__), :machine)
 
 module CORL
 module Machine
-class Fog < CORL.plugin_class(:CORL, :machine)
+class Fog < Nucleon.plugin_class(:CORL, :machine)
   
   include Mixin::Machine::SSH
+
+  #-----------------------------------------------------------------------------
+  # Machine plugin interface
+  
+  def normalize(reload)
+    super
+    myself.plugin_name = '' if myself.plugin_provider == myself.plugin_name.to_sym
+  end
  
   #-----------------------------------------------------------------------------
   # Checks
@@ -71,7 +79,7 @@ class Fog < CORL.plugin_class(:CORL, :machine)
   
   def state
     return translate_state(server.state) if server
-    nil
+    translate_state(:aborted)
   end
    
   #---

data/lib/core/plugin/fog_node.rb

@@ -5,7 +5,7 @@ nucleon_require(File.dirname(__FILE__), :node)
 
 module CORL
 module Node
-class Fog < CORL.plugin_class(:CORL, :node)
+class Fog < Nucleon.plugin_class(:CORL, :node)
  
   #-----------------------------------------------------------------------------
   # Node plugin interface
@@ -13,9 +13,11 @@ class Fog < CORL.plugin_class(:CORL, :node)
   def normalize(reload)
     super
     
-    myself.region  = region 
+    @region_info = Config.new({}, {}, true, false) unless reload
+    
+    myself.region = region 
       
-    unless reload
+    unless reload     
       machine_provider = :fog
       machine_provider = yield if block_given?
                         
@@ -69,8 +71,12 @@ class Fog < CORL.plugin_class(:CORL, :node)
   
   #---
   
+  def region_info
+    @region_info  
+  end
+  
   def regions
-    []
+    @region_info.keys
   end
   
   def region=region

data/lib/core/plugin/machine.rb

@@ -1,14 +1,8 @@
 
 module CORL
 module Plugin
-class Machine < CORL.plugin_class(:nucleon, :base)
-
-  #-----------------------------------------------------------------------------
-  # Machine plugin interface
-  
-  def normalize(reload)
-  end
-       
+class Machine < Nucleon.plugin_class(:nucleon, :base)
+      
   #-----------------------------------------------------------------------------
   # Checks
   

data/lib/core/plugin/network.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Plugin
-class Network < CORL.plugin_class(:nucleon, :base)
+class Network < Nucleon.plugin_class(:nucleon, :base)
   
   init_plugin_collection(:add_node, :batch) 
   
@@ -353,6 +353,13 @@ class Network < CORL.plugin_class(:nucleon, :base)
     
     seed_requested      = config.has_key?(:seed)
     seed                = config.delete(:seed, false)
+    seed_project        = config.get(:project_reference, nil)
+    
+    if seed_project.nil?
+      project_provider = myself.config.project.plugin_provider
+      project_remote   = myself.config.remote(:edit)      
+      seed_project     = "#{project_provider}:::#{project_remote}"
+    end
     
     unless node.cache_setting(:initialized)
       bootstrap = true unless bootstrap_requested
@@ -370,9 +377,8 @@ class Network < CORL.plugin_class(:nucleon, :base)
         
     if success
       if seed
-        seed_project = config.get(:project_reference, nil)
         save_config  = { :commit => true, :remote => remote_name, :push => true }
-                         
+        
         if seed_project && remote_name
           # Reset project remote
           seed_info = Plugin::Project.translate_reference(seed_project)

data/lib/core/plugin/node.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Plugin
-class Node < CORL.plugin_class(:nucleon, :base)
+class Node < Nucleon.plugin_class(:nucleon, :base)
   
   include Parallel
   external_block_exec :exec, :command, :action
@@ -372,7 +372,7 @@ class Node < CORL.plugin_class(:nucleon, :base)
   
   def machine_config
     name   = setting(:id)
-    name   = setting(:hostname) if name.nil? || name.empty?
+    name   = nil if name.nil? || name.empty?
     config = Config.new({ :name => name })
     
     yield(config) if block_given?
@@ -1210,46 +1210,45 @@ class Node < CORL.plugin_class(:nucleon, :base)
 
   #---
 
-  def destroy(options = {})    
+  def destroy(options = {})
+    config  = Config.ensure(options)    
     success = true
-    
-    if machine && machine.created?
-      config = Config.ensure(options)
-      
-      if extension_check(:destroy, { :config => config })
-        logger.info("Destroying node: #{plugin_name}")
+         
+    if extension_check(:destroy, { :config => config })
+      logger.info("Destroying node: #{plugin_name}")
       
-        yield(:config, config) if block_given?
+      yield(:config, config) if block_given?
         
+      if machine && machine.created?
         # Shut down machine      
         success = machine.destroy(config.export)
-        
         myself.machine = nil
+      else
+        logger.warn("Node #{plugin_name} does not have an attached machine or is not created so cannot be destroyed")
+      end
         
-        # Remove SSH keys
-        if success && delete_keys
-          # Remove node information
-          network.delete_node(plugin_provider, plugin_name, false)
+      # Remove SSH keys
+      if success && delete_keys
+        # Remove node information
+        network.delete_node(plugin_provider, plugin_name, false)
           
-          network.save({
-            :commit => true, 
-            :remote => config.get(:remote, :edit), 
-            :push   => true 
-          })
-        end      
+        network.save({
+          :commit  => true, 
+          :remote  => config.get(:remote, :edit), 
+          :message => config.get(:message, "Destroying node #{plugin_name}"),
+          :push    => true 
+        })
+      end      
         
-        if success && block_given?
-          process_success = yield(:process, config)
-          success         = process_success if process_success == false        
-        end
+      if success && block_given?
+        process_success = yield(:process, config)
+        success         = process_success if process_success == false        
+      end
         
-        if success
-          extension(:destroy_success, { :config => config })
-          clear_cache
-        end
+      if success
+        extension(:destroy_success, { :config => config })
+        clear_cache
       end
-    else
-      logger.warn("Node #{plugin_name} does not have an attached machine or is not created so cannot be destroyed")
     end
     success    
   end

data/lib/core/plugin/provisioner.rb

@@ -1,7 +1,7 @@
 
 module CORL
 module Plugin
-class Provisioner < CORL.plugin_class(:nucleon, :base)
+class Provisioner < Nucleon.plugin_class(:nucleon, :base)
   
   include Parallel
   

data/lib/core/vagrant/Vagrantfile

@@ -3,5 +3,8 @@
 #-------------------------------------------------------------------------------
 #
 Vagrant.configure('2') do |config|
-  CORL.vagrant_config(File.dirname(__FILE__), config)
+  CORL.vagrant_config(File.dirname(__FILE__), config) do |node, machine, provisioner|
+    provisioner.provision = false
+    #provisioner.dry_run   = true  
+  end
 end

data/lib/core/vagrant/plugins.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
 module CORL
 class Plugin < ::Vagrant.plugin('2')
   
-  name '[C]oral [O]rchestration and [R]esearch [L]ibrary'
+  name '[C]luster [O]rchestration and [R]esearch [L]ibrary'
   description 'The `corl` plugin provides an easy way to develop and test CORL networks locally from within Vagrant.'
   
   @@directory       = File.dirname(__FILE__) 
@@ -42,9 +42,11 @@ class Plugin < ::Vagrant.plugin('2')
     hook.after Vagrant::Action::Builtin::WaitForCommunicator, Action::InitKeys
   end
   
-  action_hook 'link-network', :machine_action_up do |hook|
-    nucleon_require(@@action_dir, :link_network)
-    hook.after Action::InitKeys, Action::LinkNetwork
+  if ENV['CORL_LINK_NETWORK']
+    action_hook 'link-network', :machine_action_up do |hook|
+      nucleon_require(@@action_dir, :link_network)
+      hook.after Action::InitKeys, Action::LinkNetwork
+    end
   end
   
   action_hook 'delete-cache', :machine_action_destroy do |hook|

data/lib/corl.rb

@@ -129,7 +129,7 @@ module CORL
   
   #---  
 
-  reload(true) do |op, manager|
+  reload(true, :corl) do |op, manager|
     if op == :define
       manager.define_types :CORL, {
         :configuration => :file,      # Core