ncc-api 1.1.2 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a94804c0a647446cdfd140587f6337c806a4b133
-  data.tar.gz: 59c2c2f47c8bc855674828a4185302c7ae51c561
+  metadata.gz: ff7b4ce8e75c66fa4ec2faaf1d703d5f918f7721
+  data.tar.gz: d6d4a5e717d9d60373561a5bb0c65b663981d439
 SHA512:
-  metadata.gz: 11ed2a94d010101eaa53a465941414bde1c78a64a62c0cb84f8c3d567fb6ce12fad68e32b9da44a481517ee229b670b7f39ef57de2de0e1033e007e214262a01
-  data.tar.gz: 9ded9650c9df907a13241f196ff43e4963485f900249e034df2c745ff62d104c2555bc92b4de72ad31ba7b76565372a090b35149b572d1f209293cbfd7637829
+  metadata.gz: 886099d41691e9de1d418bd2ddcec075b1a1ee9b8b6e288523020a55bff02faf0d9534add86a58f16de42e01f6f39aa3bddf6044710266781fe22ff6ee291af3
+  data.tar.gz: ab9c60986b5177f960889fa0802e38daafbec3b41418f2995e4cfd9d9bfcd6000410f8d32ecf4fb1f2db00db87ce2c22bc76b2e7e3dd8a0d4fa3660ac5cfd209

data/lib/ncc-api.rb

@@ -22,13 +22,10 @@ require 'sinatra'
 require 'fog'
 require 'rack/logger'
 
-
-configure :development do
-    set :logging, Logger::DEBUG
+def ncc
+    $ncc ||= NCC.new(nil, :logger => logger)
 end
 
-$ncc = NCC.new
-
 def error_message(status, err, object=nil)
     status_message = case status
                      when 400
@@ -56,6 +53,7 @@ def error_message(status, err, object=nil)
     end
     body = (params.has_key?('pretty') ? (JSON.pretty_generate(data) +
             "\n") : data.to_json)
+    logger.error "#{status_message} (#{err.class}) #{err.message}: #{err.backtrace.join("\n")}"
     [status, { "content-type" => "application/json" }, body]
 end
 
@@ -82,7 +80,7 @@ end
 
 get '/ncc_api' do
     respond 200 do
-        $ncc.config['services'].to_hash.merge({ 'v2api' => $ncc.api_url })
+        ncc.config['services'].to_hash.merge({ 'v2api' => ncc.api_url })
     end
 end
 
@@ -98,23 +96,23 @@ get '/ncc_api/v2' do
 end
 
 get '/ncc_api/v2/clouds' do
-    respond(200) { $ncc.clouds }
+    respond(200) { ncc.clouds }
 end
 
 get '/ncc_api/v2/sizes' do
-    respond(200) { $ncc.sizes }
+    respond(200) { ncc.sizes }
 end
 
 get '/ncc_api/v2/images' do
-    respond(200) { $ncc.images }
+    respond(200) { ncc.images }
 end
 
 get '/ncc_api/v2/sizes/:size_id' do |size_id|
-    respond(200) { $ncc.sizes(size_id) }
+    respond(200) { ncc.sizes(size_id) }
 end
 
 get '/ncc_api/v2/images/:image_id' do |image_id|
-    respond(200) { $ncc.images(image_id) }
+    respond(200) { ncc.images(image_id) }
 end
 
 get '/ncc_api/v2/clouds/:cloud' do |cloud|
@@ -122,30 +120,30 @@ get '/ncc_api/v2/clouds/:cloud' do |cloud|
         {
             'name' => cloud,
             'status' => 'ok',
-            'provider' => $ncc.clouds(cloud).provider,
-            'service' => $ncc.clouds(cloud).fog.class.to_s
+            'provider' => ncc.clouds(cloud).provider,
+            'service' => ncc.clouds(cloud).fog.class.to_s
         }
     end
 end
 
 get '/ncc_api/v2/clouds/:cloud/sizes' do |cloud|
-    respond(200) { $ncc.clouds(cloud).sizes }
+    respond(200) { ncc.clouds(cloud).sizes }
 end
 
 get '/ncc_api/v2/clouds/:cloud/sizes/:size_id' do |cloud, size_id|
-    respond(200) { $ncc.clouds(cloud).sizes(size_id) }
+    respond(200) { ncc.clouds(cloud).sizes(size_id) }
 end
 
 get '/ncc_api/v2/clouds/:cloud/images' do |cloud|
-    respond(200) { $ncc.clouds(cloud).images }
+    respond(200) { ncc.clouds(cloud).images }
 end
 
 get '/ncc_api/v2/clouds/:cloud/images/:image_id' do |cloud, image_id|
-    respond(200) { $ncc.clouds(cloud).images(image_id) }
+    respond(200) { ncc.clouds(cloud).images(image_id) }
 end
 
 get '/ncc_api/v2/clouds/:cloud/instances' do |cloud|
-    respond(200) { $ncc.clouds(cloud).instances.map { |i| i.to_hash } }
+    respond(200) { ncc.clouds(cloud).instances.map { |i| i.to_hash } }
 end
 
 
@@ -153,13 +151,13 @@ get '/ncc_api/v2/clouds/:cloud/instances/:instance_id/console_log' do |cloud,
     instance_id|
     respond(200, 'content-type' => 'text/plain') do
         # TODO influence last-modified with console log timestamp
-        $ncc.clouds(cloud).console_log(instance_id)['output']
+        ncc.clouds(cloud).console_log(instance_id)['output']
     end
 end
 
 get '/ncc_api/v2/clouds/:cloud/instances/:instance_id/console' do |cloud,
     instance_id|
-    respond(200) { $ncc.clouds(cloud).console(instance_id) }
+    respond(200) { ncc.clouds(cloud).console(instance_id) }
 end
 
 post '/ncc_api/v2/clouds/:cloud/instances' do |cloud|
@@ -168,7 +166,7 @@ post '/ncc_api/v2/clouds/:cloud/instances' do |cloud|
             request.body.rewind
             instance_spec = JSON.parse(request.body.read)
             instance_req = instance_spec
-            $ncc.clouds(cloud).create_instance(instance_req)
+            ncc.clouds(cloud).create_instance(instance_req)
         rescue JSON::ParserError => e
             raise NCC::Error::Client, "Error parsing request: #{e.message}"
         end
@@ -177,7 +175,7 @@ end
 
 get '/ncc_api/v2/clouds/:cloud/instances/:instance_id' do |cloud, instance_id|
     respond(200) do
-        $ncc.clouds(cloud).instances(instance_id).to_hash
+        ncc.clouds(cloud).instances(instance_id).to_hash
     end
 end
 
@@ -185,14 +183,14 @@ end
 delete '/ncc_api/v2/clouds/:cloud/instances/:instance_id' do |cloud,
     instance_id|
     respond 204 do
-        $ncc.clouds(cloud).delete(instance_id)
+        ncc.clouds(cloud).delete(instance_id)
         nil
     end
 end
 
 put '/ncc_api/v2/clouds/:cloud/instances/:instance_id' do |cloud, instance_id|
     respond 202 do
-        instance = $ncc.clouds(cloud).instances(instance_id)
+        instance = ncc.clouds(cloud).instances(instance_id)
         begin
             request.body.rewind
             update_spec = JSON.parse(request.body.read)
@@ -205,7 +203,7 @@ put '/ncc_api/v2/clouds/:cloud/instances/:instance_id' do |cloud, instance_id|
             when 'status'
                 if value == 'reboot'
                     actions << lambda { instance.status = 'reboot' }
-                    $ncc.clouds(cloud).reboot(instance.id)
+                    ncc.clouds(cloud).reboot(instance.id)
                 else
                     raise NCC::Error::Client,
                     "Cannot update to status #{value.inspect}"

data/lib/ncc.rb

@@ -26,10 +26,11 @@ require 'ncc/version'
 
 class NCC::Configurator
 
-    attr_accessor :config_path
+    attr_accessor :config_path, :logger
 
     def initialize
         @config_path = ['/etc/ncc-api']
+        @logger = nil
     end
 
 end
@@ -44,22 +45,29 @@ class NCC
     end
 
     def initialize(config_path=nil, opt={})
-        @logger = opt[:logger] if opt.has_key? :logger
+        @logger = opt[:logger] || @@global_config.logger
         config_path ||= @@global_config.config_path
         config_path = [config_path] unless config_path.respond_to? :unshift
         config_path.unshift(File.join(ENV['NCCAPI_HOME'], 'etc')) if
             ENV['NCCAPI_HOME']
+        info "Loading configuration from: #{config_path.inspect}"
         @config = NCC::Config.new(config_path, :logger => @logger)
         @inventory = NOMS::CMDB.new(@config)
         @clouds = { }
     end
 
     def debug(msg)
-        if @logger.respond_to? :debug
+        if @logger and @logger.respond_to? :debug
             @logger.debug "#{me}: #{msg}"
         end
     end
 
+    def info(msg)
+        if @logger and @logger.respond_to? :info
+            @logger.info "#{me}: #{msg}"
+        end
+    end
+
     def me
         self.class
     end

data/lib/ncc/config.rb

@@ -105,8 +105,12 @@ class NCC::Config
     end
 
     def debug(msg)
-        if opt(:logger) and opt(:logger).respond_to? :debug
-            opt(:logger).debug "#<#{me}>: #{msg}"
+        # This produces a *lot* of debug logging, thus it's best to be
+        # able to use something else to control its log level.
+        if ENV.has_key? 'NCC_CONFIG_DEBUG' and not ENV['NCC_CONFIG_DEBUG'].empty?
+            if opt(:logger) and opt(:logger).respond_to? :debug
+                opt(:logger).debug "#<#{me}>: #{msg}"
+            end
         end
     end
 

data/lib/ncc/connection.rb

@@ -15,9 +15,6 @@
 # limitations under the License.
 # */
 
-# TODO:
-# Align desired logger interface with Ruby Logger class standard
-
 require 'rubygems'
 require 'fog'
 require 'uuidtools'
@@ -90,8 +87,8 @@ class NCC::Connection
     end
 
     def notice(msg)
-        if @logger and @logger.respond_to? :notice
-            @logger.notice "#{self} #{msg}"
+        if @logger and @logger.respond_to? :info
+            @logger.info "#{self} #{msg}"
         end
     end
 
@@ -101,11 +98,24 @@ class NCC::Connection
         end
     end
 
+    def error(msg)
+        if @logger and @logger.respond_to? :error
+            @logger.error "#{self} #{msg}"
+        end
+    end
+
+    def fatal(msg)
+        if @logger and @logger.respond_to? :fatal
+            @logger.error "#{self} #{msg}"
+        end
+    end
+
     def connection_params
         []
     end
 
     def do_connect
+        info "Connecting to #{provider} cloud #{@cloud}"
         cloud_config = @cfg[:clouds][@cloud]
         pnames = connection_params + ['provider']
         params = Hash[cloud_config.to_hash(*pnames).map do |k, v|
@@ -564,9 +574,9 @@ class NCC::Connection
     end
 
     def communication_error(message)
-        message = "Error communicating with #{provider} cloud #{@cloud}: " + message unless
+        raise NCC::Error::Cloud,
+        "Error communicating with #{provider} cloud #{@cloud}: " + message unless
             /Error .*communicating with/.match(message)
-        raise NCC::Error::Cloud, message
     end
 
     def delete(instance_id)

data/lib/ncc/version.rb

@@ -1,3 +1,3 @@
 class NCC
-    VERSION = '1.1.2'
+    VERSION = '1.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncc-api
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.2
 platform: ruby
 authors:
 - Jeremy Brinkley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-23 00:00:00.000000000 Z
+date: 2015-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog