collins-cli 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 201122b71cc16691fa276fffb3df9f5286e92484
-  data.tar.gz: 0b7647be83fd3785f39b355bdd5298db427a501c
+  metadata.gz: 69eba5865ee4e7b84c85b4f21cb669efb449d2ff
+  data.tar.gz: 110cdefb9778b03bdc099a315d9e42da627fe57b
 SHA512:
-  metadata.gz: 7672baaab1049ac9484d65a2e0099883e787d602c5d9ae2d955d78edd1aaec96f58a217f471c6dd1bc2dcaef8c45c9d9e766b46ed8ce5d0e706c1b9d03059f3c
-  data.tar.gz: 59784b0e93cd58626dfe423b309fadf5e56ddbce55fbd06e1bd8acfa4b0ece38c12cd1968f714cd2dbc90146f4e454a0cca14718d43307121fdcf1496831153e
+  metadata.gz: 0318eadd226ba1c9918674fc736fdf43ee60f2c74c12528cbc4fe46794dd9c009dde3df28ef357deb91c0ce135c7ecc4cb5976095af9db7c587c8c7979a76493
+  data.tar.gz: 59b3b1bf65f3d654e20840aaf28f3a138b3bbf0c8f0a9a7af00af61bc5401c945ba7c3ecf52e71456b0b91ce1eec973b16fb8292cdd86408ac8232ffb1247aaa

data/README.md

@@ -225,9 +225,29 @@ Allocate and delete addresses, and show what address pools are configured in Col
       Deallocate ALL IPs on assets:
         collins ipam -t 001234,003456,007895 -d
 
+## State - collins state
+
+List statuses and states. TODO: implement state creation, deleting, modification
+
+Usage: collins state [options]
+    -l, --list                       List states.
+    -h, --help                       Help
+
+Table formatting:
+    -H, --show-header                Show header fields in output
+    -f, --field-separator SEPARATOR  Separator between columns in output (Default: 	)
+
+Extra options:
+        --timeout SECONDS            Timeout in seconds (0 == forever)
+    -C, --config CONFIG              Use specific Collins config yaml for Collins::Client
+
+Examples:
+  Show states and statuses:
+    collins state --list
+
 ## TODO
 
-* Implement IP allocation in collins-ipam
 * Implement IPMI stuff in collins-ipmi
 * Share code between binaries more
 * Write some tests
+

data/bin/collins

@@ -8,6 +8,7 @@ ALLOWED_ACTIONS = {
   Collins::CLI::Provision => ['provision'],
   Collins::CLI::Power => ['power'],
   Collins::CLI::IPAM => ['ipam','address','ipaddress'],
+  Collins::CLI::State => ['state','status'],
 }
 
 HELP_MESSAGE = "Usage: #{File.basename(File.realpath($0))} <command> [options]
@@ -17,6 +18,7 @@ Available commands:
   log:                       Display log messages on assets
   provision:                 Provision assets
   power:                     Control and show power status
+  state, status:             Show and manage states and statuses via State API
   ipam, address, ipaddress:  Allocate and delete IPs, show IP pools"
 
 abort HELP_MESSAGE if ARGV.empty?

data/lib/collins/cli/formatter.rb

@@ -9,6 +9,7 @@ module Collins::CLI::Formatter
     :show_header      => false,        # if the header for columns should be displayed
   }
   ADDRESS_POOL_COLUMNS = [:name, :network, :start_address, :specified_gateway, :gateway, :broadcast, :possible_addresses]
+  STATUS_STATE_COLUMNS = [:status_name, :state_name, :status_description, :description]
 
   def format_pools(pools, opts = {})
     if pools.length > 0
@@ -21,6 +22,28 @@ module Collins::CLI::Formatter
     end
   end
 
+  def format_states(states, opts = {})
+    if states.length > 0
+      opts = FORMATTING_DEFAULTS.merge(opts)
+      # map the hashes into openstructs that will respond to #send(:name)
+      ostructs = states.map do |s|
+        OpenStruct.new({
+          :status_name => s.status.name || 'Any',
+          :status_id => s.status.id || 0, # assign 0 to "Any" status
+          :status_description => s.status.description || 'Any status',
+          :state_name => s.name,
+          :state_label => s.label,
+          :state_id => s.id,
+          :description => s.description
+        })
+      end
+      ostructs.sort_by! {|x| "#{x.status_id}#{x.state_id}"}
+      display_as_table(ostructs, STATUS_STATE_COLUMNS, opts[:separator], opts[:show_header])
+    else
+      raise "No states found"
+    end
+  end
+
   def format_assets(assets, opts = {})
     opts = FORMATTING_DEFAULTS.merge(opts)
     if assets.length > 0

data/lib/collins/cli/modify.rb

@@ -8,11 +8,6 @@ module Collins::CLI
     VALID_STATUSES = ["ALLOCATED","CANCELLED","DECOMMISSIONED","INCOMPLETE","MAINTENANCE","NEW","PROVISIONED","PROVISIONING","UNALLOCATED"]
     #TODO: this shouldnt be hardcoded. we should pull this from the API instead?
     # should elegantly support user-defined states without changing this script
-    VALID_STATES = {
-      "ALLOCATED" => ["CLAIMED","SPARE","RUNNING_UNMONITORED","UNMONITORED"],
-      "MAINTENANCE" => ["AWAITING_REVIEW","HARDWARE_PROBLEM","HW_TESTING","HARDWARE_UPGRADE","IPMI_PROBLEM","MAINT_NOOP","NETWORK_PROBLEM","RELOCATION",'PROVISIONING_PROBLEM'],
-      "ANY" => ["RUNNING","STARTING","STOPPING","TERMINATED"],
-    }
     LOG_LEVELS = Collins::Api::Logging::Severity.constants.map(&:to_s)
     OPTIONS_DEFAULTS = {
       :query_size => 9999,
@@ -64,10 +59,8 @@ module Collins::CLI
         opts.separator ""
         opts.separator "Allowed values (uppercase or lowercase is accepted):"
         opts.separator <<_EOF_
-  Status (-S,--set-status):
-    #{VALID_STATUSES.join(', ')}
-  States (-S,--set-status):
-    #{VALID_STATES.keys.map {|k| "#{k} ->\n      #{VALID_STATES[k].join(', ')}"}.join "\n    "}
+  Status:State (-S,--set-status):
+    See \`collins state --list\`
   Log levels (-L,--level):
     #{LOG_LEVELS.join(', ')}
 _EOF_
@@ -109,11 +102,8 @@ _EOF_
       #TODO this is never checked because we are making option parser vet our options for levels. Catch OptionParser::InvalidArgument?
       raise "Log level #{options[:log_level]} is invalid! Use one of #{LOG_LEVELS.join(', ')}" unless Collins::Api::Logging::Severity.valid?(options[:log_level])
 
-      # if any statuses or states, validate them against allowed values
       unless options[:status].nil?
         raise "Invalid status #{options[:status]} (Should be in #{VALID_STATUSES.join(', ')})" unless VALID_STATUSES.include? options[:status]
-      states_for_status = VALID_STATES["ANY"].concat((VALID_STATES[options[:status]].nil?) ? [] : VALID_STATES[options[:status]])
-        raise "State #{options[:state]} doesn't apply to status #{options[:status]} (Should be one of #{states_for_status.join(', ')})" unless options[:state].nil? or states_for_status.include?(options[:state])
       end
 
 

data/lib/collins/cli/state.rb

@@ -0,0 +1,69 @@
+require 'collins-cli'
+
+module Collins::CLI
+  class State
+
+    include Mixins
+    include Formatter
+    PROG_NAME = 'collins state'
+    OPTIONS_DEFAULTS = {
+      :format => :table,
+      :separator => "\t",
+      :timeout => 120,
+      :show_header => false,
+      :config => nil
+    }
+    attr_reader :options
+
+    def initialize
+      @options = OPTIONS_DEFAULTS.clone
+      @validated = false
+      @parsed = false
+    end
+
+    def parse!(argv = ARGV)
+      OptionParser.new do |opts|
+        opts.banner = "Usage: #{PROG_NAME} [options]"
+        opts.on('-l','--list',"List states.") { @options[:mode] = :list }
+        opts.on('-h','--help',"Help") {puts opts ; exit 0}
+        opts.separator ""
+        opts.separator "Table formatting:"
+        opts.on('-H','--show-header',"Show header fields in output") {options[:show_header] = true}
+        opts.on('-f','--field-separator SEPARATOR',String,"Separator between columns in output (Default: #{options[:separator]})") {|v| options[:separator] = v}
+        opts.separator ""
+        opts.separator "Extra options:"
+        opts.on('--timeout SECONDS',Integer,"Timeout in seconds (0 == forever)") {|v| options[:timeout] = v}
+        opts.on('-C','--config CONFIG',String,'Use specific Collins config yaml for Collins::Client') {|v| options[:config] = v}
+        opts.separator ""
+        opts.separator "Examples:"
+        opts.separator <<_EOF_
+  Show states and statuses:
+    #{PROG_NAME} --list
+_EOF_
+      end.parse!(argv)
+      @parsed = true
+      self
+    end
+
+    def validate!
+      raise "See --help for #{PROG_NAME} usage" if options[:mode].nil?
+      @validated = true
+      self
+    end
+
+    def run!
+      exit_clean = true
+      case @options[:mode]
+      when :list
+        states = collins.state_get_all
+        format_states(states, options)
+      else
+        raise "I dunno what you want me to do! See #{PROG_NAME} --help"
+      end
+      exit_clean
+
+    end
+
+  end
+end
+

data/lib/collins-cli.rb

@@ -6,7 +6,7 @@ require 'json'
 require 'optparse'
 require 'colorize'
 
-['mixins','formatter','log','modify','find','power','provision','ipam'].
+['mixins','formatter','log','modify','find','power','provision','ipam','state'].
   each {|r| require File.join('collins/cli',r) }
 
 module Collins ; module CLI ; end ; end

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: collins-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Gabe Conradi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: collins_auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 0.1.2
 - !ruby/object:Gem::Dependency
   name: collins_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.16
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.11
+        version: 0.2.16
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 10.4.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.0
 description: CLI utilities to interact with the Collins API
@@ -89,9 +89,6 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- README.md
-- bin/collins
-- lib/collins-cli.rb
 - lib/collins/cli/find.rb
 - lib/collins/cli/formatter.rb
 - lib/collins/cli/ipam.rb
@@ -100,6 +97,10 @@ files:
 - lib/collins/cli/modify.rb
 - lib/collins/cli/power.rb
 - lib/collins/cli/provision.rb
+- lib/collins/cli/state.rb
+- lib/collins-cli.rb
+- bin/collins
+- README.md
 - spec/collins__cli__find_spec.rb
 - spec/collins__cli__log_spec.rb
 - spec/collins__cli__modify_spec.rb
@@ -116,24 +117,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: CLI utilities to interact with the Collins API
 test_files:
-- spec/spec_helper.rb
-- spec/collins__cli__power_spec.rb
-- spec/collins__cli__provision_spec.rb
-- spec/collins__cli__log_spec.rb
 - spec/collins__cli__find_spec.rb
+- spec/collins__cli__log_spec.rb
 - spec/collins__cli__modify_spec.rb
+- spec/collins__cli__power_spec.rb
+- spec/collins__cli__provision_spec.rb
+- spec/spec_helper.rb