cloudstack-cli 1.2.7 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5fa2bfbc4a4dda7a046fc21a7798e8a38c8826e
-  data.tar.gz: 092f79211f64e0961f68bb8425341401620dafd7
+  metadata.gz: 25e8d7d5fa40b7654d1a450ba9cb59a8112118c3
+  data.tar.gz: c83a6b5bb3ec80bafda80854d4037c49ec244940
 SHA512:
-  metadata.gz: eeb1e3c478edb5bfd9e9e632983b849c33c55e9fc8eccd4b8d6078fd225477ec3f3179e809d6f941eca310a52a2d99426fa98a474bd34df5150f62675b04bb42
-  data.tar.gz: c9a1a1d52097bd8de88a30836f42cb81aa3610bc91726d7b8ddd9cfe6067f69ce9f1fc7b9dfcceb5c5a6e885427dcdd05a6e332dd034f6fe974dbec8910e1914
+  metadata.gz: 914e12b7c7a6ddbfebecc60046faccd863a3baae6f1a6c9a9240a0af67289642c57e621fcb0860287700781d294268177ceca61b335d1fd5031f38b0f99cc85a
+  data.tar.gz: 2badf8ea2cd2ce5b1c7258e9733b870a45a261c89ebe37e3868dac90d93c9b2dd45a16e41d269c5f52bcee399e6f4a48efa4a4cef8c82e39e9c9c520daab226c

data/Gemfile.lock

@@ -7,7 +7,7 @@ PATH
 PATH
   remote: .
   specs:
-    cloudstack-cli (1.2.7)
+    cloudstack-cli (1.3.0)
       cloudstack_client (~> 1.2)
       multi_json (~> 1.11)
       thor (~> 0.19)

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

@@ -1,10 +1,10 @@
 class Iso < CloudstackCli::Base
 
-  desc 'list', "list iso's"
-  option :project
-  option :zone
-  option :account
-  option :type,
+  desc 'list', "list ISO's"
+  option :project, desc: 'project name'
+  option :zone, desc: 'zone name'
+  option :account, desc: 'account name'
+  option :type, desc: 'type of ISO',
     enum: %w(featured self selfexecutable sharedexecutable executable community all)
   def list
     resolve_project
@@ -14,7 +14,7 @@ class Iso < CloudstackCli::Base
     options.delete :type
     isos = client.list_isos(options)
     if isos.size < 1
-      puts "No iso's found."
+      puts "No ISO's found."
     else
       table = [%w(Name Zone Bootable Public Featured)]
       isos.each do |iso|
@@ -27,13 +27,36 @@ class Iso < CloudstackCli::Base
         ]
       end
       print_table(table)
-      say "Total number of isos: #{isos.size}"
+      say "Total number of ISO's: #{isos.size}"
     end
   end
 
-  desc 'detach VM_ID', "detaches any ISO file (if any) currently attached to a virtual machine"
-  def detach(vm_id)
-    client.detach_iso({virtualmachine_id: vm_id}, {sync: true})
+  desc 'attach', "attaches an ISO to a virtual machine"
+  option :iso, desc: 'ISO file name'
+  option :project, desc: 'project name'
+  option :virtual_machine, desc: 'virtual machine name'
+  option :virtual_machine_id, desc: 'virtual machine id (if no virtual machine name profided)'
+  def attach
+    resolve_iso
+    resolve_project
+    unless options[:virtual_machine_id]
+     resolve_virtual_machine
+    end
+    options[:id] = options[:iso_id]
+    client.attach_iso(options.merge(sync: false))
+    say " OK", :green
+  end
+
+  desc 'detach', "detaches any ISO file (if any) currently attached to a virtual machine"
+  option :project, desc: 'project name'
+  option :virtual_machine, desc: 'virtual machine name'
+  option :virtual_machine_id, desc: 'virtual machine id (if no virtual machine name profided)'
+  def detach
+    resolve_project
+    unless options[:virtual_machine_id]
+      resolve_virtual_machine
+    end
+    client.detach_iso(options.merge(sync: true))
     say " OK", :green
   end
 

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

@@ -82,15 +82,25 @@ class Volume < CloudstackCli::Base
     end
 
     say "Creating volume #{name} "
-    client.create_volume(options)
+    job = client.create_volume(options).merge(sync: true)
     say " OK.", :green
-    sleep 2
-    invoke "volume:show", [name], options
+
+    # attach the new volume if a vm is profided and not a sapshot
+    if options[:virtual_machine] && options[:snapshot] == nil
+      sleep 2
+      say "Attach volume #{name} to VM #{options[:virtual_machine]} "
+      client.attach_volume(
+        id: job['volume']['id'],
+        virtualmachineid: options[:virtual_machine_id],
+        sync: true
+      )
+      say " OK.", :green
+    end
   end
 
   desc "attach NAME", "attach volume to VM"
   option :project, desc: 'project of volume'
-  option :virtual_machine, desc: 'project of volume'
+  option :virtual_machine, desc: 'virtual machine of volume'
   def attach(name)
     resolve_project
     resolve_virtual_machine
@@ -112,12 +122,12 @@ class Volume < CloudstackCli::Base
     say "Attach volume #{name} to VM #{options[:virtual_machine]} "
     client.attach_volume(
       id: volume['id'],
-      virtualmachine_id: options[:virtual_machine_id]
+      virtualmachineid: options[:virtual_machine_id]
     )
     say " OK.", :green
   end
 
-  desc "detach NAME", "attach volume to VM"
+  desc "detach NAME", "detach volume from VM"
   option :project, desc: 'project of volume'
   def detach(name)
     resolve_project
@@ -141,7 +151,7 @@ class Volume < CloudstackCli::Base
     say " OK.", :green
   end
 
-  desc "delete NAME", "attach volume to VM"
+  desc "delete NAME", "delete volume to VM"
   option :project, desc: 'project of volume'
   def delete(name)
     resolve_project

data/lib/cloudstack-cli/option_resolver.rb

@@ -7,7 +7,7 @@ module CloudstackCli
       resolve_compute_offering
       resolve_template
       resolve_disk_offering
-      resolve_iso
+      resolve_iso_for_vm_deployment
       options[:size] = options[:disk_size] if options[:disk_size]
       unless options[:template_id]
         say "Error: Template or ISO is required.", :red
@@ -109,20 +109,27 @@ module CloudstackCli
           ).first
           break if iso
         end
-        unless iso
+        if iso
+          options[:iso_id] = iso["id"]
+        else
           say "Error: Iso '#{options[:iso]}' is invalid.", :red
           exit 1
         end
-        unless options[:disk_offering_id]
-          say "Error: a disk offering is required when using iso.", :red
-          exit 1
-        end
-        options[:template_id] = iso['id']
-        options['hypervisor'] = (options[:hypervisor] || 'vmware')
       end
       options
     end
 
+    def resolve_iso_for_vm_deployment
+      unless options[:disk_offering_id]
+        say "Error: a disk offering is required when using iso.", :red
+        exit 1
+      end
+      resolve_iso
+      options[:template_id] = options[:iso_id]
+      options['hypervisor'] = (options[:hypervisor] || 'vmware')
+      options
+    end
+
     def resolve_template
       if options[:template]
         if template = client.list_templates(

data/lib/cloudstack-cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: cloudstack-cli CloudStack API client