cloudstack-cli 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25e8d7d5fa40b7654d1a450ba9cb59a8112118c3
-  data.tar.gz: c83a6b5bb3ec80bafda80854d4037c49ec244940
+  metadata.gz: dcc8b27372a5484703bb5d2abcacbaf10e9919a6
+  data.tar.gz: cf28ee4aa1149427ca4f2bc4d17207f4c5347d4c
 SHA512:
-  metadata.gz: 914e12b7c7a6ddbfebecc60046faccd863a3baae6f1a6c9a9240a0af67289642c57e621fcb0860287700781d294268177ceca61b335d1fd5031f38b0f99cc85a
-  data.tar.gz: 2badf8ea2cd2ce5b1c7258e9733b870a45a261c89ebe37e3868dac90d93c9b2dd45a16e41d269c5f52bcee399e6f4a48efa4a4cef8c82e39e9c9c520daab226c
+  metadata.gz: cc54fdd7737b8262ff72ca363ec5b34a42e256f20cb7bbf00a964b6cc9eaf0dd2af907c20a2996cb3648d53c03c199efe7e3d29e24b4c499093d945bf6add28f
+  data.tar.gz: e4bb9fbbac32e6cfb39585d5e473f41f242f526728071584130398a8af47edd4cf7ad95a59072c120434413ff25097ae0366d0e2738567957a7f1ebd942f33c4

data/lib/cloudstack-cli/base.rb

@@ -36,16 +36,6 @@ module CloudstackCli
       true
     end
 
-    # fix for subcommand help issues
-    # see https://github.com/erikhuda/thor/issues/261
-    # def self.banner(command, namespace = nil, subcommand = false)
-    #   "#{basename} #{subcommand_prefix} #{command.usage}"
-    # end
-    #
-    # def self.subcommand_prefix
-    #   self.name.gsub(%r{.*::}, '').gsub(%r{^[A-Z]}) { |match| match[0].downcase }.gsub(%r{[A-Z]}) { |match| "-#{match[0].downcase}" }
-    # end
-
     no_commands do
       def client
         @config ||= load_configuration
@@ -82,7 +72,7 @@ module CloudstackCli
 
         unless config.key?(:url) && config.key?(:api_key) && config.key?(:secret_key)
           say "The environment #{env || '\'-\''} contains no valid data.", :red
-          say "Please check with 'cs environment list' and set a valid default environment."
+          say "Please check with 'cloudstack-cli environment list' and set a valid default environment."
           exit 1
         end
         config
@@ -95,7 +85,7 @@ module CloudstackCli
       def parse_file(file, extensions = %w(.json .yaml .yml))
         handler = case File.extname(file)
         when ".json"
-          Object.const_get "JSON"
+          Object.const_get "MultiJson"
         when ".yaml", ".yml"
           Object.const_get "YAML"
         else

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

@@ -8,7 +8,7 @@ class Account < CloudstackCli::Base
 
   desc "show NAME", "show detailed infos about an account"
   def show(name)
-    unless account = client.list_accounts(name: name).first
+    unless account = client.list_accounts(name: name, listall: true).first
       say "No account named \"#{name}\" found.", :red
     else
       account.delete 'user'

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

@@ -18,7 +18,7 @@ class Stack < CloudstackCli::Base
             status: 1
           }
         else
-          options = {
+          options.merge!({
             name: name,
             displayname: instance["decription"],
             zone: instance["zone"] || stack["zone"],
@@ -32,8 +32,8 @@ class Stack < CloudstackCli::Base
             group: instance["group"] || stack["group"],
             keypair: instance["keypair"] || stack["keypair"],
             ip_address: instance["ip_address"],
-            sync: true
-          }
+          })
+          
           jobs << {
             id: client.deploy_virtual_machine(
               vm_options_to_params,

data/lib/cloudstack-cli/option_resolver.rb

@@ -7,7 +7,7 @@ module CloudstackCli
       resolve_compute_offering
       resolve_template
       resolve_disk_offering
-      resolve_iso_for_vm_deployment
+      resolve_iso_for_vm_deployment if options[:iso]
       options[:size] = options[:disk_size] if options[:disk_size]
       unless options[:template_id]
         say "Error: Template or ISO is required.", :red

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/test/stack_example.json

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

data/test/stack_example.yml

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-07 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake