ncc-api 1.0.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d97a74f21100b3127d9f244f2e711012af1cd09e
-  data.tar.gz: d28b36e3e1019d00ae17757c4d31e5603166f828
+  metadata.gz: a94804c0a647446cdfd140587f6337c806a4b133
+  data.tar.gz: 59c2c2f47c8bc855674828a4185302c7ae51c561
 SHA512:
-  metadata.gz: 4c8cf9e2eab3579af7714f307acb7126e6eee4af93df90d8e329b31253d09885a89e10e59677ad996454c4c1f7cf83ae022d36a3f824a3ed25695aab8cd783b6
-  data.tar.gz: 0791685953d5894dca54c5ddf9d0e3ef44cdb3b424e06a7c160d49dd258d9075aed11a0e68b18942627afe2d9a8cdf94fb2a5238019309614ced47184dd21013
+  metadata.gz: 11ed2a94d010101eaa53a465941414bde1c78a64a62c0cb84f8c3d567fb6ce12fad68e32b9da44a481517ee229b670b7f39ef57de2de0e1033e007e214262a01
+  data.tar.gz: 9ded9650c9df907a13241f196ff43e4963485f900249e034df2c745ff62d104c2555bc92b4de72ad31ba7b76565372a090b35149b572d1f209293cbfd7637829

data/lib/ncc/connection/aws.rb

@@ -79,7 +79,9 @@ class NCC::Connection::AWS < NCC::Connection
 
     def console_log(instance_id)
         begin
-            @fog.get_console_output(instance_id).body
+            do_fog do |fog|
+                fog.get_console_output(instance_id).body
+            end
         rescue Fog::Compute::AWS::NotFound
             instance_not_found instance_id
         rescue Exception => e
@@ -89,10 +91,10 @@ class NCC::Connection::AWS < NCC::Connection
 
     def provider_request_of(instance)
         {
-                      :name => instance.name,
-                      :flavor_id => sizes(instance.size)['provider_id'],
-                      :image_id => images(instance.image)['provider_id'],
-                      :tags => { 'Name' => instance.name }
+            :name => instance.name,
+            :flavor_id => sizes(instance.size)['provider_id'],
+            :image_id => images(instance.image)['provider_id'],
+            :tags => { 'Name' => instance.name }
         }.merge(instance.extra provider)
     end
 

data/lib/ncc/connection/openstack.rb

@@ -98,15 +98,13 @@ class NCC::Connection::OpenStack < NCC::Connection
     end
 
     def instance_ip_address(server)
-        instance_network_names = ['instance_net', 'instnace_net']
-        if !server.addresses.nil?
-            instance_network_names.each do |network_name|
-                if server.addresses.has_key? network_name
-                    return server.addresses[network_name].first['addr']
-                end
-            end
+        begin
+            server.private_ip_address.to_s
+        rescue StandardError => err
+            # Fog collapses badly when you just ask it for this
+            # field which isn't there (yet?)
+            nil
         end
-        return nil
     end
 
     def instance_host(server)
@@ -114,7 +112,7 @@ class NCC::Connection::OpenStack < NCC::Connection
     end
 
     def console_log(instance_id)
-        server = @fog.servers.get(instance_id)
+        server = do_fog { |fog| fog.servers.get(instance_id) }
         if server.nil?
             instance_not_found instance_id
         else
@@ -126,6 +124,31 @@ class NCC::Connection::OpenStack < NCC::Connection
         end
     end
 
+    def console(instance_id, console_type='novnc')
+        server = do_fog { |fog| fog.servers.get(instance_id) }
+        if server.nil?
+            instance_not_found instance_id
+        else
+            begin
+                response = do_fog { |fog| fog.get_vnc_console(server.id, console_type) }
+                body = response.body
+            rescue Exception => e
+                communication_error e.message
+            end
+
+            unless body.respond_to?(:[]) and
+                    body['console'] and
+                    body['console'].respond_to?(:[]) and
+                    body['console']['url']
+                raise communication_error "Expected Fog::Compute::Openstack#get_vnc_console(#{instance_id.inspect}, " +
+                    "#{console_type.inspect})# to return object with key 'console' => 'url'; " +
+                    "instead got: #{body.inspect}"
+            end
+
+            body['console']
+        end
+    end
+
     def provider_request_of(instance)
         {
             :name => instance.name,
@@ -135,7 +158,7 @@ class NCC::Connection::OpenStack < NCC::Connection
     end
 
     def reboot(instance_id)
-        server = @fog.servers.get(instance_id)
+        server = do_fog { |fog| fog.servers.get(instance_id) }
         if server.nil?
             instance_not_found instance_id
         else

data/lib/ncc/connection.rb

@@ -15,6 +15,9 @@
 # limitations under the License.
 # */
 
+# TODO:
+# Align desired logger interface with Ruby Logger class standard
+
 require 'rubygems'
 require 'fog'
 require 'uuidtools'
@@ -44,11 +47,12 @@ class NCC::Connection
         @ncc = ncc
         @cache = { }
         @cfg = ncc.config
-        @cfg_mtime = @cfg.mtime
+        @cfg_mtime = @cfg[:clouds][cloud].mtime
         @cloud = cloud
         @logger = opt[:logger] if opt.has_key? :logger
         @cache_timeout = opt[:cache_timeout] || 600
         @auth_retry_limit = opt[:auth_retry_limit] || 1
+        @create_timeout = opt[:create_timeout] || 160
         do_connect
     end
 
@@ -111,9 +115,13 @@ class NCC::Connection
     end
 
     def do_fog
-        do_connect unless @fog
         remaining_tries = @auth_retry_limit
         begin
+            unless @fog
+                debug "do_fog: connecting because @fog is nil (@auth_retry_limit=#{@auth_retry_limit})"
+                do_connect
+            end
+            debug "do_fog: beginning fog operation"
             yield @fog
         rescue Excon::Errors::Unauthorized => err
             # might be an expired auth token, retry
@@ -132,6 +140,7 @@ class NCC::Connection
         rescue NCC::Error => err
             raise err
         rescue StandardError => err
+            debug "Unknown error [#{err.class}]: #{err.message} #{err.backtrace.join("\n   ")}"
             @fog = nil
             raise NCC::Error::Cloud, "Error communicating with #{provider} " +
                 "cloud #{@cloud} [#{err.class}]: #{err.message}"
@@ -312,7 +321,7 @@ class NCC::Connection
                 do_fog { |fog| fog.send(enum).get(id) }
             end
         else
-            do_fog { |fog| fog.send(enum) }
+            do_fog { |fog| fog.send(enum).map { |e| e } }
         end
     end
 
@@ -414,13 +423,13 @@ class NCC::Connection
     end
 
     def instance_ip_address(server)
-        server.ip_address
+        server.ip_address.to_s
     end
 
     def instances(instance_id=nil)
         debug "instances(#{instance_id.inspect})"
         if instance_id.nil?
-            do_fog { |fog| fog.servers }.map { |server| instance_for server }
+            do_fog { |fog| fog.servers.map { |server| instance_for server } }
         else
             server = do_fog { |fog| fog.servers.get instance_id }
             if server.nil?
@@ -466,8 +475,9 @@ class NCC::Connection
             'size' => i.size,
             'image' => i.image,
             'serial_number' => i.id,
+            'uuid' => i.id,
             'roles' => i.role.sort.join(','),
-            'ip_address' => i.ip_address,
+            'ipaddress' => i.ip_address,
             'host_fqdn' => host_fqdn(i.host),
             'environment_name' => i.environment
         }.merge(instance.extra 'inventory')
@@ -485,7 +495,9 @@ class NCC::Connection
         instance
     end
 
-    def create_instance(instance_spec, wait_for_ip=60)
+    def create_instance(instance_spec, wait_for_ip=nil)
+        wait_for_ip ||= @create_timeout
+
         if ! instance_spec.kind_of? NCC::Instance
             instance_spec = NCC::Instance.new(@cfg, instance_spec)
         end
@@ -511,11 +523,13 @@ class NCC::Connection
             if wait_for_ip > 0 and instance_ip_address(server).nil?
                 info "#{@cloud} waiting for ip on #{server.id}"
                 this = self
-                server.wait_for(wait_for_ip) { this.instance_ip_address(server) }
+                server.wait_for(wait_for_ip) { ready? and this.instance_ip_address(server)  }
             end
         rescue StandardError => err
+            debug "Error [#{err.class}]: #{err.message} #{err.backtrace.join("\n   ")}"
             inv_update = { 'fqdn' => fqdn, 'status' => 'decommissioned' }
             if ! server.nil? and server.id
+                inv_update['uuid'] = server.id
                 inv_update['serial_number'] = server.id
             end
             @ncc.inventory.update('system', inv_update, fqdn)
@@ -578,6 +592,11 @@ class NCC::Connection
             "#{provider} does not support console logs"
     end
 
+    def console(instance_id)
+        raise NCC::Error::NotFound, "Cloud #{@cloud} provider " +
+            "#{provider} does not support interactive console"
+    end
+
     def reboot(instance_id)
         server = do_fog { |fog| fog.servers.get(instance_id) }
         if server.nil?

data/lib/ncc/version.rb

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

data/lib/ncc-api.rb

@@ -29,7 +29,7 @@ end
 
 $ncc = NCC.new
 
-def error_message(status, err)
+def error_message(status, err, object=nil)
     status_message = case status
                      when 400
                          "400 Bad Request"
@@ -42,6 +42,14 @@ def error_message(status, err)
                      end
     status_message ||= status.to_s
     data = { "status" => status_message, "message" => err.message }
+    # I can't really just spit the object out here because I don't
+    # know what it is--it might be configuration objects that would
+    # contain passwords.
+    unless object.nil?
+        data['original_object'] = {
+            "class" => object.class
+        }
+    end
     if params.has_key? 'details'
         data['details'] = err.backtrace
         data['error'] = err.class
@@ -68,7 +76,7 @@ def respond(status, header={}, &block)
     rescue NCC::Error::Client => error
         halt error_message(400, error)
     rescue Exception => error
-        halt error_message(500, error)
+        halt error_message(500, error, obj)
     end
 end
 
@@ -84,6 +92,7 @@ get '/ncc_api/v2' do
             "clouds" => "/ncc_api/v2/clouds",
             "images" => "/ncc_api/v2/images",
             "sizes" => "/ncc_api/v2/sizes",
+            "version" => NCC::VERSION,
         }
     end
 end
@@ -148,6 +157,11 @@ get '/ncc_api/v2/clouds/:cloud/instances/:instance_id/console_log' do |cloud,
     end
 end
 
+get '/ncc_api/v2/clouds/:cloud/instances/:instance_id/console' do |cloud,
+    instance_id|
+    respond(200) { $ncc.clouds(cloud).console(instance_id) }
+end
+
 post '/ncc_api/v2/clouds/:cloud/instances' do |cloud|
     respond 201 do
         begin

data/lib/ncc.rb

@@ -16,24 +16,41 @@
 # */
 
 
+require 'rubygems'
+require 'noms/cmdb'
 require 'ncc/config'
 require 'ncc/connection'
 require 'ncc/instance'
 require 'ncc/error'
-require 'cmdbclient'
+require 'ncc/version'
+
+class NCC::Configurator
+
+    attr_accessor :config_path
+
+    def initialize
+        @config_path = ['/etc/ncc-api']
+    end
+
+end
 
 class NCC
     attr_reader :config, :inventory
 
+    @@global_config = NCC::Configurator.new
+
+    def self.configure
+        yield @@global_config
+    end
+
     def initialize(config_path=nil, opt={})
         @logger = opt[:logger] if opt.has_key? :logger
-        config_path ||= [
-            '/etc/ncc-api']
+        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']
         @config = NCC::Config.new(config_path, :logger => @logger)
-        @inventory = CMDBclient.new(@config)
+        @inventory = NOMS::CMDB.new(@config)
         @clouds = { }
     end
 
@@ -99,4 +116,3 @@ class NCC
     end
 
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncc-api
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Jeremy Brinkley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-15 00:00:00.000000000 Z
+date: 2015-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: noms-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: The NOMS cloud controller API provides a ReSTful API abstracting and
   aggregating a set of specific cloud computing providers (called "clouds").
 email: jbrinkley@evernote.com
@@ -61,6 +75,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ncc/config.rb
+- lib/ncc/version.rb
 - lib/ncc/connection/aws.rb
 - lib/ncc/connection/openstack.rb
 - lib/ncc/connection.rb