cloudstack-cli 0.15.1 → 1.0.0.rc1

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

@@ -8,7 +8,9 @@ class Volume < CloudstackCli::Base
   option :name, desc: 'name of the disk volume'
   option :type, desc: 'type of disk volume (ROOT or DATADISK)'
   def list
-    options[:project_id] = find_project['id'] if options[:project]
+    resolve_project
+    resolve_account
+    resolve_zone
     volumes = client.list_volumes(options)
     if volumes.size < 1
       say "No volumes found."
@@ -33,8 +35,9 @@ class Volume < CloudstackCli::Base
   desc "show NAME", "show volume details"
   option :project, desc: 'project of volume'
   def show(name)
+    resolve_project
+    options[:listall] = true
     options[:name] = name
-    options[:project_id] = find_project['id'] if options[:project]
     volumes = client.list_volumes(options)
     if volumes.size < 1
       say "No volume with name \"#{name}\" found."
@@ -47,5 +50,117 @@ class Volume < CloudstackCli::Base
     end
   end
 
+  desc "create NAME", "create volume"
+  option :project,
+    desc: "project of volume"
+  option :disk_offering,
+    desc: "disk offering for the disk volume. Either disk_offering or snapshot must be passed in"
+  option :snapshot,
+    desc: "snapshot for the disk volume. Either disk_offering or snapshot must be passed in"
+  option :virtual_machine,
+    desc: "Used together with the snapshot option: VM to which the volume gets attached after creation."
+  option :zone,
+    desc: "name of the availability zone"
+  option :size,
+    desc: "size of the volume in GB"
+  def create(name)
+    options[:name] = name
+    resolve_project
+    resolve_zone
+    resolve_disk_offering
+    resolve_snapshot
+    resolve_virtual_machine
+
+    if !options[:disk_offering_id] && !options[:snapshot_id]
+      say "Either disk_offering or snapshot must be passed in.", :yellow
+      exit 1
+    elsif options[:disk_offering_id] && !options[:zone_id]
+      say "Zone is required when deploying with disk-offering.", :yellow
+      exit 1
+    end
+
+    say "Creating volume #{name} "
+    client.create_volume(options)
+    say " OK.", :green
+    sleep 2
+    invoke "volume:show", [name], options
+  end
+
+  desc "attach NAME", "attach volume to VM"
+  option :project, desc: 'project of volume'
+  option :virtual_machine, desc: 'project of volume'
+  def attach(name)
+    resolve_project
+    resolve_virtual_machine
+
+    volume = client.list_volumes(
+      name: name,
+      listall: true,
+      project_id: options[:project_id]
+    ).first
+
+    if !volume
+      say "Error: Volume #{name} not found.", :red
+      exit 1
+    elsif volume.has_key?("virtualmachineid")
+      say "Error: Volume #{name} already attached to VM #{volume["vmname"]}.", :red
+      exit 1
+    end
+
+    say "Attach volume #{name} to VM #{options[:virtual_machine]} "
+    client.attach_volume(
+      id: volume['id'],
+      virtualmachine_id: options[:virtual_machine_id]
+    )
+    say " OK.", :green
+  end
+
+  desc "detach NAME", "attach volume to VM"
+  option :project, desc: 'project of volume'
+  def detach(name)
+    resolve_project
+
+    volume = client.list_volumes(
+      name: name,
+      listall: true,
+      project_id: options[:project_id]
+    ).first
+
+    if !volume
+      say "Error: Volume #{name} not found.", :red
+      exit 1
+    elsif !volume.has_key?("virtualmachineid")
+      say "Error: Volume #{name} currently not attached to any VM.", :red
+      exit 1
+    end
+
+    say "Detach volume #{name} from VM #{volume["vmname"]} "
+    client.detach_volume id: volume['id']
+    say " OK.", :green
+  end
+
+  desc "delete NAME", "attach volume to VM"
+  option :project, desc: 'project of volume'
+  def delete(name)
+    resolve_project
+
+    volume = client.list_volumes(
+      name: name,
+      listall: true,
+      project_id: options[:project_id]
+    ).first
+
+    if !volume
+      say "Error: Volume #{name} not found.", :red
+      exit 1
+    elsif volume.has_key?("virtualmachineid")
+      say "Error: Volume #{name} must be detached before deletion.", :red
+      exit 1
+    end
+
+    say "Delete volume #{name} "
+    client.delete_volume id: volume['id']
+    say " OK.", :green
+  end
 
 end

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

@@ -6,12 +6,16 @@ class Zone < CloudstackCli::Base
     if zones.size < 1
       puts "No projects found"
     else
-      table = [%w(Name Description)]
+      table = [%w(Name Network-Type Description)]
       zones.each do |zone|
-        table << [zone['name'] ,zone['description']]
+        table << [
+          zone['name'],
+          zone['networktype'],
+          zone['description']
+        ]
       end
     end
     print_table(table)
   end
 
-end
+end

data/lib/cloudstack-cli/helper.rb

@@ -47,7 +47,7 @@ module CloudstackCli
     def update_job_status(jobs)
       jobs.each do |job|
         unless job[:status] && job[:status] > 0
-          job[:status] = client.query_job(job[:id])['jobstatus']
+          job[:status] = client.query_async_job_result(job_id: job[:id])['jobstatus']
         end
       end
       jobs
@@ -68,19 +68,25 @@ module CloudstackCli
     end
 
     def bootstrap_server(args = {})
-      if args[:project] && project = client(quiet: true).get_project(args[:project])
+      if args[:project] && project = find_project(args[:project])
         project_id = project["id"]
         project_name = project['name']
       end
-      server = client(quiet: true).get_server(args[:name], project_id)
-      unless server
-        say "Create server #{args[:name]}...", :yellow
-        server = client.create_server(args)
-        say "Server #{server["name"]} has been created.", :green
-        client.wait_for_server_state(server["id"], "Running")
-        say "Server #{server["name"]} is running.", :green
+
+      if args[:name]
+        args['displayname'] = args[:name]
+        name = args[:name]
+      elsif args[:displayname]
+        name = args[:displayname]
+      end
+
+      unless server = client.list_virtual_machines(name: args[:name], project_id: project_id).first
+        say "Create VM #{name}...", :yellow
+        server = client.deploy_virtual_machine(args)
+        puts
+        say "VM #{name} has been created.", :green
       else
-        say "Server #{args[:name]} already exists (#{server['state']}).", :yellow
+        say "VM #{name} already exists (#{server["state"]}).", :yellow
       end
 
       if args[:port_rules] && args[:port_rules].size > 0
@@ -90,13 +96,12 @@ module CloudstackCli
     end
 
     def create_server(args = {})
-      if args[:project] && project = client(quiet: true).get_project(args[:project])
+      if args[:project] && project = find_project(args[:project])
         project_id = project["id"]
         project_name = project['name']
       end
-      server = client(quiet: true).get_server(args[:name], project_id)
-      unless server
-        server = client.create_server(args)
+      unless server = client.list_virtual_machines(name: args[:name], project_id: project_id)
+        server = client.deploy_virtual_machine(args)
       end
       server
     end
@@ -105,7 +110,7 @@ module CloudstackCli
       frontendip = nil
       jobs = []
       client.verbose = async
-      project_id = server['project'] ? client.get_project(server['project'])['id'] : nil
+      project_id = server['projectid'] || nil
       port_rules.each do |pf_rule|
         ip = pf_rule.split(":")[0]
         if ip != ''
@@ -116,20 +121,23 @@ module CloudstackCli
           end
         else
           ip_addr = frontendip ||= client.associate_ip_address(
-            server["nic"].first["networkid"]
+            network_id: server["nic"].first["networkid"]
           )
         end
         port = pf_rule.split(":")[1]
+        args = {
+          ipaddressid: ip_addr["id"],
+          publicport: port,
+          privateport: port,
+          protocol: 'TCP',
+          virtualmachineid: server["id"]
+        }
         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"])
+          client.create_port_forwarding_rule(args)
           return
         else
-          jobs << client.create_port_forwarding_rule(
-            ip_addr["id"],
-            port, 'TCP', port, server["id"],
-            false
-          )['jobid']
+          jobs << client.create_port_forwarding_rule(args, {sync: true})['jobid']
         end
       end
       jobs
@@ -146,16 +154,17 @@ module CloudstackCli
       end
 
       projects = client.list_projects
-      if yes?("Do you want to deploy your server within a project?") && projects.size > 0
-        if projects.size > 0
+      project_id = nil
+      if projects.size > 0
+        if yes?("Do you want to deploy your VM within a project? (y/N)") && projects.size > 0
           say "Select a project", :yellow
           print_options(projects)
           project = ask_number("Project Nr.: ")
+          project_id = projects[project]['id'] rescue nil
         end
-        project_id = projects[project]['id'] rescue nil
       end
 
-      say "Please provide a name for the new server", :yellow
+      say "Please provide a name for the new VM", :yellow
       say "(spaces or special characters are NOT allowed)"
       server_name = ask("Server name: ")
 
@@ -164,7 +173,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"])
+      templates = client.list_templates(project_id: project_id, zone_id: zones[zone]["id"], template_filter: "all")
       say "Select a template:", :yellow
       print_options(templates)
       template = ask_number("Template Nr.: ")
@@ -180,24 +189,76 @@ module CloudstackCli
 
       say "You entered the following configuration:", :yellow
       table =  [["Zone", zones[zone]["name"]]]
-      table << ["Server Name", server_name]
+      table << ["VM Name", server_name]
       table << ["Template", templates[template]["name"]]
       table << ["Offering", server_offerings[service_offering]["name"]]
       table << ["Network", networks[network]["name"]]
       table << ["Project", projects[project]["name"]] if project
       print_table table
 
-      if yes? "Do you want to deploy this server?"
+      if yes? "Do you want to deploy this VM? (y/N)"
         bootstrap_server(
-          server_name,
-          zones[zone]["name"],
-          templates[template]["name"],
-          server_offerings[service_offering]["name"],
-          [networks[network]["name"]], nil,
-          project ? projects[project]["name"] : nil
+          name: server_name,
+          zone_id: zones[zone]["id"],
+          template_id: templates[template]["id"],
+          serviceoffering_id: server_offerings[service_offering]["id"],
+          network_ids: network ? networks[network]["id"] : nil,
+          project_id: project_id
         )
       end
     end
 
+    ##
+    # Finds the public ip for a server
+
+    def get_server_public_ip(server, cached_rules=nil)
+      return nil unless server
+
+      # find the public ip
+      nic = get_server_default_nic(server) || {}
+      if nic['type'] == 'Virtual'
+        ssh_rule = get_ssh_port_forwarding_rule(server, cached_rules)
+        ssh_rule ? ssh_rule['ipaddress'] : nil
+      else
+        nic['ipaddress']
+      end
+    end
+
+    ##
+    # Gets the SSH port forwarding rule for the specified server.
+
+    def get_ssh_port_forwarding_rule(server, cached_rules=nil)
+      rules = cached_rules || client.list_port_forwarding_rules(project_id: server["projectid"]) || []
+      rules.find_all { |r|
+        r['virtualmachineid'] == server['id'] &&
+            r['privateport'] == '22'&&
+            r['publicport'] == '22'
+      }.first
+    end
+
+    ##
+    # Returns the fully qualified domain name for a server.
+
+    def get_server_fqdn(server)
+      return nil unless server
+
+      nic = get_server_default_nic(server) || {}
+      networks = client.list_networks(project_id: server['projectid']) || {}
+
+      id = nic['networkid']
+      network = networks.select { |net|
+        net['id'] == id
+      }.first
+      return nil unless network
+
+      "#{server['name']}.#{network['networkdomain']}"
+    end
+
+    def get_server_default_nic(server)
+      server['nic'].each do |nic|
+        return nic if nic['isdefault']
+      end
+    end
+
   end
 end

data/lib/cloudstack-cli/option_resolver.rb

@@ -0,0 +1,176 @@
+module CloudstackCli
+  module OptionResolver
+
+    def vm_options_to_params(options = options)
+      resolve_zone(options)
+      resolve_project(options)
+      resolve_compute_offering(options)
+      resolve_template(options)
+      resolve_disk_offering(options)
+      resolve_iso(options)
+      unless options[:template_id]
+        say "Error: Template or ISO is required.", :red
+        exit 1
+      end
+      resolve_networks(options)
+    end
+
+    def resolve_zone(options = options)
+      if options[:zone]
+        zones = client.list_zones
+        zone = zones.find {|z| z['name'] == options[:zone] }
+        if !zone
+          msg = options[:zone] ? "Zone '#{options[:zone]}' is invalid." : "No zone found."
+          say "Error: #{msg}", :red
+          exit 1
+        end
+        options[:zone_id] = zone['id']
+      end
+      options
+    end
+
+    def resolve_domain(options = options)
+      if options[:domain]
+        if domain = client.list_domains(name: options[:domain]).first
+          options[:domain_id] = domain['id']
+        else
+          say "Error: Domain #{options[:domain]} not found.", :red
+          exit 1
+        end
+      end
+      options
+    end
+
+    def resolve_project(options = options)
+      if options[:project]
+        if %w(ALL -1).include? options[:project]
+          options[:project_id] = "-1"
+        elsif project = client.list_projects(name: options[:project], listall: true).first
+          options[:project_id] = project['id']
+        else
+          say "Error: Project #{options[:project]} not found.", :red
+          exit 1
+        end
+      end
+      options
+    end
+
+    def resolve_account(options = options)
+      if options[:account]
+        if account = client.list_accounts(name: options[:account], listall: true).first
+          options[:account_id] = account['id']
+          options[:domain_id] = account['domainid']
+        else
+          say "Error: Account #{options[:account]} not found.", :red
+          exit 1
+        end
+      end
+      options
+    end
+
+    def resolve_networks(options = options)
+      networks = []
+      if options[:networks]
+        options[:networks].each do |name|
+          network = client.list_networks(
+            name: name,
+            zone_id: options[:zone_id],
+            project_id: options[:project_id]
+          ).first
+          if !network
+            say "Error: Network '#{name}' not found.", :red
+            exit 1
+          end
+          networks << network
+        end
+      end
+      if networks.empty?
+        #unless default_network = client.list_networks(project_id: options[:project_id]).find {
+        #  |n| n['isdefault'] == true }
+        unless default_network = client.list_networks(project_id: options[:project_id]).first
+          say "Error: No default network found.", :red
+          exit 1
+        end
+        networks << default_network
+      end
+      options[:network_ids] = networks.map {|n| n['id']}.join(',')
+      options
+    end
+
+    def resolve_iso(options = options)
+      if options[:iso]
+        unless iso = client.list_isos(name: options[:iso]).first
+          say "Error: Iso '#{args[:iso]}' is invalid.", :red
+          exit 1
+        end
+        unless options[:diskoffering_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_template(options = options)
+      if options[:template]
+        if template = client.list_templates(name: options[:template], template_filter: "all").first
+          options[:template_id] = template['id']
+        else
+          say "Error: Template #{options[:template]} not found.", :red
+          exit 1
+        end
+      end
+      options
+    end
+
+    def resolve_compute_offering(options = options)
+      if offering = client.list_service_offerings(name: options[:offering]).first
+        options[:service_offering_id] = offering['id']
+      else
+        say "Error: Offering #{options[:offering]} not found.", :red
+        exit 1
+      end
+      options
+    end
+
+    def resolve_disk_offering(options = options)
+      if options[:disk_offering]
+        unless disk_offering = client.list_disk_offerings(name: options[:disk_offering]).first
+          say "Error: Disk offering '#{options[:disk_offering]}' not found.", :red
+          exit 1
+        end
+        options[:disk_offering_id] = disk_offering['id']
+      end
+      options
+    end
+
+    def resolve_virtual_machine(options = options)
+      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
+          say "Error: VM '#{options[:virtual_machine]}' not found.", :red
+          exit 1
+        end
+        options[:virtual_machine_id] = vm['id']
+      end
+      options
+    end
+
+    def resolve_snapshot(options = options)
+      if options[:snapshot]
+        args = { name: options[:snapshot], listall: true }
+        args[:project_id] = options[:project_id]
+        unless snapshot = client.list_snapshots(args).first
+          say "Error: Snapshot '#{options[:snapshot]}' not found.", :red
+          exit 1
+        end
+        options[:snapshot_id] = snapshot['id']
+      end
+      options
+    end
+
+  end
+end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.15.1"
+  VERSION = "1.0.0.rc1"
 end

data/lib/cloudstack-cli.rb

@@ -2,5 +2,6 @@ require "cloudstack_client"
 
 require "cloudstack-cli/version"
 require "cloudstack-cli/helper"
+require "cloudstack-cli/option_resolver"
 require "cloudstack-cli/base"
-require "cloudstack-cli/cli"
+require "cloudstack-cli/cli"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 1.0.0.rc1
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.0.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.7
+        version: 1.0.0.rc1
 description: cloudstack-cli is a CloudStack API command line client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
@@ -110,7 +110,6 @@ files:
 - 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
 - lib/cloudstack-cli/commands/ssh_key_pairs.rb
 - lib/cloudstack-cli/commands/stack.rb
@@ -118,13 +117,15 @@ files:
 - lib/cloudstack-cli/commands/system_vm.rb
 - lib/cloudstack-cli/commands/template.rb
 - lib/cloudstack-cli/commands/user.rb
+- lib/cloudstack-cli/commands/virtual_machine.rb
 - lib/cloudstack-cli/commands/volume.rb
 - lib/cloudstack-cli/commands/zone.rb
 - lib/cloudstack-cli/helper.rb
+- lib/cloudstack-cli/option_resolver.rb
 - lib/cloudstack-cli/version.rb
 - test/stack_example.json
 - test/stack_example.yml
-homepage: http://niwo.github.io/cloudstack-cli/
+homepage: http://github.com/niwo/cloudstack-cli
 licenses:
 - MIT
 metadata: {}
@@ -141,9 +142,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2