cloudstack-cli 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9ccb77e0ffb661b126a24d49267c01e7ee5d8475
-  data.tar.gz: f148f87197bafa1c1e627ff73311b9e1a04feb2b
+  metadata.gz: 6b75da05246b3ab3ac85f5ca8e93a28db01f8968
+  data.tar.gz: fc2d98e9c509876350509db6da5b5e7ab3b900b2
 SHA512:
-  metadata.gz: f3f6c49400185cc0f198a1a9f3e7ca33d82eded1102bbfaeaf3290e107c25ba282db5eca0d11f4242a7590b3017256c0be46b646d0ee6d69aed8708fb96ff2bd
-  data.tar.gz: 3fbdeac646beb0d2e50219e50a2874f9d482ccc3a0380f45c09548933021da6a27ab06b6d95da37771e1c3e65ccb1cebbdbe1b59c39f41a05aecb119717bbee5
+  metadata.gz: 573c55dfed55ed68409424ef04562a9cd0dca835d23a458ce031c3f5fc0653fc87326f05cfd45c18e76ccbdb409dba6a90a1a5098f4c779ff81065514d50c804
+  data.tar.gz: 22dd3887d463b7b3e08792b1396ec08002ba65bf1a94d9bec2090f72776a64a6b03630cd4dc6c5dd363281d195550cceb991e1677c11b2bf6fe02935c2e6a982

data/Gemfile.lock

@@ -1,12 +1,12 @@
 PATH
   remote: ../cloudstack_client/
   specs:
-    cloudstack_client (1.4.0)
+    cloudstack_client (1.4.1)
 
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.5.2)
+    cloudstack-cli (1.5.3)
       cloudstack_client (~> 1.4)
       thor (~> 0.19)
 
@@ -25,4 +25,4 @@ DEPENDENCIES
   rake (~> 11.1)
 
 BUNDLED WITH
-   1.11.2
+   1.12.0

data/README.md

@@ -121,24 +121,23 @@ CloudStack CLI does support stack files in YAML or JSON.
   group: "my_web_stack"
   keypair: "mykeypair"
   servers:
-    -
-      name: "web-d1, web-d2"
-      description: "Web nodes"
+    - name: "web-d1, web-d2"
+      description: "web node"
       template: "CentOS-7-x64"
       offering: "1cpu_1gb"
       networks: "server_network"
       port_rules: ":80, :443"
-    -
-      name: "db-01"
+    - name: "db-01"
       description: "PostgreSQL Master"
       iso: "CentOS-7-x64"
       disk_offering: "Perf Storage"
       disk_size: "5"
       offering: "2cpu_4gb"
-      ip_address: 10.100.1.25
-      networks:
-        - "server_network"
-        - "storage_network"
+      ip_network_list:
+        - name: FrontendNetwork
+          ip: 10.101.64.42
+        - name: BackendNetwork
+          ip: 10.102.1.11
 ```
 
 *Create the stack of servers from the definition above:
@@ -163,15 +162,16 @@ Completed: 2/3 (15.4s)
 ### Example: Sort computing offerings
 
 *Sort all computing offerings by CPU and Memory grouped by domain:*
+(root admin privileges needed)
 
 ```bash
-$ cloudstack-cli offering sort
+$ cloudstack-cli compute_offer sort
 ```
 
 ### Example: Stop all backup routers of a given project
 
 *Stop all virtual routers of project named Demo (you could filter by zone too):*
-(This command is helpful if you have to deploy new versions of CloudStack when using redundant routers)
+(this command is helpful if you have to deploy new major release of CloudStack when using redundant routers)
 
 ```bash
 $ cloudstack-cli router list --project Demo --status running --redundant-state BACKUP --command STOP

data/lib/cloudstack-cli/base.rb

@@ -72,7 +72,7 @@ module CloudstackCli
         end
 
         unless config.key?(:url) && config.key?(:api_key) && config.key?(:secret_key)
-          say "The environment #{env || '\'-\''} contains no valid data.", :red
+          say "The environment #{env || '\'-\''} does not contain all required keys.", :red
           say "Please check with 'cloudstack-cli environment list' and set a valid default environment."
           exit 1
         end
@@ -134,5 +134,6 @@ module CloudstackCli
         end
       end
     end
-  end
-end
+    
+  end # class
+end # module

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

@@ -63,15 +63,12 @@ class VirtualMachine < CloudstackCli::Base
   option :project
   def show(name)
     resolve_project
-    options[:name] = name
-    unless virtual_machine = client.list_virtual_machines({list_all: true}.merge options).first
-      puts "No virtual machine found."
-    else
-      table = virtual_machine.map do |key, value|
-        [ set_color("#{key}:", :yellow), "#{value}" ]
-      end
-      print_table table
+    options[:virtual_machine] = name
+    virtual_machine = resolve_virtual_machine(true)
+    table = virtual_machine.map do |key, value|
+      [ set_color("#{key}:", :yellow), "#{value}" ]
     end
+    print_table table
   end
 
   desc "create NAME [NAME2 ...]", "create virtual machine(s)"
@@ -149,14 +146,13 @@ class VirtualMachine < CloudstackCli::Base
       say "Please provide at least one virtual machine name.", :yellow
       exit 1
     end
-
     resolve_project
     names.each do |name|
-      unless virtual_machine = client.list_virtual_machines(options.merge(name: name, listall: true)).first
+      unless virtual_machine = find_vm_by_name(name)
         say "Virtual machine #{name} not found.", :red
       else
         action = options[:expunge] ? "Expunge" : "Destroy"
-        ask = "#{action} #{name} (#{virtual_machine['state']})? [y/N]:"
+        ask = "#{action} #{virtual_machine['name']} (#{virtual_machine['state']})? [y/N]:"
         if options[:force] || yes?(ask, :yellow)
           say "destroying #{name} "
           client.destroy_virtual_machine(
@@ -179,13 +175,12 @@ class VirtualMachine < CloudstackCli::Base
   option :force
   def stop(name)
     resolve_project
-    options[:name] = name
-    options[:listall] = true
-    exit unless options[:force] || yes?("Stop virtual machine #{name}? [y/N]:", :magenta)
-    unless virtual_machine = client.list_virtual_machines(options).first
+    unless virtual_machine = find_vm_by_name(name)
       say "Virtual machine #{name} not found.", :red
       exit 1
     end
+    exit unless options[:force] ||
+      yes?("Stop virtual machine #{virtual_machine['name']}? [y/N]:", :magenta)
     client.stop_virtual_machine(id: virtual_machine['id'])
     puts
   end
@@ -194,13 +189,11 @@ class VirtualMachine < CloudstackCli::Base
   option :project
   def start(name)
     resolve_project
-    options[:name] = name
-    options[:listall] = true
-    unless virtual_machine = client.list_virtual_machines(options).first
+    unless virtual_machine = find_vm_by_name(name)
       say "Virtual machine #{name} not found.", :red
       exit 1
     end
-    say("Starting virtual machine #{name}", :magenta)
+    say("Starting virtual machine #{virtual_machine['name']}", :magenta)
     client.start_virtual_machine(id: virtual_machine['id'])
     puts
   end
@@ -210,13 +203,11 @@ class VirtualMachine < CloudstackCli::Base
   option :force
   def reboot(name)
     resolve_project
-    options[:name] = name
-    options[:listall] = true
-    unless virtual_machine = client.list_virtual_machines(options).first
+    unless virtual_machine = find_vm_by_name(name)
       say "Virtual machine #{name} not found.", :red
       exit 1
     end
-    exit unless options[:force] || yes?("Reboot virtual_machine #{name}? [y/N]:", :magenta)
+    exit unless options[:force] || yes?("Reboot virtual_machine #{virtual_machine["name"]}? [y/N]:", :magenta)
     client.reboot_virtual_machine(id: virtual_machine['id'])
     puts
   end
@@ -248,30 +239,22 @@ class VirtualMachine < CloudstackCli::Base
     desc: "optional binary data that can be sent to the virtual machine upon a successful deployment."
   def update(name)
     resolve_project
-
-    unless vm = client.list_virtual_machines(
-      name: name, project_id: options[:project_id], listall: true
-      ).first
+    unless vm = find_vm_by_name(name)
       say "Virtual machine #{name} not found.", :red
       exit 1
     end
-
     unless vm["state"].downcase == "stopped"
       say "Virtual machine #{name} (#{vm["state"]}) must be in a stopped state.", :red
       exit 1
     end
-
     unless options[:force] || yes?("Update virtual_machine #{name}? [y/N]:", :magenta)
       exit
     end
-
     if options[:user_data]
       # base64 encode user_data
       options[:user_data] = [options[:user_data]].pack("m")
     end
-
     vm = client.update_virtual_machine(options.merge(id: vm['id']))
-
     say "Virtual machine \"#{name}\" has been updated:", :green
 
     table = vm.select do |k, _|
@@ -284,6 +267,14 @@ class VirtualMachine < CloudstackCli::Base
 
   no_commands do
 
+    def find_vm_by_name(name)
+      client.list_virtual_machines(
+        name: options[:virtual_machine],
+        listall: true,
+        project_id: options[:project_id]
+      ).find {|vm| vm["name"] == name }
+    end
+
     def print_virtual_machines(virtual_machines)
       case options[:format].to_sym
       when :yaml

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

@@ -113,7 +113,7 @@ class Volume < CloudstackCli::Base
 
   desc "attach NAME", "attach volume to VM"
   option :project, desc: 'project of volume'
-  option :virtual_machine, desc: 'virtual machine of volume'
+  option :virtual_machine, desc: 'virtual machine of volume', required: true
   def attach(name)
     resolve_project
     resolve_virtual_machine
@@ -142,6 +142,7 @@ class Volume < CloudstackCli::Base
 
   desc "detach NAME", "detach volume from VM"
   option :project, desc: 'project of volume'
+  option :force
   def detach(name)
     resolve_project
 
@@ -158,7 +159,8 @@ class Volume < CloudstackCli::Base
       say "Error: Volume #{name} currently not attached to any VM.", :red
       exit 1
     end
-
+    exit unless options[:force] ||
+      yes?("Detach volume #{name} from virtual_machine #{volume["vmname"]}? [y/N]:", :magenta)
     say "Detach volume #{name} from VM #{volume["vmname"]} "
     client.detach_volume id: volume['id']
     say " OK.", :green

data/lib/cloudstack-cli/helper.rb

@@ -232,7 +232,7 @@ module CloudstackCli
       print_options(server_offerings)
       service_offering = ask_number("Offering Nr.: ")
 
-      templates = client.list_templates(project_id: project_id, zone_id: zones[zone]["id"], template_filter: "all")
+      templates = client.list_templates(project_id: project_id, zone_id: zones[zone]["id"], template_filter: "executable")
       say "Select a template:", :yellow
       print_options(templates)
       template = ask_number("Template Nr.: ")

data/lib/cloudstack-cli/option_resolver.rb

@@ -195,15 +195,22 @@ module CloudstackCli
       options
     end
 
-    def resolve_virtual_machine
+    def resolve_virtual_machine(return_vm = false)
       if options[:virtual_machine]
-        args = { name: options[:virtual_machine], listall: true }
-        args[:project_id] = options[:project_id]
-        unless vm = client.list_virtual_machines(args).first
+        unless vm = client.list_virtual_machines(
+          name: options[:virtual_machine],
+          listall: true,
+          project_id: options[:project_id]
+        ).find {|vm| vm["name"] == options[:virtual_machine] }
           say "Error: VM '#{options[:virtual_machine]}' not found.", :red
           exit 1
         end
-        options[:virtual_machine_id] = vm['id']
+
+        if return_vm
+          return vm
+        else
+          options[:virtual_machine_id] = vm["id"]
+        end
       end
       options
     end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "1.5.2"
+  VERSION = "1.5.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-27 00:00:00.000000000 Z
+date: 2016-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake