triton-internal 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 4b93f09a9ba8fe9f2356cd506c08dcc37195781c
+  data.tar.gz: 6a0a7664fbbfcbfce694722ca47f09603444f49e
+SHA512:
+  metadata.gz: 19539963e4447514c4c8777634dfcfbbe2276be0ce999176b14107dd9fbc48167547b7fbcb66330847f99d5b269f0decf6c8b9d7fdbc5808944f3db55534a478
+  data.tar.gz: 0ad33a967873f7e48b302870721ddeacf9038b5e8fcd9e6cb6184c19465aa17de41bd362008f9337b4bc566b2fc38918c887fed6451ed158c2ec021350834582

data/Users/thomas/tdh/triton/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in triton.gemspec
+gemspec

data/Users/thomas/tdh/triton/Gemfile.lock

@@ -0,0 +1,51 @@
+PATH
+  remote: .
+  specs:
+    triton-internal (0.1.0)
+      rest-client (~> 1.8)
+      socksify (~> 1.7)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    diff-lcs (1.3)
+    domain_name (0.5.20170404)
+      unf (>= 0.0.5, < 1.0.0)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    mime-types (2.99.3)
+    netrc (0.11.0)
+    rake (10.5.0)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.6.0)
+      rspec-core (~> 3.6.0)
+      rspec-expectations (~> 3.6.0)
+      rspec-mocks (~> 3.6.0)
+    rspec-core (3.6.0)
+      rspec-support (~> 3.6.0)
+    rspec-expectations (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.6.0)
+    rspec-support (3.6.0)
+    socksify (1.7.0)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.14)
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  triton-internal!
+
+BUNDLED WITH
+   1.14.6

data/Users/thomas/tdh/triton/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Thomas Haggett
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/Users/thomas/tdh/triton/README.md

@@ -0,0 +1,87 @@
+# Triton
+
+[![Build Status](https://travis-ci.org/joshado/triton-internal-gem.svg?branch=master)](https://travis-ci.org/joshado/triton-internal-gem)
+
+Gem to wrap and mock the Triton internal APIs.
+
+Currently supports:
+
+ * [Vmapi](https://github.com/joyent/sdc-vmapi/blob/master/docs/index.md)
+ * [Cnapi](https://github.com/joyent/sdc-cnapi/blob/master/docs/index.md)
+ * [Napi](https://github.com/joyent/sdc-napi/blob/master/docs/index.md)
+ * [Papi](https://github.com/joyent/sdc-papi/blob/master/docs/index.md)
+ * [Imgapi](https://github.com/joyent/sdc-imgapi/blob/master/docs/index.md)
+
+## Usage
+
+This library simply exposes the internal Triton API layer as cleaner Ruby function calls with a consistent interface. Rather than re-implement and re-document all the calls, a relatively small set of conventions map the function calls to the HTTP requests allowing the fantastic Joyent documentation, linked above, to be used directly.
+
+
+
+### Configuration
+
+When making requests, it calls APIs via their hostnames the suffix needs to be specified. This is dependent on the configuration of the triton cluster. You'll also need access to the Triton `admin` network to make the calls - you can either use this library on a host directly connected to the `admin` network or, alternatively, make calls via a SOCKS proxy.
+
+It's possible to use the SOCKS proxy built into the `ssh` client:
+
+    ssh -D 1234 root@<headnode ip>
+
+    ...
+
+    Triton.socks = '127.0.0.1:1234'
+
+### Calling methods
+
+Each (supported) API has a module under the `Triton` namespace - CNAPI, for example, becomes `Triton::Cnapi`. Each API function can be accessed either via the execute method using CamelCase method name from the Joyent documentation:
+
+  > Triton::Vmapi.execute("ListVms", :fields => 'uuid')
+  => [{"uuid"=>"ff64a98e-3a8a-4d90-a726-0c2fd33e378c"}, ...
+
+or it can be be called via a direct class method, using a dynamically mapped `snake_case` method name:
+
+  > Triton::Vmapi.list_vms(:fields => 'uuid')
+  => [{"uuid"=>"ff64a98e-3a8a-4d90-a726-0c2fd33e378c"}, ...
+
+Note that symbols are mapped out to strings automatically, and the returned object is indifferent to string or symbol access.
+
+### Handling Responses
+
+A response hash is returned in the event of a successful response code from the server. If a unsuccessful code is returned, then a `Triton::RemoteException` subclass is raised with the code passed from the server.
+
+The CreateVm could, for example, return a `ValidationFailed` error code, this is raised as `Triton::RemoteExceptions::ValidationFailed` which inherits from `Triton::RemoteException`. So, code such this should "just work":
+
+  begin
+    Triton::Vmapi.execute("CreateVm", { })
+  rescue Triton::RemoteExceptions::ValidationFailed => e
+    # valiation failed response
+  rescue Triton::RemoteException => e
+    # another server error
+  end
+
+All `RemoteExceptions` expose a `body` accessor returning the full deserialised JSON error and also the specific `code`, `message` and `errors` accessors.
+
+## Testing
+
+There is a set of rspec tests that exercise the various mapping behaviours outlined above, these are purely offline only tests. None of the testing exercises the Triton functionality - this library makes no claims about the behaviour of the various function calls, but does make it easier for consumer applications to mock the calls in it's own testing. The following rspec code should work as expected:
+
+    allow(Triton::Vmapi).to receive(:list_vms)
+
+    ...
+
+    expect(Triton::Vmapi).to have_received(:list_vms) do |args|
+      expect(args[:uuid]).to eq('12345....')
+    end
+
+In addition, you can enable a "test-mode" which will refuse to make live calls and, instead, raise exceptions about leaking calls. This is enabled by specifying
+
+    Triton.test_mode = true
+
+in your rspec configuration.
+
+Finally, you can use the console to interact with a live Triton cluster - be careful. You can specify the suffix and SOCKS configuration on the command line:
+
+    $ bundle exec bin/console  --suffix ovh-1 --socks 1234
+    irb(main):001:0> Triton::Vmapi.list_vms(:limit => 3, :fields => 'uuid')
+    => [{"uuid"=>"fffeb0d0-ed59-46e7-b212-5d64d02db417"}, {"uuid"=>"ffe29552-8186-c22f-9a8d-f06ee619c444"}, {"uuid"=>"ff8a2abb-d270-e323-81c2-f0f7f7dff8a1"}]
+    irb(main):002:0>
+

data/Users/thomas/tdh/triton/Rakefile

@@ -0,0 +1,6 @@
+require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec

data/Users/thomas/tdh/triton/bin/console

@@ -0,0 +1,17 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "triton/internal"
+require 'optparse'
+
+OptionParser.new do |o|
+  o.on("--socks [host:]port", String, "Configures the library to use a SOCKS proxy at host:port (defaults host to localhost)") do |v|
+    Triton.socks = v
+  end
+  o.on("--suffix suffix", String, "Specifies the triton hostname suffix to use") do |v|
+    Triton.suffix = v
+  end
+end.parse!(ARGV)
+
+require "irb"
+IRB.start(__FILE__)

data/Users/thomas/tdh/triton/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/Users/thomas/tdh/triton/lib/triton/api_base.rb

@@ -0,0 +1,120 @@
+class String
+  def camelise
+    return nil unless self =~ /^[a-z\d_]+$/
+    self.gsub(/_?([a-z\d]*)/) { |_| $1.capitalize }
+  end
+end
+module Triton
+
+  class ApiBase
+
+    UnknownCall = Class.new(NoMethodError)
+    DefinedMethods = Hash.new { |hash, key| hash[key] = {} }
+    ApiNames = Hash.new
+
+    def self.call(name, opts={})
+      DefinedMethods[self][name] = opts
+    end
+
+    def self.name=(name)
+      ApiNames[self] = name
+    end
+
+    def self.execute(name, params={})
+      new(name, params).execute
+    end
+
+    def self.hostname
+      "#{ApiNames[self]}.#{Triton.suffix}"
+    end
+
+    # We dynamically map from snake_case to CamelCase here
+    def self.method_missing(snake_case, *args)
+      camel_case = snake_case.to_s.camelise
+      if DefinedMethods[self][camel_case]
+        execute(camel_case, *args)
+      else
+        super
+      end
+    end
+
+    def self.respond_to_missing?(snake_case, include_all=false)
+      camel_case = snake_case.to_s.camelise
+      if DefinedMethods[self][camel_case]
+        true
+      else
+        super(snake_case, include_all)
+      end
+    end
+
+    def initialize(name, params={})
+      @name = name
+      @call = DefinedMethods[self.class][name]
+      @params = params
+
+      raise UnknownCall, "#{@name} isn't a known API method." unless @call
+    end
+
+    def execute
+      if Triton.test_mode
+        raise Triton::TestModeLeak, "Request '#{@name}' leaked when in test mode\n#{request.method.upcase} #{URI.parse(request.url).path}\n#{JSON.pretty_generate(@params)}"
+      end
+      Triton.logger.debug("#{self.class.name}/#{@name}: #{request.method.upcase} #{URI.parse(request.url).path}\n#{JSON.pretty_generate(@params)}")
+      object =  JSON.parse(request.execute)
+      if object.is_a?(Hash)
+        IndifferentHash.new.merge!(object)
+      else
+        object
+      end
+    rescue RestClient::Exception => e
+      begin
+        payload = JSON.parse(e.response.body)
+        raise Triton::RemoteException, payload
+      rescue JSON::JSONError
+        raise e
+      end
+    end
+
+    def request
+      @request ||= begin
+        request_method = @call.fetch(:method, :get).intern
+        path = @call[:path]
+
+        @params.each do |k,v|
+          path = path.gsub(":#{k.to_s}") do |_|
+            @params.delete(k)
+            CGI.escape(v.to_s)
+          end
+        end
+
+        body_param = @call[:body_param] && @params.delete(@call[:body_param])
+
+        if request_method == :get || !!body_param
+          payload = !!body_param && JSON.generate(body_param)
+          query = @params.map { |k,v| "#{CGI.escape(k.to_s)}=#{CGI.escape(v.to_s)}" }.join("&")
+        else
+          query = nil
+          payload = JSON.dump(@params)
+        end
+
+        url = URI.parse("http://#{self.class.hostname}#{path}")
+        url.query = if url.query
+          "#{url.query}&#{query}"
+        else
+          query
+        end
+
+        RestClient::Request.new({
+          :method => request_method,
+          :url    => url.to_s,
+          :headers => {
+            'Accept'       => 'application/json',
+            'Content-Type' => !!payload ? 'application/json' : nil
+          },
+          :payload => payload
+        })
+      end
+    end
+
+  end
+end

data/Users/thomas/tdh/triton/lib/triton/cnapi.rb

@@ -0,0 +1,78 @@
+module Triton
+  class Cnapi < ApiBase
+
+    # The commit used to compile this itnerface:
+    # https://github.com/joyent/sdc-cnapi/blob/ba575c6136179f74ca16f086d1d71b9032e44e8d/docs/index.md
+    #
+
+    self.name = "cnapi"
+
+    call('SelectServer', :method => :post, :path => '/allocate')
+    call('ServerCapacity', :method => :post, :path => '/capacity')
+    call('BootParamsGetDefault', :method => :get, :path => '/boot/default')
+    call('BootParamsSetDefault', :method => :put, :path => '/boot/default')
+    call('BootParamsUpdateDefault', :method => :post, :path => '/boot/default')
+    call('BootParamsGet', :method => :get, :path => '/boot/:server_uuid')
+    call('BootParamsSet', :method => :put, :path => '/boot/:server_uuid')
+    call('BootParamsUpdate', :method => :post, :path => '/boot/:server_uuid')
+    call('TaskGet', :method => :get, :path => '/tasks/:task_id')
+    call('TaskWait', :method => :get, :path => '/tasks/:task_id/wait')
+    call('ImageGet', :method => :get, :path => '/servers/:server_uuid/images/:uuid')
+    call('Ping', :method => :get, :path => '/ping')
+    call('NicUpdate', :method => :put, :path => '/servers/:server_uuid/nics')
+    call('PlatformList', :method => :get, :path => '/platforms')
+    call('CommandExecute', :method => :post, :path => '/servers/:server_uuid/execute')
+    call('ServerList', :method => :get, :path => '/servers')
+    call('ServerGet', :method => :get, :path => '/servers/:server_uuid')
+    call('ServerUpdate', :method => :post, :path => '/servers/:server_uuid')
+    call('ServerReboot', :method => :post, :path => '/servers/:server_uuid/reboot')
+    call('ServerFactoryReset', :method => :put, :path => '/servers/:server_uuid/factory-reset')
+    call('ServerSetup', :method => :put, :path => '/servers/:server_uuid/setup')
+    call('ServerSysinfoRefresh', :method => :post, :path => '/servers/:server_uuid/sysinfo-refresh')
+    call('ServerDelete', :method => :delete, :path => '/servers/:server_uuid')
+    call('ServerTaskHistory', :method => :get, :path => '/servers/:server_uuid/task-history')
+    call('ServerEnsureImage', :method => :get, :path => '/servers/:server_uuid/ensure-image')
+    call('ServerInstallAgent', :method => :post, :path => '/servers/:server_uuid/install-agent')
+    call('ServerCnAgentPause', :method => :get, :path => '/servers/:server_uuid/cn-agent/pause')
+    call('ServerCnAgentResume', :method => :get, :path => '/servers/:server_uuid/cn-agent/resume')
+    call('VmList', :method => :get, :path => '/servers/:server_uuid/vms')
+    call('VmLoad', :method => :get, :path => '/servers/:server_uuid/vms/:uuid')
+    call('VmInfo', :method => :get, :path => '/servers/:server_uuid/vms/:uuid/info')
+    call('VmVncInfo', :method => :get, :path => '/servers/:server_uuid/vms/:uuid/vnc')
+    call('VmUpdate', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/update')
+    call('VmNicsUpdate', :method => :post, :path => '/servers/:server_uuid/vms/nics/update')
+    call('VmStart', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/start')
+    call('VmStop', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/stop')
+    call('VmKill', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/kill')
+    call('VmReboot', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/reboot')
+    call('VmCreate', :method => :post, :path => '/servers/:server_uuid/vms')
+    call('VmReprovision', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/reprovision')
+    call('VmDestroy', :method => :delete, :path => '/servers/:server_uuid/vms/:uuid')
+    call('VmDockerExec', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/docker-exec')
+    call('VmDockerCopy', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/docker-copy')
+    call('VmDockerStats', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/docker-stats')
+    call('VmDockerBuild', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/docker-build')
+    call('VmImagesCreate', :method => :post, :path => '/servers/:server_uuid/vms/:uuid/images')
+    call('VmSnapshotCreate', :method => :put, :path => '/servers/:server_uuid/vms/:uuid/snapshots')
+    call('VmSnapshotRollback', :method => :put, :path => '/servers/:server_uuid/vms/:uuid/snapshots/:snapshot_name/rollback')
+    call('VmSnapshotDestroy', :method => :delete, :path => '/servers/:server_uuid/vms/:uuid/snapshots/:snapshot_name')
+    call('ServerWaitlistList', :method => :get, :path => '/servers/:server_uuid/tickets')
+    call('ServerWaitlistTicketCreate', :method => :post, :path => '/servers/:server_uuid/tickets')
+    call('ServerWaitlistGetTicket', :method => :post, :path => '/tickets/:ticket_uuid')
+    call('ServerWaitlistDeleteTicket', :method => :delete, :path => '/tickets/:ticket_uuid')
+    call('ServerWaitlistTicketsDeleteAll', :method => :delete, :path => '/servers/:server_uuid/tickets')
+    call('ServerWaitlistTicketsWait', :method => :get, :path => '/tickets/:ticket_uuid/wait')
+    call('ServerWaitlistTicketsRelease', :method => :get, :path => '/tickets/:ticket_uuid/release')
+    call('DatasetsList', :method => :get, :path => '/servers/:server_uuid/datasets')
+    call('DatasetCreate', :method => :post, :path => '/servers/:server_uuid/datasets')
+    call('SnapshotCreate', :method => :post, :path => '/servers/:server_uuid/datasets/:dataset/snapshot')
+    call('SnapshotRollback', :method => :post, :path => '/servers/:server_uuid/datasets/:dataset/rollback')
+    call('SnapshotList', :method => :get, :path => '/servers/:server_uuid/datasets/:dataset/snapshots')
+    call('DatasetPropertiesGetAll', :method => :get, :path => '/servers/:server_uuid/dataset-properties')
+    call('DatasetPropertiesGet', :method => :get, :path => '/servers/:server_uuid/datasets/:dataset/properties')
+    call('DatasetPropertiesSet', :method => :post, :path => '/servers/:server_uuid/datasets/:dataset/properties')
+    call('DatasetDestroy', :method => :delete, :path => '/servers/:server_uuid/datasets/:dataset')
+    call('ZpoolList', :method => :get, :path => '/servers/:server_uuid/zpools')
+
+  end
+end

data/Users/thomas/tdh/triton/lib/triton/imgapi.rb

@@ -0,0 +1,38 @@
+module Triton
+  class Imgapi < ApiBase
+
+    # The commit used to compile this itnerface:
+    # https://github.com/joyent/sdc-imgapi/blob/f71f1e97b49e69830aa64d45e3ab5ef141ae3357/docs/index.md
+    #
+
+    self.name = "imgapi"
+
+    call('ListImages', :method => :get, :path => '/images')
+    call('GetImage', :method => :get, :path => '/images/:uuid')
+    call('GetImageFile', :method => :get, :path => '/images/:uuid/file')
+    call('GetImageIcon', :method => :get, :path => '/images/:uuid/icon')
+    call('DeleteImageIcon', :method => :delete, :path => '/images/:uuid/icon')
+    call('DeleteImage', :method => :delete, :path => '/images/:uuid')
+    call('CreateImage', :method => :post, :path => '/images')
+    call('CreateImageFromVm', :method => :post, :path => '/images?action=create-from-vm')
+    call('ExportImage', :method => :post, :path => '/images/:uuid?action=export')
+    call('AddImageFile', :method => :put, :path => '/images/:uuid/file')
+    call('AddImageIcon', :method => :put, :path => '/images/:uuid/icon')
+    call('ActivateImage', :method => :post, :path => '/images/:uuid?action=activate')
+    call('DisableImage', :method => :post, :path => '/images/:uuid?action=disable')
+    call('EnableImage', :method => :post, :path => '/images/:uuid?action=enable')
+    call('AddImageAcl', :method => :post, :path => '/images/:uuid/acl?action=add')
+    call('RemoveImageAcl', :method => :post, :path => '/images/:uuid/acl?action=remove')
+    call('UpdateImage', :method => :post, :path => '/images/:uuid?action=update')
+    call('AdminImportImage', :method => :post, :path => '/images/:uuid?action=import')
+    call('AdminImportRemoteImage', :method => :post, :path => '/images/:uuid?action=import-remote')
+    call('AdminImportDockerImage', :method => :post, :path => '/images?action=import-docker-image')
+    call('AdminChangeImageStor', :method => :post, :path => '/images/:uuid?action=change-stor&stor=:newstor')
+    call('ListImageJobs', :method => :get, :path => '/images/:uuid/jobs')
+    call('ListChannels', :method => :get, :path => '/channels')
+    call('ChannelAddImage', :method => :post, :path => '/images/:uuid?action=channel-add')
+    call('Ping', :method => :get, :path => '/ping')
+    call('AdminGetState', :method => :get, :path => '/state')
+    call('AdminReloadAuthKeys', :method => :post, :path => '/authkeys/reload')
+  end
+end

data/Users/thomas/tdh/triton/lib/triton/indifferent_hash.rb

@@ -0,0 +1,120 @@
+# This class has been permamently borrowed from Sinatra, that repo is MIT licensed
+# and has these copyright notices:
+#
+#     Copyright (c) 2007, 2008, 2009 Blake Mizerany
+#     Copyright (c) 2010-2017 Konstantin Haase
+#     Copyright (c) 2015-2017 Zachary Scott
+#
+
+class IndifferentHash < Hash
+  def self.[](*args)
+    new.merge!(Hash[*args])
+  end
+
+  def initialize(*args)
+    super(*args.map(&method(:convert_value)))
+  end
+
+  def default(*args)
+    super(*args.map(&method(:convert_key)))
+  end
+
+  def default=(value)
+    super(convert_value(value))
+  end
+
+  def assoc(key)
+    super(convert_key(key))
+  end
+
+  def rassoc(value)
+    super(convert_value(value))
+  end
+
+  def fetch(key, *args)
+    super(convert_key(key), *args.map(&method(:convert_value)))
+  end
+
+  def [](key)
+    super(convert_key(key))
+  end
+
+  def []=(key, value)
+    super(convert_key(key), convert_value(value))
+  end
+
+  alias_method :store, :[]=
+
+  def key(value)
+    super(convert_value(value))
+  end
+
+  def key?(key)
+    super(convert_key(key))
+  end
+
+  alias_method :has_key?, :key?
+  alias_method :include?, :key?
+  alias_method :member?, :key?
+
+  def value?(value)
+    super(convert_value(value))
+  end
+
+  alias_method :has_value?, :value?
+
+  def delete(key)
+    super(convert_key(key))
+  end
+
+  def dig(key, *other_keys)
+    super(convert_key(key), *other_keys)
+  end if method_defined?(:dig) # Added in Ruby 2.3
+
+  def fetch_values(*keys)
+    super(*keys.map(&method(:convert_key)))
+  end if method_defined?(:fetch_values) # Added in Ruby 2.3
+
+  def values_at(*keys)
+    super(*keys.map(&method(:convert_key)))
+  end
+
+  def merge!(other_hash)
+    return super if other_hash.is_a?(self.class)
+
+    other_hash.each_pair do |key, value|
+      key = convert_key(key)
+      value = yield(key, self[key], value) if block_given? && key?(key)
+      self[key] = convert_value(value)
+    end
+
+    self
+  end
+
+  alias_method :update, :merge!
+
+  def merge(other_hash, &block)
+    dup.merge!(other_hash, &block)
+  end
+
+  def replace(other_hash)
+    super(other_hash.is_a?(self.class) ? other_hash : self.class[other_hash])
+  end
+
+  private
+
+  def convert_key(key)
+    key.is_a?(Symbol) ? key.to_s : key
+  end
+
+  def convert_value(value)
+    case value
+    when Hash
+      value.is_a?(self.class) ? value : self.class[value]
+    when Array
+      value.map(&method(:convert_value))
+    else
+      value
+    end
+  end
+end

data/Users/thomas/tdh/triton/lib/triton/internal.rb

@@ -0,0 +1,7 @@
+require 'triton'
+
+module Triton
+  module Internal
+
+  end
+end

data/Users/thomas/tdh/triton/lib/triton/napi.rb

@@ -0,0 +1,51 @@
+module Triton
+  class Napi < ApiBase
+
+    # The commit used to compile this itnerface:
+    # https://github.com/joyent/sdc-napi/blob/6dcd7540d5171e71260f54150ac6b5e43cf75acc/docs/index.md
+    #
+
+    self.name = "napi"
+
+    call('Ping', :method => :get, :path => '/ping')
+    call('ListNicTags', :method => :get, :path => '/nic_tags')
+    call('GetNicTag', :method => :get, :path => '/nic_tags/:name')
+    call('CreateNicTag', :method => :post, :path => '/nic_tags')
+    call('UpdateNicTag', :method => :put, :path => '/nic_tags/:name')
+    call('DeleteNicTag', :method => :delete, :path => '/nic_tags/:name')
+    call('ListNetworks', :method => :get, :path => '/networks')
+    call('CreateNetwork', :method => :post, :path => '/networks')
+    call('UpdateNetwork', :method => :put, :path => '/networks/:network_uuid')
+    call('GetNetwork', :method => :get, :path => '/networks/:network_uuid')
+    call('DeleteNetwork', :method => :delete, :path => '/networks/:network_uuid')
+    call('ProvisionNic', :method => :post, :path => '/networks/:network_uuid/nics')
+    call('ListIPs', :method => :get, :path => '/networks/:network_uuid/ips')
+    call('GetIP', :method => :get, :path => '/networks/:network_uuid/ips/:ip_address')
+    call('UpdateIP', :method => :put, :path => '/networks/:network_uuid/ips/:ip_address')
+    call('ListFabricVLANs', :method => :get, :path => '/fabrics/:owner_uuid/vlans')
+    call('CreateFabricVLAN', :method => :post, :path => '/fabrics/:owner_uuid/vlans')
+    call('GetFabricVLAN', :method => :get, :path => '/fabrics/:owner_uuid/vlans/:vlan_id')
+    call('UpdateFabricVLAN', :method => :put, :path => '/fabrics/:owner_uuid/vlans/:vlan_id')
+    call('DeleteFabricVLAN', :method => :delete, :path => '/fabrics/:owner_uuid/vlans/:vlan_id')
+    call('ListFabricNetworks', :method => :get, :path => '/fabrics/:owner_uuid/vlans/:vlan_id/networks')
+    call('CreateFabricNetwork', :method => :post, :path => '/fabrics/:owner_uuid/vlans/:vlan_id/networks')
+    call('GetFabricNetwork', :method => :get, :path => '/fabrics/:owner_uuid/vlans/:vlan_id/networks/:network_uuid')
+    call('DeleteFabricNetwork', :method => :delete, :path => '/fabrics/:owner_uuid/vlans/:vlan_id/networks/:network_uuid')
+    call('ListNics', :method => :get, :path => '/nics')
+    call('CreateNic', :method => :post, :path => '/nics')
+    call('GetNic', :method => :get, :path => '/nics/:mac_address')
+    call('UpdateNic', :method => :put, :path => '/nics/:mac_address')
+    call('DeleteNic', :method => :delete, :path => '/nics/:mac_address')
+    call('ListNetworkPools', :method => :get, :path => '/network_pools')
+    call('CreateNetworkPool', :method => :post, :path => '/network_pools')
+    call('GetNetworkPool', :method => :get, :path => '/network_pools/:uuid')
+    call('UpdateNetworkPool', :method => :put, :path => '/network_pools/:uuid')
+    call('DeleteNetworkPool', :method => :delete, :path => '/network_pools/:uuid')
+    call('SearchIPs', :method => :get, :path => '/search/ips')
+    call('ListAggregations', :method => :get, :path => '/aggregations')
+    call('GetAggregation', :method => :get, :path => '/aggregations/:id')
+    call('CreateAggregation', :method => :post, :path => '/aggregations')
+    call('UpdateAggregation', :method => :put, :path => '/aggregations/:id')
+    call('DeleteAggregation', :method => :delete, :path => '/aggregations/:id')
+  end
+end

data/Users/thomas/tdh/triton/lib/triton/papi.rb

@@ -0,0 +1,15 @@
+module Triton
+  class Papi < ApiBase
+
+    # The commit used to compile this itnerface:
+    # https://github.com/joyent/sdc-papi/blob/30bcc2ce58ba5b2b27ca16fa33dc56704f865803/docs/index.md
+    #
+    self.name = "papi"
+
+    call('ListPackages', :method => :get, :path => '/packages')
+    call('GetPackage', :method => :get, :path =>'/packages/:uuid')
+    call('CreatePackage', :method => :post, :path =>'/packages')
+    call('UpdatePackage', :method => :put, :path =>'/packages/:uuid')
+    call('Ping', :method => :get, :path => '/ping')
+  end
+end