cloudstack-cli 1.5.10 → 1.5.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9db726fce7f2ff20082296b4e424db14497a04ab
-  data.tar.gz: 6d6177310113255ec6ff7b34fc56dece69ff0c66
+  metadata.gz: 83b0103b12d6560e9bffd194169b83c0f27c1222
+  data.tar.gz: a7f0cc886075681aa26fc07f95ea4cfbfc1469ad
 SHA512:
-  metadata.gz: 2e6177a5cd286a74c2374ef3171d8c886e36e7abb94ded0e482bf1d4e86613ba56b103c00963fcfe30e6aad1bdfa49c2d659fd1bf5721a8cf81f94c0a8c89714
-  data.tar.gz: a09c1c2ceed2856f46f5cececfd61248bb87fd87d7b5f62d0d8fe49bedbcde4ab94b98fd6cf7b87e308cdf5a6cbeb5222a5890a215bbf1956ad36d958cda0b21
+  metadata.gz: f235eb2acda88ef4e5ce20cef48fcff05a36bbd2741c5c8b08aad998422220b25444707f370e53403c536e4aea79861f9edcadc2290ba65d28051a255edd85d2
+  data.tar.gz: 33043d1de16cf62c30d19d666bc583da7344d94bd405cdf6052da70d38a635314c33b7e6d3ea795325d9f641bf6475ce6a52c1d83e591858858d417f047fe34d

data/Gemfile.lock

@@ -6,15 +6,16 @@ PATH
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.5.10)
+    cloudstack-cli (1.5.12)
       cloudstack_client (~> 1.4.3)
-      thor (~> 0.19)
+      thor (~> 0.19.4)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    minitest (5.9.1)
     rake (11.3.0)
-    thor (0.19.1)
+    thor (0.19.4)
 
 PLATFORMS
   ruby
@@ -22,6 +23,7 @@ PLATFORMS
 DEPENDENCIES
   cloudstack-cli!
   cloudstack_client!
+  minitest (~> 5.9)
   rake (~> 11.3)
 
 BUNDLED WITH

data/Rakefile

@@ -1 +1,11 @@
 require "bundler/gem_tasks"
+require "rake/testtask"
+
+
+Rake::TestTask.new do |t|
+  t.libs << "spec"
+  t.pattern = "spec/**/*_spec.rb"
+  t.warning = false
+end
+
+task default: :test

data/cloudstack-cli.gemspec

@@ -22,7 +22,8 @@ Gem::Specification.new do |gem|
   gem.rdoc_options  = %w[--line-numbers --inline-source]
 
   gem.add_development_dependency('rake', '~> 11.3')
+  gem.add_development_dependency('minitest', '~> 5.9')
 
   gem.add_dependency('cloudstack_client', '~> 1.4.3')
-  gem.add_dependency('thor', '~> 0.19')
+  gem.add_dependency('thor', '~> 0.19.4')
 end

data/examples/stack-dev.yml

@@ -0,0 +1,20 @@
+---
+  name: "web_stack_a"
+  description: "Web Application Stack"
+  version: "1.0"
+  zone: "Sandbox-simulator"
+  group: "my_web_stack"
+  servers:
+    - name: "web-01, web-02"
+      description: "Web nodes"
+      template: "CentOS 5.3(64-bit) no GUI (Simulator)"
+      offering: "Small Instance"
+      networks: "test-network"
+      port_rules: ":80, :443"
+    - name: "db-01"
+      description: "PostgreSQL Master"
+      template: "CentOS 5.3(64-bit) no GUI (Simulator)"
+      offering: "Medium Instance"
+      ip_network_list:
+        - name: "test-network"
+          ip: 10.1.1.11

data/lib/cloudstack-cli/commands/account.rb

@@ -20,7 +20,7 @@ class Account < CloudstackCli::Base
     end
   end
 
-  desc 'list', 'list accounts'
+  desc "list", "list accounts"
   option :format, default: "table",
     enum: %w(table json yaml)
   def list

data/lib/cloudstack-cli/commands/affinity_group.rb

@@ -4,7 +4,7 @@ class AffinityGroup < CloudstackCli::Base
   option :account
   option :name
   option :type
-  option :listall
+  option :listall, type: :boolean, default: true
   option :keyword
   option :format, default: "table",
     enum: %w(table json yaml)

data/lib/cloudstack-cli/commands/ip_address.rb

@@ -28,7 +28,7 @@ class IpAddress < CloudstackCli::Base
   desc "list", "list public IP address"
   option :project
   option :account
-  option :listall
+  option :listall, type: :boolean, default: true
   option :format, default: "table",
     enum: %w(table json yaml)
   def list

data/lib/cloudstack-cli/commands/network_offer.rb

@@ -0,0 +1,50 @@
+class NetworkOffer < CloudstackCli::Base
+
+  desc 'list', 'list network offerings'
+  option :guest_ip_type, enum: %w(isolated shared),
+    desc: "list network offerings by guest type."
+  option :format, default: "table",
+    enum: %w(table json yaml)
+  def list
+    offerings = client.list_network_offerings(options)
+    if offerings.size < 1
+      puts "No offerings found."
+    else
+      case options[:format].to_sym
+      when :yaml
+        puts({network_offers: offerings}.to_yaml)
+      when :json
+        puts JSON.pretty_generate(network_offers: offerings)
+      else
+        table = [%w(Name Display_Text Default? Guest_IP_Type State)]
+        offerings.each do |offer|
+          table << [
+            offer['name'],
+            offer['displaytext'],
+            offer['isdefault'],
+            offer['guestiptype'],
+            offer['state'],
+          ]
+        end
+        print_table table
+      end
+    end
+  end
+
+  desc "show NAME", "show detailed infos about a network offering"
+  def show(name)
+    unless offer = client.list_network_offerings(name: name).first
+      say "Error: No network offering with name '#{name}' found.", :red
+    else
+      table = offer.map do |key, value|
+        if key == "service"
+          [ set_color("services", :yellow),  value.map{|s| s["name"]}.join(", ") ]
+        else
+          [ set_color("#{key}", :yellow), "#{value}" ]
+        end
+      end
+      print_table table
+    end
+  end
+
+end

data/lib/cloudstack-cli/commands/router.rb

@@ -7,7 +7,6 @@ class Router < CloudstackCli::Base
   option :state, desc: "the status of the router"
   option :redundant_state, desc: "the state of redundant virtual router",
     enum: %w(master backup fault unknown)
-  option :listall, type: :boolean, desc: "list all routers", default: true
   option :reverse, type: :boolean, default: false, desc: "reverse listing of routers"
   option :command,
     desc: "command to execute for each router",
@@ -26,13 +25,14 @@ class Router < CloudstackCli::Base
 
     routers = client.list_routers(options)
     # show all routers unless project or account is set
-    if options[:listall] && !options[:project] && !options[:account]
+    if !options[:project] && !options[:account]
       client.list_projects(listall: true).each do |project|
         routers = routers + client.list_routers(
           options.merge(projectid: project['id'])
         )
       end
     end
+    options[:listall] = true
     print_routers(routers, options)
     execute_router_commands(options[:command].downcase, routers) if options[:command]
   end

data/lib/cloudstack-cli/commands/snapshot.rb

@@ -4,7 +4,7 @@ class Snapshot < CloudstackCli::Base
   option :account, desc: "the account associated with the snapshot"
   option :project, desc: "the project associated with the snapshot"
   option :domain, desc: "the domain name of the snapshot's account"
-  option :listall, default: true, desc: "list all resources the caller has rights on"
+  option :listall, type: :boolean, default: true, desc: "list all resources the caller has rights on"
   option :state, desc: "filter snapshots by state"
   option :format, default: "table",
     enum: %w(table json yaml)

data/lib/cloudstack-cli/commands/ssh_key_pair.rb

@@ -1,7 +1,7 @@
 class SshKeyPair < CloudstackCli::Base
 
   desc "list", 'list ssh key pairs'
-  option :listall, default: true
+  option :listall, type: :boolean, default: true
   option :account, desc: "name of the account"
   option :project, desc: "name of the project"
   option :format, default: "table",

data/lib/cloudstack-cli/commands/stack.rb

@@ -8,6 +8,8 @@ class Stack < CloudstackCli::Base
     desc: "Skip creation of port forwarding rules."
   option :concurrency, type: :numeric, default: 10, aliases: '-C',
     desc: "number of concurrent commands to execute"
+  option :assumeyes, type: :boolean, default: false, aliases: '-y',
+    desc: "answer yes for all questions"
   def create(stackfile)
     stack = parse_file(stackfile)
     project_id = find_project_by_name(stack["project"])
@@ -83,13 +85,16 @@ class Stack < CloudstackCli::Base
     end
     say "Finished.", :green
 
-    if successful_jobs > 0 && yes?("Display password(s) for VM(s)? [y/N]:", :yellow)
-      pw_table = jobs.select {|job| job[:status] == 1 && job[:result] }.map do |job|
-        if result = job[:result]["virtualmachine"]
-          ["#{result["name"]}:", result["password"] || "n/a"]
+    if successful_jobs > 0
+      if options[:assumeyes] || yes?("Display password(s) for VM(s)? [y/N]:", :yellow)
+        pw_table = [%w(VM Password)]
+        jobs.select {|job| job[:status] == 1 && job[:result] }.each do |job|
+          if result = job[:result]["virtualmachine"]
+            pw_table << ["#{result["name"]}:", result["password"] || "n/a"]
+          end
         end
+        print_table(pw_table) if pw_table.size > 0
       end
-      print_table(pw_table) if pw_table.size > 0
     end
   end
 

data/lib/cloudstack-cli/commands/user.rb

@@ -1,7 +1,7 @@
 class User < CloudstackCli::Base
 
   desc 'list', 'list users'
-  option :listall
+  option :listall, type: :boolean, default: true
   option :account
   option :format, default: "table",
     enum: %w(table json yaml)

data/lib/cloudstack-cli/commands/virtual_machine.rb

@@ -10,7 +10,7 @@ class VirtualMachine < CloudstackCli::Base
   option :host, desc: "the name of the hypervisor host the VM belong to"
   option :filter, type: :hash,
     desc: "filter objects based on arrtibutes: (attr1:regex attr2:regex ...)"
-  option :listall, desc: "list all virtual machines", default: true
+  option :listall, desc: "list all virtual machines", type: :boolean, default: true
   option :command,
     desc: "command to execute for the given virtual machines",
     enum: %w(START STOP REBOOT)
@@ -32,7 +32,7 @@ class VirtualMachine < CloudstackCli::Base
     virtual_machines = client.list_virtual_machines(options)
     virtual_machines = filter_objects(virtual_machines) if options[:filter]
     if virtual_machines.size < 1
-      puts "No virtual_machines found."
+      puts "No virtual machines found."
     else
       print_virtual_machines(virtual_machines)
       execute_virtual_machines_commands(command, virtual_machines) if command
@@ -93,6 +93,8 @@ class VirtualMachine < CloudstackCli::Base
     desc: "optional binary data that can be sent to the virtual machine upon a successful deployment."
   option :concurrency, type: :numeric, default: 10, aliases: '-C',
     desc: "number of concurrent commands to execute"
+  option :assumeyes, type: :boolean, default: false, aliases: '-y',
+    desc: "answer yes for all questions"
   def create(*names)
     if names.size == 0
       say "Please provide at least one virtual machine name.", :yellow
@@ -140,13 +142,16 @@ class VirtualMachine < CloudstackCli::Base
     end
     say "Finished.", :green
 
-    if successful_jobs > 0 && yes?("Display password(s) for VM(s)? [y/N]:", :yellow)
-      pw_table = jobs.select {|job| job[:status] == 1 && job[:result] }.map do |job|
-        if result = job[:result]["virtualmachine"]
-          ["#{result["name"]}:", result["password"] || "n/a"]
+    if successful_jobs > 0
+      if options[:assumeyes] || yes?("Display password(s) for VM(s)? [y/N]:", :yellow)
+        pw_table = [%w(VM Password)]
+        jobs.select {|job| job[:status] == 1 && job[:result] }.each do |job|
+          if result = job[:result]["virtualmachine"]
+            pw_table << ["#{result["name"]}:", result["password"] || "n/a"]
+          end
         end
+        print_table(pw_table) if pw_table.size > 0
       end
-      print_table(pw_table) if pw_table.size > 0
     end
   end
 

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.10"
+  VERSION = "1.5.12"
 end

data/spec/cloudstack-cli/commands/virtual_machine_spec.rb

@@ -0,0 +1,101 @@
+require "spec_helper"
+require "cloudstack-cli"
+
+describe VirtualMachine do
+
+  it "should support all CRUD actions" do
+    vmname = "testvm1"
+
+    # CREATE
+    out, err = capture_io{ CloudstackCli::Cli.start [
+      "vm",
+      "create",
+      vmname,
+      "--zone=#{ZONE}",
+      "--template=#{TEMPLATE}",
+      "--offering=#{OFFERING_S}",
+      "--networks=test-network",
+      "--port-rules=:80",
+      "--assumeyes",
+      CONFIG,
+    ]}
+    err.must_equal ""
+
+    # READ - LIST
+    out, err = capture_io{ CloudstackCli::Cli.start [
+      "vm",
+      "list",
+      CONFIG
+    ]}
+    err.must_equal ""
+    out.must_match(
+      /.*(#{vmname}).*/
+    )
+
+    # READ - SHOW
+    out, err = capture_io{ CloudstackCli::Cli.start [
+      "vm",
+      "show",
+      vmname,
+      CONFIG
+    ]}
+    err.must_equal ""
+    out.must_match(
+      /.*(#{vmname}).*/
+    )
+
+    # UPDATE - STOP
+    out, err = capture_io{ CloudstackCli::Cli.start [
+      "vm",
+      "stop",
+      vmname,
+      "--force",
+      CONFIG,
+    ]}
+    err.must_equal ""
+
+    # UPDATE - UPDATE ;-)
+    new_vmname = "testvm11"
+    out, err = capture_io{ CloudstackCli::Cli.start [
+      "vm",
+      "update",
+      vmname,
+      "--name=#{new_vmname}",
+      "--force",
+      CONFIG,
+    ]}
+    err.must_equal ""
+
+    # UPDATE - START
+    out, err = capture_io{ CloudstackCli::Cli.start [
+      "vm",
+      "start",
+      new_vmname,
+      CONFIG,
+    ]}
+    err.must_equal ""
+
+    # UPDATE - REBOOT
+    out, err = capture_io{ CloudstackCli::Cli.start [
+      "vm",
+      "reboot",
+      new_vmname,
+      "--force",
+      CONFIG,
+    ]}
+    err.must_equal ""
+
+    # DELETE
+    out, err = capture_io{ CloudstackCli::Cli.start [
+      "vm",
+      "destroy",
+      new_vmname,
+      "--expunge",
+      "--force",
+      CONFIG,
+    ]}
+    err.must_equal ""
+    
+  end
+
+end

data/spec/cloudstack-cli.yml

@@ -0,0 +1,6 @@
+---
+:default: development
+development:
+  :url: http://127.0.0.1:8080/client/api
+  :api_key: 3B1lE0C33ceSOUg0jaIo8STNZ55I-mdvza0LXpZA8mrvtpBpgzJgE9YSsURBcQ6qKX090w5vv_AgGRZeYS9AiQ
+  :secret_key: mneyw6fg__Gt-ENg0E_9BfxcuiMJPSThe701Kuz7f5_EsJ0POoN4z9eoslECP5V9oDzB6XOlsCw1FuBqPjMmLg

data/spec/fixtures/stack.yml

@@ -0,0 +1,20 @@
+---
+  name: "web_stack_a"
+  description: "Web Application Stack"
+  version: "1.0"
+  zone: "Sandbox-simulator"
+  group: "my_web_stack"
+  servers:
+    - name: "web-01, web-02"
+      description: "Web nodes"
+      template: "CentOS 5.3(64-bit) no GUI (Simulator)"
+      offering: "Small Instance"
+      networks: "test-network"
+      port_rules: ":80, :443"
+    - name: "db-01"
+      description: "PostgreSQL Master"
+      template: "CentOS 5.3(64-bit) no GUI (Simulator)"
+      offering: "Medium Instance"
+      ip_network_list:
+        - name: "test-network"
+          ip: 10.1.1.11

data/spec/spec_helper.rb

@@ -0,0 +1,12 @@
+require "cloudstack-cli"
+
+require "minitest/spec"
+require "minitest/autorun"
+require "minitest/pride"
+
+# make the config file setup awailable to all specs
+CONFIG = "--config-file=#{File.expand_path('cloudstack-cli.yml', File.dirname(__FILE__))}"
+ZONE = "Sandbox-simulator"
+TEMPLATE = "CentOS 5.3(64-bit) no GUI (Simulator)"
+OFFERING_S = "Small Instance"
+OFFERING_M = "Medium Instance"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.10
+  version: 1.5.12
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2016-11-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '11.3'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.9'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.9'
 - !ruby/object:Gem::Dependency
   name: cloudstack_client
   requirement: !ruby/object:Gem::Requirement
@@ -44,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 0.19.4
 description: cloudstack-cli is a CloudStack API command line client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
@@ -69,6 +83,11 @@ files:
 - bin/cloudstack-cli
 - cloudstack-cli.gemspec
 - completions/cloudstack-cli.bash
+- examples/ma-test.yml
+- examples/stack-dev.yml
+- examples/stack_example.json
+- examples/stack_example.yml
+- examples/stack_example_b.yml
 - lib/cloudstack-cli.rb
 - lib/cloudstack-cli/base.rb
 - lib/cloudstack-cli/cli.rb
@@ -87,6 +106,7 @@ files:
 - lib/cloudstack-cli/commands/job.rb
 - lib/cloudstack-cli/commands/load_balancer.rb
 - lib/cloudstack-cli/commands/network.rb
+- lib/cloudstack-cli/commands/network_offer.rb
 - lib/cloudstack-cli/commands/physical_network.rb
 - lib/cloudstack-cli/commands/pod.rb
 - lib/cloudstack-cli/commands/port_rule.rb
@@ -108,10 +128,10 @@ files:
 - lib/cloudstack-cli/option_resolver.rb
 - lib/cloudstack-cli/thor_patch.rb
 - lib/cloudstack-cli/version.rb
-- test/ma-test.yml
-- test/stack_example.json
-- test/stack_example.yml
-- test/stack_example_b.yml
+- spec/cloudstack-cli.yml
+- spec/cloudstack-cli/commands/virtual_machine_spec.rb
+- spec/fixtures/stack.yml
+- spec/spec_helper.rb
 homepage: http://github.com/niwo/cloudstack-cli
 licenses:
 - MIT
@@ -139,7 +159,7 @@ signing_key:
 specification_version: 4
 summary: cloudstack-cli CloudStack API client
 test_files:
-- test/ma-test.yml
-- test/stack_example.json
-- test/stack_example.yml
-- test/stack_example_b.yml
+- spec/cloudstack-cli.yml
+- spec/cloudstack-cli/commands/virtual_machine_spec.rb
+- spec/fixtures/stack.yml
+- spec/spec_helper.rb