knife-maas 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bda6744898a63036dc18093aa32cd860b1aaf108
-  data.tar.gz: 67a1b570ea3856377d599faf11e7debee3385831
+  metadata.gz: 6571f2695fd08992e7f747c0b5c4066490629e0a
+  data.tar.gz: 98e048add9f9c965a75b76f89b22709489e1444e
 SHA512:
-  metadata.gz: 9c8202250766d95e264f4910f749746b31c4ca62d03dd294487f30888547fb1abc00bbfe339af81db20fe351f5429811ae92cd976bc1eca2a864672ccd586526
-  data.tar.gz: fd9d00bcdf21d43e54e79176ec1af5c425554a27403acc3c51e104f38ca36bb06db5cc8c1b9f21a6a6fc134b27ceb1d1b11e7f345aadc47904056ea6f9179bc6
+  metadata.gz: 1f793b7d791b9bd31303f2963a9427511a85c9dab14cb1bc8323424db7f906f61f65734ea8b559337f17a00a1ef2298d1cd99a1029d7c3c5bbd53563a4463094
+  data.tar.gz: 6b4585118138025cc7144be9a2c0093516535a57b83fa81ccf41bdffd912df84d7ada5bf721134ca09daf244da2c5b2e9bc4ac15035ea630a5c52d83f4f19bad

data/.gitignore

@@ -14,3 +14,7 @@
 mkmf.log
 *.gem
 .idea/
+.chef/
+.direnv/
+.envrc
+.ruby-version

data/.rubocop.yml

@@ -0,0 +1,17 @@
+Style/ClassAndModuleChildren:
+  Enabled: false
+Style/GuardClause:
+  Enabled: false
+Metrics/ClassLength:
+  Max: 200
+Metrics/CyclomaticComplexity:
+  Max: 10
+Metrics/PerceivedComplexity:
+  Max: 10
+Metrics/MethodLength:
+  Max: 40
+Metrics/AbcSize:
+  Max: 25
+AllCops:
+  Exclude:
+    - 'Guardfile'

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.1.1
+  - 2.3.0
 install:
     - bundle install --retry=3
 script:

data/CHANGELOG.md

@@ -1,7 +1,25 @@
 # Change Log
 
-## [v2.0.0](https://github.com/chef-partners/knife-maas/tree/v2.0.0)
+## [v2.1.0](https://github.com/chef-partners/knife-maas/tree/v2.1.0)
 
+[Full Changelog](https://github.com/chef-partners/knife-maas/compare/v2.0.0...v2.1.0)
+
+**Implemented enhancements:**
+
+- sleeps are race-condition prone [\#15](https://github.com/chef-partners/knife-maas/issues/15)
+
+**Closed issues:**
+
+- API 1.0 no longer supported in maas 2.0 [\#21](https://github.com/chef-partners/knife-maas/issues/21)
+- if statement is not needed. [\#17](https://github.com/chef-partners/knife-maas/issues/17)
+- Ability to select or change the OS from knife [\#7](https://github.com/chef-partners/knife-maas/issues/7)
+- Give the option of either hostname or systemid [\#5](https://github.com/chef-partners/knife-maas/issues/5)
+
+**Merged pull requests:**
+
+- Merge of 2.0 update [\#24](https://github.com/chef-partners/knife-maas/pull/24) ([tpmullan](https://github.com/tpmullan))
+
+## [v2.0.0](https://github.com/chef-partners/knife-maas/tree/v2.0.0) (2017-03-16)
 [Full Changelog](https://github.com/chef-partners/knife-maas/compare/v1.2.0...v2.0.0)
 
 **Merged pull requests:**

data/README.md

@@ -1,13 +1,13 @@
 # knife-maas
 
-[![Build Status](https://travis-ci.org/jjasghar/knife-maas.svg?branch=master)](https://travis-ci.org/jjasghar/knife-maas)
+[![Build Status](https://travis-ci.org/chef-partners/knife-maas.svg?branch=master)](https://travis-ci.org/chef-partners/knife-maas)
 
 This is the knife plugin to talk to [MAAS](http://maas.ubuntu.com/). This also assumes you have MAAS
 configured with at least one user account. You'll need your API key as one of the
 configuration options. There is a [MAAS cookbook](https://supermarket.chef.io/cookbooks/maas) that
 this plugin has been tested against.
 
-This also assumes you have >= 1.7.1 of MAAS installed, and >= [Chef](http://chef.io) 12 installed.
+This also assumes you have >= 2.0.0 of MAAS installed, and >= [Chef](http://chef.io) 12 installed.
 
 The version `2.0.0`+ of this knife plugin, requires version 2.0 of MAAS API.
 

data/knife-maas.gemspec

@@ -1,25 +1,28 @@
 # coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'chef/knife/maas/version'
+require 'chef/maas/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "knife-maas"
-  spec.version       = Chef::Knife::Maas::VERSION
-  spec.authors       = ["JJ Asghar"]
-  spec.email         = ["jj@chef.io"]
+  spec.name          = 'knife-maas'
+  spec.version       = Chef::Maas::VERSION
+  spec.authors       = ['Chef Partner Engineering']
+  spec.email         = ['jj@chef.io']
   spec.summary       = %q{A knife plugin to interact with MAAS}
   spec.description   = %q{A knife plugin to interact with MAAS}
-  spec.homepage      = "http://github.com/jjasghar/knife-maas"
-  spec.license       = "Apache2"
+  spec.homepage      = 'https://github.com/chef-partners/knife-maas'
+  spec.license       = 'Apache2'
 
   spec.files         = `git ls-files -z`.split("\x0")
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
+
+  spec.add_dependency 'chef', '~> 12.0'
+  spec.add_dependency 'oauth', '~> 0.4'
+  spec.add_dependency 'bson', '~> 3.0'
+  spec.add_dependency 'xml-simple', '~> 1.1'
 
-  spec.add_dependency "chef", "~> 12.0"
-  spec.add_dependency "oauth", "~> 0.4"
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/chef/knife/maas_base.rb

@@ -1,67 +1,94 @@
-
-
 class Chef
   class Knife
+    # Base Maas module with common methods
     module MaasBase
-
       def self.included(includer)
         includer.class_eval do
-
           deps do
-            require 'oauth'
-            require 'oauth/signature/plaintext'
-            require 'chef/json_compat'
-            require 'chef/knife'
-            require 'readline'
+            require 'chef/maas/maas'
+            require 'chef/api_client'
+            require 'chef/node'
             Chef::Knife.load_deps
           end
-          # add common knife option flags here
         end
       end
 
-      def prepare_access_token(oauth_token, oauth_token_secret, consumer_key, consumer_secret)
+      def client
+        @client ||= begin
+          api_key = locate_config_value(:maas_api_key)
+          site_uri = locate_config_value(:maas_site)
+          ::Maas::Client.new(api_key, site_uri)
+        end
+      end
+
+      def destroy_item(klass, name, type_name)
+        object = klass.load(name)
+        object.destroy
+        ui.warn("Deleted #{type_name} #{name}")
+      rescue Net::HTTPServerException
+        ui.warn("Could not find a #{type_name} named #{name} to delete!")
+      end
 
-        consumer = OAuth::Consumer.new( consumer_key,
-                                        consumer_secret,
-                                        {
-                                          :site => locate_config_value(:maas_site)+"api/1.0/",
-                                          :scheme => :header,
-                                          :signature_method => "PLAINTEXT"
-                                        })
+      def acquire_node(hostname: nil, zone: nil)
+        unless hostname || zone
+          ui.error 'Please specify either a zone or hostname'
+          exit 1
+        end
 
-        access_token = OAuth::AccessToken.new( consumer,
-                                               oauth_token,
-                                               oauth_token_secret
-                                             )
-        return access_token
+        if !hostname.nil?
+          client.acquire_node(hostname: hostname)
+        elsif !zone.nil?
+          client.acquire_node(zone: zone)
+        end
       end
 
-      def access_token
-        maas_key = "#{locate_config_value(:maas_api_key)}"
-        customer_key = maas_key.split(":")[0]
-        customer_secret = ""
-        token_key = maas_key.split(":")[1]
-        token_secret = maas_key.split(":")[2]
-        prepare_access_token(token_key, token_secret, customer_key, customer_secret)
+      def print_node_status(response_json)
+        if response_json.is_a?(Hash) && code = response_json['status']
+          ui.info(ui.color(::Maas::NODE_STATUS_MAP[code.to_s][:status],
+                           ::Maas::NODE_STATUS_MAP[code.to_s][:color]))
+        end
+        response_json
       end
 
       def locate_config_value(key)
         key = key.to_sym
-        Chef::Config[:knife][key] || config[key]
+        config[key] || Chef::Config[:knife][key]
       end
 
-      def validate!(keys=[:hostname, :system_id])
-        errors = []
-
-        keys.each do |k|
-          if locate_config_value(k).nil?
-            errors << "You did not provide a valid '#{k}' value."
+      def with_timeout(max_time = nil, &block)
+        if max_time
+          Timeout.timeout(max_time) do
+            block.call
           end
+        else
+          block.call
+        end
+      rescue Timeout::Error
+        ui.error "Request took longer than #{max_time}"
+        exit 1
+      end
+
+      def wait_with_dots(sleep_seconds = 1)
+        print('.') && sleep(sleep_seconds)
+      end
+
+      def ensure_system_id!
+        system_id = locate_config_value(:system_id) || name_args[0]
+        unless system_id
+          ui.error('You must provide the system id of the node')
+          exit 1
         end
+        system_id
+      end
 
-        if errors.each{|e| ui.error(e)}.any?
+      def ensure_chef_node_name!
+        hostname = locate_config_value(:hostname)
+        node_name = config[:chef_node_name] || hostname
+        unless node_name
+          ui.error ('You must provide the hostname or chef_node_name')
           exit 1
         end
+        node_name
       end
     end
   end

data/lib/chef/knife/maas_server_acquire.rb

@@ -3,44 +3,25 @@ require 'chef/knife/maas_base'
 class Chef
   class Knife
     class MaasServerAcquire < Knife
-
       include Chef::Knife::MaasBase
 
-      deps do
-      end
-
-      banner "knife maas server acquire (options)"
+      banner 'knife maas server acquire (options)'
 
       option :hostname,
-      :short => "-h HOSTNAME",
-      :long => "--hostname HOSTNAME",
-      :description => "The HOSTNAME inside of MAAS"
+             short: '-h HOSTNAME',
+             long: '--hostname HOSTNAME',
+             description: 'The HOSTNAME inside of MAAS'
 
       option :zone,
-      :short => "-Z ZONE",
-      :long => "--zone ZONE",
-      :description => "Bootstrap inside a ZONE inside of MAAS"
+             short: '-Z ZONE',
+             long: '--zone ZONE',
+             description: 'Bootstrap inside a ZONE inside of MAAS'
 
       def run
-
         hostname = locate_config_value(:hostname)
         zone = locate_config_value(:zone)
-
-        if (!hostname.nil? && !zone.nil?)
-          puts "\nPlease only use one of these options, zone or hostname"
-          exit 1
-        elsif !hostname.nil?
-          response = access_token.request(:post, "/nodes/", {'op'=> 'acquire','name' => "#{hostname}"})
-        elsif !zone.nil?
-          response = access_token.request(:post, "/nodes/", {'op'=> 'acquire','zone' => "#{zone}"})
-        else
-          response = access_token.request(:post, "/nodes/?op=acquire")
-        end
-
-        hostname = JSON.parse(response.body)["hostname"]
-        puts "Acquiring #{hostname} under your account now...."
+        print_node_status(acquire_node(hostname: hostname, zone: zone))
       end
-
     end
   end
 end

data/lib/chef/knife/maas_server_bootstrap.rb

@@ -3,7 +3,6 @@ require 'chef/knife/maas_base'
 class Chef
   class Knife
     class MaasServerBootstrap < Knife
-
       include Chef::Knife::MaasBase
 
       deps do
@@ -11,100 +10,74 @@ class Chef
         Chef::Knife::Bootstrap.load_deps
       end
 
-      banner "knife maas server bootstrap (options)"
+      banner 'knife maas server bootstrap (options)'
 
       option :hostname,
-      :short => "-h HOSTNAME",
-      :long => "--hostname HOSTNAME",
-      :description => "The HOSTNAME inside of MAAS"
+             short: '-h HOSTNAME',
+             long: '--hostname HOSTNAME',
+             description: 'The HOSTNAME inside of MAAS'
 
       option :template_file,
-      :long => "--template-file TEMPLATE",
-      :description => "Full path to location of template to use",
-      :proc => Proc.new { |t| Chef::Config[:knife][:template_file] = t },
-      :default => false
+             long: '--template-file TEMPLATE',
+             description: 'Full path to location of template to use',
+             proc: proc { |t| Chef::Config[:knife][:template_file] = t },
+             default: false
 
       option :run_list,
-      :short => "-r RUN_LIST",
-      :long => "--run-list RUN_LIST",
-      :description => "Comma separated list of roles/recipes to apply",
-      :proc => lambda { |o| o.split(/[\s,]+/) },
-      :default => []
+             short: '-r RUN_LIST',
+             long: '--run-list RUN_LIST',
+             description: 'Comma separated list of roles/recipes to apply',
+             proc: -> (o) { o.split(/[\s,]+/) },
+             default: []
 
       option :zone,
-      :short => "-Z ZONE",
-      :long => "--zone ZONE",
-      :description => "Bootstrap inside a ZONE inside of MAAS"
+             short: '-Z ZONE',
+             long: '--zone ZONE',
+             description: 'Bootstrap inside a ZONE inside of MAAS'
+
+      option :bootstrap_timeout,
+             short: '-T TIMEOUT',
+             long: '--bootstrap-timeout',
+             description: 'How long to wait for the Server to initially boot',
+             default: 120
 
       def run
+        node = acquire_node(hostname: locate_config_value(:hostname),
+                            zone: locate_config_value(:zone)
+                           )
 
-        hostname = locate_config_value(:hostname)
-        zone = locate_config_value(:zone)
+        system_id = node['system_id']
 
-        if (!hostname.nil? && !zone.nil?)
-          puts "\nPlease only use one of these options, zone or hostname"
-          exit 1
-        elsif !hostname.nil?
-          response = access_token.request(:post, "/nodes/", {'op'=> 'acquire','name' => "#{hostname}"})
-        elsif !zone.nil?
-          response = access_token.request(:post, "/nodes/", {'op'=> 'acquire','zone' => "#{zone}"})
-        else
-          response = access_token.request(:post, "/nodes/?op=acquire")
-        end
+        puts "Acquiring #{node["hostname"]} under your account now.\n"
 
-        hostname = JSON.parse(response.body)["hostname"]
-        system_id = JSON.parse(response.body)["system_id"]
-        system_info = access_token.request(:get, "/nodes/#{system_id}/")
-        puts "Acquiring #{hostname} under your account now...."
-
-        # hack to ensure the node have had time to spin up
-        print(".")
-        sleep 30
-        print(".")
-
-        response = access_token.request(:post, "/nodes/#{system_id}/?op=start")
-        puts "\nStarting up #{hostname} now...."
-
-        # hack to ensure the nodes have had time to spin up
-        print(".")
-        sleep 30
-        print(".")
-
-        server = JSON.parse(system_info.body)["hostname"]
-        netboot = JSON.parse(system_info.body)["netboot"]
-        power_state = JSON.parse(system_info.body)["power_state"]
-
-        until ((netboot == false) && (power_state == "on") ) do
-          print(".")
-          sleep @initial_sleep_delay ||= 10
-          system_info = access_token.request(:get, "/nodes/#{system_id}/")
-          netboot = JSON.parse(system_info.body)["netboot"]
-          power_state = JSON.parse(system_info.body)["power_state"]
+        with_timeout(60) do
+          # wait until node is in 'Allocated' state
+          wait_with_dots until client.list_node(system_id)['status'].to_s == '10'
         end
 
-        bootstrap_ip_address = JSON.parse(system_info.body)["ip_addresses"][0]
+        puts "Deploying #{node["hostname"]}\n"
+        client.deploy_node(system_id)
 
-        print(".")
-        sleep 30
-        print(".")
-        sleep 30
+        with_timeout(60000) do
+          # wait until node is in 'Allocated' state
+          wait_with_dots until client.list_node(system_id)['status'].to_s == '6'
+        end
 
-        print(".") until tcp_test_ssh(bootstrap_ip_address) {
-          sleep @initial_sleep_delay ||= 10
-          puts("connected and done")
-        }
+        system_info = client.list_node(system_id)
+        bootstrap_ip_address = system_info['ip_addresses'][0]
 
-        os_system = JSON.parse(system_info.body)["osystem"]
+        with_timeout(config[:bootstrap_timeout]) do
+          wait_with_dots(5) until tcp_test_ssh(bootstrap_ip_address)
+        end
 
-        case os_system
-        when "centos"
-          user = "cloud-user"
+        case system_info['osystem']
+        when 'centos'
+          user = 'cloud-user'
         else
-          user = "ubuntu"
+          user = 'ubuntu'
         end
 
         bootstrap_for_node(server, bootstrap_ip_address, user).run
-
       end
 
       def bootstrap_for_node(server, bootstrap_ip_address, user)
@@ -140,10 +113,8 @@ class Chef
       rescue Errno::EPERM
         false
       rescue Errno::ECONNREFUSED
-        sleep 2
         false
       rescue Errno::EHOSTUNREACH
-        sleep 2
         false
       rescue Errno::ENETUNREACH
         sleep 2
@@ -151,7 +122,6 @@ class Chef
       ensure
         tcp_socket && tcp_socket.close
       end
-
     end
   end
 end

data/lib/chef/knife/maas_server_commission.rb

@@ -0,0 +1,23 @@
+require 'chef/knife/maas_base'
+
+class Chef
+  class Knife
+    class MaasServerCommission < Knife
+      include Chef::Knife::MaasBase
+
+      banner 'knife maas server commission (options)'
+
+      option :system_id,
+             short: '-s SYSTEM_ID',
+             long: '--system-id SYSTEM_ID',
+             description: 'The System ID inside of MaaS'
+
+      def run
+        unless system_id = locate_config_value(:system_id) || name_args[0]
+          ui.error('You must provide the system id of the node')
+        end
+        print_node_status(client.commission_node(system_id))
+      end
+    end
+  end
+end

data/lib/chef/knife/maas_server_delete.rb

@@ -1,59 +1,49 @@
 require 'chef/knife/maas_base'
-require 'chef/node'
-require 'chef/api_client'
 
 class Chef
   class Knife
     class MaasServerDelete < Knife
-
       include Chef::Knife::MaasBase
 
-      banner "knife maas server delete (options)"
+      banner 'knife maas server delete (options)'
 
       option :hostname,
-      :short => "-h HOSTNAME",
-      :long => "--hostname HOSTNAME",
-      :description => "The HOSTNAME inside of MaaS"
+             short: '-h HOSTNAME',
+             long: '--hostname HOSTNAME',
+             description: 'The HOSTNAME inside of MaaS'
 
       option :system_id,
-      :short => "-s SYSTEM_ID",
-      :long => "--system-id SYSTEM_ID",
-      :description => "The System ID inside of MaaS"
+             short: '-s SYSTEM_ID',
+             long: '--system-id SYSTEM_ID',
+             description: 'The System ID inside of MaaS'
 
       option :purge,
-      :short => "-P",
-      :long => "--purge",
-      :boolean => true,
-      :default => false,
-      :description => "Destroy corresponding node and client on the Chef Server, in addition to destroying the MaaS node itself. Assumes node and client have the same name as the server."
-
-      def destroy_item(klass, name, type_name)
-        begin
-          object = klass.load(name)
-          object.destroy
-          ui.warn("Deleted #{type_name} #{name}")
-        rescue Net::HTTPServerException
-          ui.warn("Could not find a #{type_name} named #{name} to delete!")
-        end
-      end
+             short: '-P',
+             long: '--purge',
+             boolean: true,
+             default: false,
+             description: <<-EOS.gsub(/^ {15}/, '').gsub(/\n/, ' ')
+               Destroy corresponding node and client on the Chef Server, in
+               addition to destroying the MaaS node itself. Assumes node and
+               client have the same name as the server.
+             EOS
 
       def run
-        system_id = locate_config_value(:system_id)
-        hostname = locate_config_value(:hostname)
-
-        if config[:purge]
-          thing_to_delete = config[:chef_node_name] || hostname
-          destroy_item(Chef::Node, thing_to_delete, "node")
-          destroy_item(Chef::ApiClient, thing_to_delete, "client")
-        else
-          ui.warn("Corresponding node and client for the #{hostname} server were not deleted and remain registered with the Chef Server")
+        system_id = ensure_system_id!
+        node_name = ensure_chef_node_name! if config[:purge]
+
+        if print_node_status(client.delete_node(system_id))
+          if config[:purge]
+            destroy_item(Chef::Node, node_name, 'node')
+            destroy_item(Chef::ApiClient, node_name, 'client')
+          else
+            ui.warn <<-EOS.gsub(/^ {14}/, '').gsub(/\n/, ' ')
+              The corresponding node and client for #{node_name || system_id}
+              were not deleted and remain registered with the Chef Server
+            EOS
+          end
         end
-
-        response = access_token.request(:post, "/nodes/#{system_id}/?op=delete")
-        puts "Nuking #{system_id} From Orbit now...."
       end
-
-
     end
   end
 end

data/lib/chef/knife/maas_server_list.rb

@@ -3,13 +3,11 @@ require 'chef/knife/maas_base'
 class Chef
   class Knife
     class MaasServerList < Knife
-
       include Chef::Knife::MaasBase
 
-      banner "knife maas server list"
+      banner 'knife maas server list'
 
       def run
-
         server_list = [
           ui.color('System ID', :bold),
           ui.color('Status', :bold),
@@ -19,63 +17,38 @@ class Chef
           ui.color('IP Address', :bold)
         ]
 
-        response = access_token.request(:get, "/nodes/?op=list")
-        JSON.parse(response.body).sort_by { |h| h["system_id"] }.each do |server|
-          Chef::Log.debug("Server: #{server.to_yaml}")
-
-          server_list << server['system_id'].to_s
-          server_list << begin
-                           status = server['substatus'].to_s
-                           case status
-                           when "2","3","8","11","13","15"
-                             ui.color("failed", :red)
-                           when "0","1","5","7","9","10","12","14"
-                             ui.color("deploying", :yellow)
-                           when "4"
-                             ui.color("ready", :green)
-                           when "6"
-                             ui.color("deployed", :green)
-                           else
-                             ui.color(status, :green)
-                           end
-                         end
-          # NEW = 0
-          # COMMISSIONING = 1
-          # FAILED_COMMISSIONING = 2
-          # MISSING = 3
-          # READY = 4
-          # RESERVED = 5
-          # DEPLOYED = 6
-          # RETIRED = 7
-          # BROKEN = 8
-          # DEPLOYING = 9
-          # ALLOCATED = 10
-          # FAILED_DEPLOYMENT = 11
-          # RELEASING = 12
-          # FAILED_RELEASING = 13
-          # DISK_ERASING = 14
-          # FAILED_DISK_ERASING = 15
-          server_list <<  begin
-                           power_state = server['power_state'].to_s
-                           case power_state
-                           when "off"
-                             ui.color(power_state, :red)
-                           when "on"
-                             ui.color(power_state, :green)
-                           else
-                             ui.color(power_state, :yellow)
-                           end
-                          end
-          server_list << server['hostname'].to_s
-          server_list << server['owner'].to_s
-          server_list << server['ip_addresses'].to_s
-
+        list = client.list_nodes
+        
+        if list.is_a? Array
+          list.sort_by { |h| h['system_id'] }.each do |server|
+            #Chef::Log.debug("Server: #{server.to_yaml}")
+
+            server_list << server['system_id'].to_s
+
+            status = server['substatus'] || server['status'] || '-1'
+            server_list << ui.color(::Maas::NODE_STATUS_MAP[status.to_s][:status],
+                                    ::Maas::NODE_STATUS_MAP[status.to_s][:color])
+
+            server_list << begin
+                             power_state = server['power_state'].to_s
+                             case power_state
+                             when 'off'
+                               ui.color(power_state, :red)
+                             when 'on'
+                               ui.color(power_state, :green)
+                             else
+                               ui.color(power_state, :yellow)
+                             end
+            end
+            server_list << server['hostname'].to_s
+            server_list << server['owner'].to_s
+            server_list << server['ip_addresses'].to_s
+          end
+          ui.info(ui.list(server_list, :uneven_columns_across, 6))
+        else
+          ui.info(list)
         end
-        puts ui.list(server_list, :uneven_columns_across, 6)
-
       end
-
-
     end
   end
 end

data/lib/chef/knife/maas_server_release.rb

@@ -1,62 +1,49 @@
 require 'chef/knife/maas_base'
-require 'chef/node'
-require 'chef/api_client'
 
 class Chef
   class Knife
     class MaasServerRelease < Knife
-
       include Chef::Knife::MaasBase
 
-      banner "knife maas server release (options)"
+      banner 'knife maas server release (options)'
 
       option :hostname,
-      :short => "-h HOSTNAME",
-      :long => "--hostname HOSTNAME",
-      :description => "The HOSTNAME inside of MAAS"
+             short: '-h HOSTNAME',
+             long: '--hostname HOSTNAME',
+             description: 'The HOSTNAME inside of MAAS'
 
       option :system_id,
-      :short => "-s SYSTEM_ID",
-      :long => "--system-id SYSTEM_ID",
-      :description => "The System ID inside of MAAS"
+             short: '-s SYSTEM_ID',
+             long: '--system-id SYSTEM_ID',
+             description: 'The System ID inside of MAAS'
 
       option :purge,
-      :short => "-P",
-      :long => "--purge",
-      :boolean => true,
-      :default => false,
-      :description => "Destroy corresponding node and client on the Chef Server, in addition to releasing the MAAS node itself. Assumes node and client have the same name as the server."
-
-      def destroy_item(klass, name, type_name)
-        begin
-          object = klass.load(name)
-          object.destroy
-          ui.warn("Deleted #{type_name} #{name}")
-        rescue Net::HTTPServerException
-          ui.warn("Could not find a #{type_name} named #{name} to delete!")
-        end
-      end
+             short: '-P',
+             long: '--purge',
+             boolean: true,
+             default: false,
+             description: <<-EOS.gsub(/^ {15}/, '').gsub(/\n/, ' ')
+               Destroy corresponding node and client on the Chef Server, in
+               addition to releasing the MAAS node itself. Assumes node and
+               client have the same name as the server.
+             EOS
 
       def run
-
-        validate!
-
-        system_id = locate_config_value(:system_id)
-        hostname = locate_config_value(:hostname)
-
-        if config[:purge]
-          thing_to_delete = config[:chef_node_name] || hostname
-          destroy_item(Chef::Node, thing_to_delete, "node")
-          destroy_item(Chef::ApiClient, thing_to_delete, "client")
-        else
-          ui.warn("Corresponding node and client for the #{hostname} server were not deleted and remain registered with the Chef Server")
+        system_id = ensure_system_id!
+        node_name = ensure_chef_node_name! if config[:purge]
+
+        if print_node_status(client.release_node(system_id))
+          if config[:purge]
+            destroy_item(Chef::Node, node_name, 'node')
+            destroy_item(Chef::ApiClient, node_name, 'client')
+          else
+            ui.warn <<-EOS.gsub(/^ {14}/, '').gsub(/\n/, ' ')
+              The corresponding node and client for #{node_name || system_id}
+              were not deleted and remain registered with the Chef Server
+            EOS
+          end
         end
-
-        response = access_token.request(:post, "/nodes/#{system_id}/?op=release")
-        puts "Releasing #{system_id} back to MAAS now...."
       end
-
-
     end
   end
 end

data/lib/chef/knife/maas_server_show.rb

@@ -0,0 +1,23 @@
+require 'chef/knife/maas_base'
+
+class Chef
+  class Knife
+    class MaasServerShow < Knife
+      include Chef::Knife::MaasBase
+
+      banner 'knife maas server show $NODE (options)'
+
+      option :system_id,
+             short: '-s SYSTEM_ID',
+             long: '--system-id SYSTEM_ID',
+             description: 'The System ID inside of MaaS'
+
+      def run
+        unless system_id = locate_config_value(:system_id) || name_args[0]
+          ui.error('You must provide the system id of the node')
+        end
+        ui.info(Chef::JSONCompat.to_json_pretty(client.show_node(system_id)))
+      end
+    end
+  end
+end

data/lib/chef/knife/maas_server_start.rb

@@ -3,28 +3,21 @@ require 'chef/knife/maas_base'
 class Chef
   class Knife
     class MaasServerStart < Knife
-
       include Chef::Knife::MaasBase
 
-      deps do
-        require 'chef/knife/bootstrap'
-        Chef::Knife::Bootstrap.load_deps
-      end
-
-      banner "knife maas server start (options)"
+      banner 'knife maas server start (options)'
 
       option :system_id,
-      :short => "-s SYSTEM_ID",
-      :long => "--system-id SYSTEM_ID",
-      :description => "The System ID inside of MaaS"
+             short: '-s SYSTEM_ID',
+             long: '--system-id SYSTEM_ID',
+             description: 'The System ID inside of MaaS'
 
       def run
-        system_id = locate_config_value(:system_id)
-        response = access_token.request(:post, "/nodes/#{system_id}/?op=start")
-        puts "Starting up #{system_id} now...."
+        unless system_id = locate_config_value(:system_id) || name_args[0]
+          ui.error('You must provide the system id of the node')
+        end
+        print_node_status(client.start_node(system_id))
       end
-
-
     end
   end
 end

data/lib/chef/knife/maas_server_stop.rb

@@ -3,23 +3,21 @@ require 'chef/knife/maas_base'
 class Chef
   class Knife
     class MaasServerStop < Knife
-
       include Chef::Knife::MaasBase
 
-      banner "knife maas server stop (options)"
+      banner 'knife maas server stop (options)'
 
       option :system_id,
-      :short => "-s SYSTEM_ID",
-      :long => "--system-id SYSTEM_ID",
-      :description => "The System ID inside of MaaS"
+             short: '-s SYSTEM_ID',
+             long: '--system-id SYSTEM_ID',
+             description: 'The System ID inside of MaaS'
 
       def run
-        system_id = locate_config_value(:system_id)
-        response = access_token.request(:post, "/nodes/#{system_id}/?op=stop")
-        puts "Stopping #{system_id} now...."
+        unless system_id = locate_config_value(:system_id) || name_args[0]
+          ui.error('You must provide the system id of the node')
+        end
+        print_node_status(client.stop_node(system_id))
       end
-
-
     end
   end
 end

data/lib/chef/maas/client.rb

@@ -0,0 +1,143 @@
+require 'oauth'
+require 'oauth/signature/plaintext'
+require 'chef/json_compat'
+require 'chef/knife'
+require 'readline'
+require 'timeout'
+require 'forwardable'
+require 'bson'
+require 'xmlsimple'
+
+module Maas
+  class Client
+    extend Forwardable
+
+    attr_reader :api_key, :site_uri, :access_token, :ui
+
+    def initialize(api_key, site_uri)
+      @api_key = api_key
+      @site_uri = site_uri
+      @access_token = access_token
+      @ui = Chef::Knife.ui
+    end
+
+    def_delegators :@access_token, :get, :put, :post, :delete, :request
+
+    def acquire_node(hostname: nil, zone: nil)
+      if hostname && zone
+        ui.error 'Please specify either a zone or hostname'
+      elsif !hostname && !zone
+        ui.error 'Please specify a zone or hostname'
+      end
+
+      if hostname
+        response = post('/machines/', 'op' => 'allocate', 'name' => "#{hostname}")
+      elsif zone
+        response = post('/machines/', 'op' => 'allocate', 'zone' => "#{zone}")
+      end
+
+      parse_response(response)
+    end
+
+    # TODO: Maybe use method_missing to dynamically build these helpers
+
+    def delete_node(system_id)
+      parse_response(delete("/nodes/#{system_id}/"))
+    end
+
+    def show_node(system_id)
+      bson_parse(get("/nodes/#{system_id}/?op=details"))
+    end
+
+    def list_node(system_id)
+      list = parse_response(get("/nodes/?id=#{system_id}"))
+      if list.is_a? Array
+        return list.first
+      else
+        return Hash.new
+      end
+    end
+
+    def list_nodes
+      parse_response(get('/nodes/'))
+    end
+
+    def release_node(system_id)
+      parse_response(post("/machines/#{system_id}/?op=release"))
+    end
+
+    def start_node(system_id)
+      parse_response(post("/machines/#{system_id}/?op=power_on"))
+    end
+
+    def deploy_node(system_id)
+      parse_response(post("/machines/#{system_id}/?op=deploy"))
+    end
+
+
+    def commission_node(system_id)
+      parse_response(post("/machines/#{system_id}/?op=commission"))
+    end
+
+    def stop_node(system_id)
+      parse_response(post("/machines/#{system_id}/?op=power_off"))
+    end
+
+    private
+
+    def access_token
+      consumer_key, token_key, token_secret = api_key.split(':')
+      consumer = OAuth::Consumer.new(consumer_key,
+                                     '',
+                                     site: "#{site_uri}api/2.0",
+                                     scheme: :header,
+                                     signature_method: 'PLAINTEXT'
+                                    )
+      OAuth::AccessToken.new(consumer,
+                             token_key,
+                             token_secret
+                            )
+    end
+
+    def parse_response(response)
+      case response
+      when Net::HTTPSuccess, Net::HTTPRedirection
+        parse_response_json(response)
+      else
+        ui.error(parse_response_json(response))
+        exit 1
+      end
+    end
+
+    def parse_response_json(response)
+      Chef::JSONCompat.parse(response.body)
+    rescue Chef::Exceptions::JSON::ParseError
+      response.body
+    end
+
+    def bson_parse(response)
+      decoded = {}
+      Hash.from_bson(StringIO.new(response.body)).each_pair do |type, binary|
+        decoded[type] = XmlSimple.xml_in(binary.data)
+      end
+      decoded
+    end
+
+    def with_timeout(max_time = nil, &block)
+      if max_time
+        Timeout.timeout(max_time) do
+          block.call
+        end
+      else
+        block.call
+      end
+    rescue Timeout::Error
+      ui.error "Request took longer than #{max_time}"
+      exit 1
+    end
+
+    def wait_with_dots(sleep_seconds = 1)
+      print('.') && sleep(sleep_seconds)
+    end
+  end
+end

data/lib/chef/maas/maas.rb

@@ -0,0 +1,24 @@
+require 'chef/maas/version'
+require 'chef/maas/client'
+
+module Maas
+  NODE_STATUS_MAP = {
+    '-1' => { color: :red, status: 'unknown' },
+    '0' => { color: :yellow, status: 'new' },
+    '1' => { color: :yellow, status: 'commissioning' },
+    '2' => { color: :red, status: 'failed_commissioning' },
+    '3' => { color: :red, status: 'missing' },
+    '4' => { color: :green, status: 'ready' },
+    '5' => { color: :yellow, status: 'reserved' },
+    '6' => { color: :green, status: 'deployed' },
+    '7' => { color: :yellow, status: 'retired' },
+    '8' => { color: :red, status: 'broken' },
+    '9' => { color: :yellow, status: 'deploying' },
+    '10' => { color: :yellow, status: 'allocated' },
+    '11' => { color: :red, status: 'failed_deployment' },
+    '12' => { color: :yellow, status: 'releasing' },
+    '13' => { color: :red, status: 'failed_releasing' },
+    '14' => { color: :yellow, status: 'disk_erasing' },
+    '15' => { color: :red, status: 'failed_disk_erasing' }
+  }
+end

data/lib/chef/maas/version.rb

@@ -0,0 +1,5 @@
+class Chef
+  module Maas
+    VERSION = '2.1.0'
+  end
+end

data/spec/knife/maas_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Chef::Knife::Maas do
+describe Chef::Maas do
   it 'has a version number' do
-    expect(Chef::Knife::Maas::VERSION).not_to be nil
+    expect(Chef::Maas::VERSION).not_to be nil
   end
 
   it 'does nothing useful' do

data/spec/spec_helper.rb

@@ -1,2 +1,3 @@
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'chef/knife/maas'
+require 'chef/maas/version'
+require 'chef/maas/client'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-maas
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
-- JJ Asghar
+- Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-16 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -38,6 +38,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: bson
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +131,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -110,19 +139,23 @@ files:
 - README.md
 - Rakefile
 - knife-maas.gemspec
-- lib/chef/knife/maas.rb
 - lib/chef/knife/maas/version.rb
 - lib/chef/knife/maas_base.rb
 - lib/chef/knife/maas_server_acquire.rb
 - lib/chef/knife/maas_server_bootstrap.rb
+- lib/chef/knife/maas_server_commission.rb
 - lib/chef/knife/maas_server_delete.rb
 - lib/chef/knife/maas_server_list.rb
 - lib/chef/knife/maas_server_release.rb
+- lib/chef/knife/maas_server_show.rb
 - lib/chef/knife/maas_server_start.rb
 - lib/chef/knife/maas_server_stop.rb
+- lib/chef/maas/client.rb
+- lib/chef/maas/maas.rb
+- lib/chef/maas/version.rb
 - spec/knife/maas_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/jjasghar/knife-maas
+homepage: https://github.com/chef-partners/knife-maas
 licenses:
 - Apache2
 metadata: {}

data/lib/chef/knife/maas.rb

@@ -1,9 +0,0 @@
-require "chef/knife/maas/version"
-
-class Chef
-  class Knife
-    class MaasServerList < Knife
-
-    end
-  end
-end