cloudstack-cli 0.11.2 → 0.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b40125323297400e446ffdfd031ac259c5f5c428
-  data.tar.gz: b0db8bf88f21e74971c31ae2ad144b9be78d7625
+  metadata.gz: b22ed0cd78d135de76f2016d9e4f9f6d0dae9b3a
+  data.tar.gz: 035f34a2d3a712a5b73ad5cead88ed593bb66ff9
 SHA512:
-  metadata.gz: a2a21fadec443296a133fa8516ef4864555f86f6f322c5e0943cdd037ac80c507c00119f8353d7d4f6d06d631c99fdf3ed69011053885cecae9a171c417d2bc7
-  data.tar.gz: 6906eb9f5c110208a8cb278ca6833b80c00b7781efa28a1fb2f8ff136283001c667689316257121887f33bb47d79ef7d2679dbd6f3e6c1404d7a221b186436dc
+  metadata.gz: e9f20c5f34ea889ec211c221c2399b920a9d7d52d99bb9b7f3f49562be89d57d32499755042b547f82d301f5df35cff436cc1bb0e0120a4f54db0b01f91876f7
+  data.tar.gz: 20e9ae88467b01b2912ee92daaf4fbaa188f43246fc9f195b74e818114daa044404c28c4cf93eecb04580287074fff1946074c4c5c5c8974e803f7115310f769

data/Gemfile

@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
-#gem 'cloudstack_client', git: 'git@github.com:niwo/cloudstack_client.git', branch: 'master'
-#gem 'thor', git: 'git@github.com:erikhuda/thor.git', branch: 'master'
+gem 'cloudstack_client', git: 'git@github.com:niwo/cloudstack_client.git', branch: 'master'
 
 # Specify your gem's dependencies in cloudstack-cli.gemspec
 gemspec

data/Gemfile.lock

@@ -1,15 +1,21 @@
+GIT
+  remote: git@github.com:niwo/cloudstack_client.git
+  revision: 7e6e2af2299cbb681b2fff8a065c8e91c06ea7ae
+  branch: master
+  specs:
+    cloudstack_client (0.8.0)
+
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.11.2)
-      cloudstack_client (~> 0.7, >= 0.7.1)
+    cloudstack-cli (0.12.0)
+      cloudstack_client (~> 0.8.0)
       thor (~> 0.19.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudstack_client (0.7.1)
-    json (1.8.1)
+    json (1.8.2)
     rake (10.4.2)
     rdoc (4.2.0)
       json (~> 1.4)
@@ -20,5 +26,6 @@ PLATFORMS
 
 DEPENDENCIES
   cloudstack-cli!
-  rake (~> 10.3)
-  rdoc (~> 4.1)
+  cloudstack_client!
+  rake (~> 10.4)
+  rdoc (~> 4.2)

data/README.md

@@ -27,7 +27,7 @@ cloudstack-cli expects to find a configuartion file with the API URL and your Cl
 
 cloudstack-cli supports multiple environments using the --environment option.
 
-see `cs help environment` for more options. 
+see `cs help environment` for more options.
 
 Example content of the configuration file:
 
@@ -81,45 +81,42 @@ $ cs command listAlerts type=8
 
 ### Example: Creating a complete stack of servers
 
-An example stackfile looks like this (my_stackfile.json)
-
-```json
-{
-    "name": "web_stack-a",
-    "description": "Web Application Stack",
-    "version": "1.0",
-    "zone": "DC-BIE-1",
-    "group": "my_web_stack",
-    "keypair": "mykeypair",
-    "servers": [
-        {
-            "name": "web-d1, web-d2",
-            "description": "Web nodes",
-            "template": "CentOS-6.4-x64-v1.2",
-            "offering": "1cpu_1gb",
-            "networks": "server_network",
-            "port_rules": ":80, :443"
-        },
-        {
-            "name": "db-01",
-            "description": "PostgreSQL Master",
-            "iso": "CentOS-6.4-x86_64-swisstxt-v15",
-            "disk_offering": "Perf Storage",
-            "disk_size": "5",
-            "offering": "2cpu_4gb",
-            "networks": [
-                "server_network",
-                "storage_network"
-            ]
-        }
-    ]
-}
+Cloudstack-CLI does support stack files in YAML or JSON.
+
+An example stackfile could look like this (my_stackfile.yml):
+
+```yaml
+---
+  name: "web_stack-a"
+  description: "Web Application Stack"
+  version: "1.0"
+  zone: "DC-ZRH-1"
+  group: "my_web_stack"
+  keypair: "mykeypair"
+  servers:
+    -
+      name: "web-d1, web-d2"
+      description: "Web nodes"
+      template: "CentOS-7-x64"
+      offering: "1cpu_1gb"
+      networks: "server_network"
+      port_rules: ":80, :443"
+    -
+      name: "db-01"
+      description: "PostgreSQL Master"
+      iso: "CentOS-7-x64"
+      disk_offering: "Perf Storage"
+      disk_size: "5"
+      offering: "2cpu_4gb"
+      networks:
+        - "server_network"
+        - "storage_network"
 ```
 
 Create the stack of servers from above:
 
 ```sh
-$ cs stack create my_stackfile.json
+$ cs stack create my_stackfile.yml
 ```
 
 ### Example: Sort computing offerings

data/cloudstack-cli.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = %w(lib)
   gem.rdoc_options  = %w[--line-numbers --inline-source]
 
-  gem.add_development_dependency('rdoc', '~> 4.1')
-  gem.add_development_dependency('rake', '~> 10.3')
+  gem.add_development_dependency('rdoc', '~> 4.2')
+  gem.add_development_dependency('rake', '~> 10.4')
 
   gem.add_dependency('thor', '~> 0.19.1')
-  gem.add_dependency('cloudstack_client', '~> 0.7', '>= 0.7.1')
+  gem.add_dependency('cloudstack_client', '~> 0.8.0')
 end

data/lib/cloudstack-cli/cli.rb

@@ -7,29 +7,29 @@ module CloudstackCli
     class_option :config_file,
       default: File.join(Dir.home, '.cloudstack-cli.yml'),
       aliases: '-c',
-      desc: 'location of your cloudstack-cli configuration file'
+      desc: 'Location of your cloudstack-cli configuration file'
 
     class_option :env,
       aliases: '-e',
-      desc: 'environment to use'
+      desc: 'Environment to use'
 
     class_option :debug,
-      desc: 'enable debug output',
+      desc: 'Enable debug output',
       type: :boolean
 
-    desc "version", "print cloudstack-cli version number"
+    desc "version", "Print cloudstack-cli version number"
     def version
       say "cloudstack-cli version #{CloudstackCli::VERSION}"
     end
     map %w(-v --version) => :version
 
-    desc "setup", "initial configuration of Cloudstack connection settings"
+    desc "setup", "Initial configuration of Cloudstack connection settings"
     def setup(env = options[:environment])
       invoke "environment:add", [env],
         :config_file => options[:config_file]
     end
 
-    desc "completion", "loads the shell scripts for <tab> auto-completion"
+    desc "completion", "Load the shell scripts for <tab> auto-completion"
     option :shell, default: 'bash'
     def completion
       shell_script = File.join(
@@ -43,7 +43,7 @@ module CloudstackCli
       puts File.read shell_script
     end
 
-    desc "command COMMAND [arg1=val1 arg2=val2...]", "run a custom api command"
+    desc "command COMMAND [arg1=val1 arg2=val2...]", "Run a custom api command"
     def command(command, *args)
       params = {'command' => command}
       args.each do |arg|
@@ -153,5 +153,8 @@ module CloudstackCli
 
     desc "configuration SUBCOMMAND ...ARGS", "List cloudstack configuration values"
     subcommand :configuration, Configuration
+
+    desc "resource_limit SUBCOMMAND ...ARGS", "Show cloudstack resource limits"
+    subcommand :resource_limit, ResourceLimit
   end
 end

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

@@ -6,6 +6,21 @@ class Account < CloudstackCli::Base
     2 => 'admin'
   }
 
+  desc "show NAME", "show detailed infos about an account"
+  def show(name)
+    unless account = client.list_accounts({name: name})
+      puts "No account with name #{name} found."
+    else
+      account = account.first
+      account.delete 'user'
+      account['accounttype'] = "#{account['accounttype']} (#{TYPES[account['accounttype']]})"
+      table = account.map do |key, value|
+        [ set_color("#{key}", :yellow), "#{value}" ]
+      end
+      print_table table
+    end
+  end
+
   desc 'list [NAME]', 'list accounts (by name)'
   def list(name = nil)
     accounts = client.list_accounts({name: name})
@@ -20,5 +35,5 @@ class Account < CloudstackCli::Base
       say "Total number of accounts: #{accounts.size}"
     end
   end
-  
-end
+
+end

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

@@ -1,7 +1,6 @@
 class Project < CloudstackCli::Base
 
   desc "show NAME", "show detailed infos about a project"
-  option :project
   def show(name)
     unless project = client.get_project(name)
       puts "No project with name #{name} found."
@@ -27,5 +26,5 @@ class Project < CloudstackCli::Base
       say "Total number of projects: #{projects.count}"
     end
   end
-  
-end
+
+end

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

@@ -0,0 +1,61 @@
+class ResourceLimit < CloudstackCli::Base
+  RESOURCE_TYPES = {
+    0  => {name: "Instances"},
+    1  => {name: "IP Addresses"},
+    2  => {name: "Volumes"},
+    3  => {name: "Snapshots"},
+    4  => {name: "Templates"},
+    5  => {name: "Projects"},
+    6  => {name: "Networks"},
+    7  => {name: "VPC's"},
+    8  => {name: "CPU's"},
+    9  => {name: "Memory", unit: "GB", divider: 1024.0},
+    10 => {name: "Primary Storage", unit: "TB", divider: 1024.0},
+    11 => {name: "Secondary Storage", unit: "TB", divider: 1024.0}
+  }
+
+  desc "list", "list resource limits"
+  option :account
+  option :project
+  option :type, desc: "specify type, see types for a list of types"
+  def list
+    limits = client.list_resource_limits(options)
+    table = []
+    header = options[:project] ? ["Project"] : ["Account"]
+    header += ["Type", "Resource Name", "Max"]
+    limits.each do |limit|
+      limit['resourcetype'] = limit['resourcetype'].to_i
+      table << [
+        options[:project] ? limit['project'] : limit['account'],
+        limit['resourcetype'],
+        RESOURCE_TYPES[limit['resourcetype']][:name],
+        resource_to_s(limit, 'max')
+      ]
+    end
+    table = table.insert(0, header)
+    print_table table
+  end
+
+  desc "types", "show resource types"
+  def types
+    table = [['type', 'name']]
+    RESOURCE_TYPES.each_pair do |type, data|
+      table << [type, data[:name]]
+    end
+    print_table table
+  end
+
+  no_commands do
+
+    def resource_to_s(limit, entity)
+      value = RESOURCE_TYPES[limit['resourcetype']][:divider] ?
+      (limit[entity] / RESOURCE_TYPES[limit['resourcetype']][:divider]).round(1) :
+      limit[entity]
+      RESOURCE_TYPES[limit['resourcetype']][:unit] ?
+      "#{value} #{RESOURCE_TYPES[limit['resourcetype']][:unit]}" :
+      value.to_s
+    end
+
+  end
+
+end

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

@@ -1,8 +1,8 @@
 class Stack < CloudstackCli::Base
 
-	desc "create STACKFILE", "create a stack of servers"
+  desc "create STACKFILE", "create a stack of servers"
   def create(stackfile)
-  	stack = parse_stackfile(stackfile)
+    stack = parse_stackfile(stackfile)
     say "Create stack #{stack["name"]}...", :green
     projectid = find_project(stack["project"])['id'] if stack["project"]
     jobs = []
@@ -42,7 +42,7 @@ class Stack < CloudstackCli::Base
       end
     end
     watch_jobs(jobs)
-    
+
     say "Check for port forwarding rules...", :green
     jobs = []
     stack["servers"].each do |instance|
@@ -105,13 +105,24 @@ class Stack < CloudstackCli::Base
 
   no_commands do
     def parse_stackfile(stackfile)
+      handler = case File.extname(stackfile)
+      when ".json"
+        Object.const_get "JSON"
+      when ".yaml", ".yml"
+        Object.const_get "YAML"
+      else
+        say "File extension #{File.extname(stackfile)} not supported. Supported extensions are .json, .yaml or .yml", :red
+        exit
+      end
       begin
-        return JSON.parse File.read(stackfile)
+        return handler.load File.read(stackfile)
       rescue SystemCallError
-        $stderr.puts "Can't find the stack file #{stackfile}."
-      rescue JSON::ParserError => e
-        $stderr.puts "Error parsing json file.\n#{e.message}."
-        exit
+        say "Can't find the stack file #{stackfile}.", :red
+        exit 1
+      rescue => e
+        say "Error parsing #{File.extname(stackfile)} file:", :red
+        say e.message
+        exit 1
       end
     end
 

data/lib/cloudstack-cli/helper.rb

@@ -3,7 +3,7 @@ module CloudstackCli
     def print_options(options, attr = 'name')
       options.to_enum.with_index(1).each do |option, i|
          puts "#{i}: #{option[attr]}"
-      end   
+      end
     end
 
     def ask_number(question)
@@ -60,7 +60,8 @@ module CloudstackCli
         puts job[:status] == 0 ? spinner.first : ""
       end
       t_elapsed = opts[:t_start] ? (Time.now - opts[:t_start]).round(1) : 0
-      puts "Runtime: #{t_elapsed}s"
+      completed = jobs.select{|j| j[:status] == 1}.size
+      say "Completed: #{completed}/#{jobs.size} (#{t_elapsed}s)", :magenta
       sleep opts[:sleeptime] || 0.1
       spinner.push spinner.shift
       spinner
@@ -119,7 +120,7 @@ module CloudstackCli
           )
         end
         port = pf_rule.split(":")[1]
-        if async 
+        if async
           say "Create port forwarding rule #{ip_addr['ipaddress']}:#{port} for server #{server["name"]}.", :yellow
           client.create_port_forwarding_rule(ip_addr["id"], port, 'TCP', port, server["id"])
           return
@@ -199,4 +200,4 @@ module CloudstackCli
     end
 
   end
-end
+end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.11.2"
+  VERSION = "0.12.0"
 end

data/test/stack_example.json

@@ -9,7 +9,7 @@
     {
       "name": "web-001, web-002",
       "description": "Web nodes",
-      "template": "CentOS-6.4-x64-v1.2",
+      "template": "CentOS-6.5-x64-v1.3",
       "offering": "1cpu_1gb",
       "networks": "M_PLAY",
       "port_rules": ":80, :443"
@@ -17,11 +17,11 @@
     {
       "name": "db-001",
       "description": "PostgreSQL Master",
-      "iso": "CentOS-6.4-x86_64-swisstxt-v15",
+      "iso": "CentOS-7.0 x64",
       "disk_offering": "Perf Storage",
       "disk_size": "5",
       "offering": "2cpu_4gb",
       "networks": "M_PLAY"
     }
   ]
-}
+}

data/test/stack_example.yml

@@ -0,0 +1,23 @@
+---
+  name: "web_stack_a"
+  description: "Web Application Stack"
+  version: "1.0"
+  zone: "BIEL_CU01"
+  project: "Playground"
+  group: "my_web_stack"
+  servers:
+    -
+      name: "web-001, web-002"
+      description: "Web nodes"
+      template: "CentOS-6.5-x64-v1.3"
+      offering: "1cpu_1gb"
+      networks: "M_PLAY"
+      port_rules: ":80, :443"
+    -
+      name: "db-001"
+      description: "PostgreSQL Master"
+      iso: "CentOS-7.0 x64"
+      disk_offering: "Perf Storage"
+      disk_size: "5"
+      offering: "2cpu_4gb"
+      networks: "M_PLAY"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.12.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.1'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -58,20 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 description: cloudstack-cli is a CloudStack API command line client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
@@ -115,6 +109,7 @@ files:
 - lib/cloudstack-cli/commands/port_rule.rb
 - lib/cloudstack-cli/commands/project.rb
 - lib/cloudstack-cli/commands/region.rb
+- lib/cloudstack-cli/commands/resource_limit.rb
 - lib/cloudstack-cli/commands/router.rb
 - lib/cloudstack-cli/commands/server.rb
 - lib/cloudstack-cli/commands/snapshot.rb
@@ -129,6 +124,7 @@ files:
 - lib/cloudstack-cli/helper.rb
 - lib/cloudstack-cli/version.rb
 - test/stack_example.json
+- test/stack_example.yml
 homepage: http://niwo.github.io/cloudstack-cli/
 licenses:
 - MIT
@@ -157,3 +153,4 @@ specification_version: 4
 summary: cloudstack-cli CloudStack API client
 test_files:
 - test/stack_example.json
+- test/stack_example.yml