cloudstack-cli 0.1.5 → 0.1.6

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.1.4)
+    cloudstack-cli (0.1.5)
       net-ssh (~> 2.6.7)
       thor (~> 0.18.1)
 

data/lib/cloudstack-cli/base.rb

@@ -9,6 +9,11 @@ module CloudstackCli
       exit!
     }
 
+    # exit with return code 1 in case of a error
+    def self.exit_on_failure?
+      true
+    end
+
     no_commands do  
       def client
         @config ||= CloudstackClient::ConnectionHelper.load_configuration(options[:config])
@@ -29,7 +34,7 @@ module CloudstackCli
       end
 
       def filter_by(objects, tag_name, tag)
-        objects.select {|r| r[tag_name].downcase == tag }
+        objects.select {|r| r[tag_name].downcase == tag.downcase }
       end
     end
   end

data/lib/cloudstack-cli/cli.rb

@@ -65,6 +65,9 @@ module CloudstackCli
     desc "offering SUBCOMMAND ...ARGS", "Manage offerings"
     subcommand "offering", Offering
 
+    desc "disk_offering SUBCOMMAND ...ARGS", "Manage disk offerings"
+    subcommand "disk_offering", DiskOffering
+
     desc "network SUBCOMMAND ...ARGS", "Manage networks"
     subcommand "network", Network
 
@@ -74,9 +77,12 @@ module CloudstackCli
     desc "load_balancer SUBCOMMAND ...ARGS", "Manage load balancing rules"
     subcommand "load_balancer", LoadBalancer
 
-    desc "template SUBCOMMAND ...ARGS", "Manage template"
+    desc "template SUBCOMMAND ...ARGS", "Manage templates"
     subcommand "template", Template
 
+    desc "iso SUBCOMMAND ...ARGS", "Manage iso's"
+    subcommand "iso", Iso
+
     desc "router SUBCOMMAND ...ARGS", "Manage virtual routers"
     subcommand "router", Router
 

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

@@ -0,0 +1,22 @@
+class DiskOffering < CloudstackCli::Base
+
+  desc 'list', 'list disk offerings'
+  option :domain
+  def list
+    offerings = client.list_disk_offerings(options[:domain])
+    if offerings.size < 1
+      puts "No offerings found"
+    else
+      table = [["Name", "Displaytext", "Domain", "ID"]]
+      offerings.each do |offering|
+        table << [
+          offering["name"],
+          offering["displaytext"],
+          offering["domain"],
+          offering["id"]
+        ]
+      end
+      print_table table
+    end
+  end
+end

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

@@ -0,0 +1,30 @@
+class Iso < CloudstackCli::Base
+
+  desc 'list [TYPE]', "list iso's by type [featured|self|self-executable|executable|community]"
+  option :project
+  option :zone
+  option :account
+  def list(type='featured')
+    project = find_project if options[:project]
+    unless %w(featured self self-executable executable community).include? type
+      say "unsupported iso type '#{type}'", :red
+      exit 1
+    end
+    zone = client.get_zone(options[:zone]) if options[:zone]
+    isos = client.list_isos(
+      type: type,
+      project_id: project ? project['id'] : nil,
+      zone_id: zone ? zone['id'] : nil
+    )
+    if isos.size < 1
+      puts "No iso's found"
+    else
+      table = [["Name", "Zone", "Bootable"]]
+      isos.each do |iso|
+        table <<  [iso['name'], iso['zonename'], iso['bootable']]
+      end
+      print_table(table)
+    end
+  end
+
+end

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

@@ -5,10 +5,31 @@ class Network < CloudstackCli::Base
     # TODO
   end
 
+  desc "default", "get the default network"
+  option :zone
+  def default
+    network = client.get_default_network(options[:zone])
+    unless network
+      puts "No default network found."
+    else
+      table = [["Name", "Displaytext", "Domain", "Zone"]]
+      table[0] << "ID" if options[:showid]
+        table << [
+          network["name"],
+          network["displaytext"],
+          network["domain"],
+          network["zonename"]
+        ]
+        table[-1] << network["id"] if options[:showid]
+      print_table table
+    end
+  end
+
   desc "list", "list networks"
   option :project
   option :account
   option :showid, type: :boolean
+  option :isdefault, type: :boolean
   def list
     project = find_project if options[:project]
     networks = []
@@ -17,13 +38,13 @@ class Network < CloudstackCli::Base
     elsif options[:account]
       networks = client.list_networks(account: options[:account])
     else
-      networks = client.list_networks(project_id: -1)
+      networks = client.list_networks(project_id: -1, isdefault: options[:isdefault])
     end
 
     if networks.size < 1
-      puts "No networks found"
+      puts "No networks found."
     else
-      table = [["Name", "Displaytext", "Account", "Project", "Domain", "State"]]
+      table = [["Name", "Displaytext", "Account", "Project", "Domain", "State", "Type"]]
       table[0] << "ID" if options[:showid]
       networks.each do |network|
         table << [
@@ -32,7 +53,8 @@ class Network < CloudstackCli::Base
           network["account"],
           network["project"],
           network["domain"],
-          network["state"]
+          network["state"],
+          network["type"]
         ]
         table[-1] << network["id"] if options[:showid]
       end
@@ -40,4 +62,16 @@ class Network < CloudstackCli::Base
     end
   end
 
+  desc "delete NAME", "delete network"
+  def delete(name)
+    network = client.get_network(name, -1)
+    unless network
+      say "Network #{name} not found."
+      exit 1
+    end
+    if yes? "Destroy network #{network['name']} - #{network['name']}?"
+      p client.delete_network(network['id'])
+    end
+  end
+
 end

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

@@ -1,18 +1,9 @@
 class Offering < CloudstackCli::Base
 
-  desc 'list', 'list offerings by type [compute|network|storage]'
+  desc 'list', 'list compute offerings'
   option :domain
-  def list(type='compute')
+  def list
     offerings = client.list_service_offerings(options[:domain])
-
-    offerings.group_by{|o| o["domain"]}.each_value do |offers|
-      offers.sort {
-        |oa, ob| [oa["cpunumber"], oa["memory"]] <=> [ob["cpunumber"], ob["memory"]]
-      }.each do |offer|
-        puts "#{offer['domain']} - #{offer["displaytext"]}"
-      end
-    end
-
     if offerings.size < 1
       puts "No offerings found"
     else

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

@@ -34,14 +34,15 @@ class Server < CloudstackCli::Base
 
   desc "create NAME", "create a server"
   option :zone, required: true
-  option :template, required: true
+  option :template, required: true, desc: "name of template or iso"
   option :offering, required: true
   option :networks, type: :array, required: true
   option :project
   option :port_rules, type: :array,
     default: [],
     desc: "Port Forwarding Rules [public_ip]:port ..."
-  option :interactive, type: :boolean
+  option :disk_offering
+  option :hypervisor, desc: "only used for iso deployments, defaults to vmware"
   def create(name)
     if project = find_project
       project_id = project["id"]
@@ -51,14 +52,15 @@ class Server < CloudstackCli::Base
       say "Create server #{name}...", :yellow
       server = client.create_server(
        name, options[:offering], options[:template],
-       options[:zone], options[:networks], options[:project]
+       options[:zone], options[:networks], options[:project],
+       options[:disk_offering], options[:hypervisor]
       )
       puts
       say "Server #{name} has been created.", :green
       client.wait_for_server_state(server["id"], "Running")
       say "Server #{name} is running.", :green
     else
-      say "Server #{name} already exists.", :green
+      say "Server #{name} already exists.", :yellow
       # TODO: check status of server
     end
 

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

@@ -1,20 +1,26 @@
 class Template < CloudstackCli::Base
 
-  desc 'list', 'list templates by type [featured|self|self-executable|executable|community]' 
+  desc 'list [TYPE]', 'list templates by type [featured|self|self-executable|executable|community]' 
   option :project
+  option :zone
   def list(type='featured')
     project = find_project if options[:project]
     unless %w(featured self self-executable executable community).include? type
       say "unsupported template type '#{type}'", :red
       exit 1
     end
-    templates = client.list_templates(type: type, project_id: project ? project['id'] : nil)
+    zone = client.get_zone(options[:zone]) if options[:zone]
+    templates = client.list_templates(
+      type: type,
+      project_id: project ? project['id'] : nil,
+      zone_id: zone ? zone['id'] : nil
+    )
     if templates.size < 1
       puts "No templates found"
     else
-      table = [["Name", "Zone"]]
+      table = [["Name", "Zone", "Format"]]
       templates.each do |template|
-        table <<  [template['name'], template['zonename']]
+        table <<  [template['name'], template['zonename'], template['format']]
       end
       print_table(table)
     end

data/lib/cloudstack-cli/helper.rb

@@ -28,7 +28,7 @@ module CloudstackCli
         client.wait_for_server_state(server["id"], "Running")
         say "Server #{server["name"]} is running.", :green
       else
-        say "Server #{name} already exists.", :green
+        say "Server #{name} already exists.", :yellow
       end
 
       if pf_rules && pf_rules.size > 0

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/lib/cloudstack-client/client.rb

@@ -143,7 +143,8 @@ module CloudstackClient
     ##
     # Deploys a new server using the specified parameters.
 
-    def create_server(host_name, service_name, template_name, zone_name=nil, network_names=[], project_name=nil)
+    def create_server(host_name, service_name, template_name, zone_name=nil,
+      network_names=[], project_name=nil, disk_offering=nil, hypervisor=nil)
       if host_name then
         if get_server(host_name) then
           puts "Error: Server '#{host_name}' already exists."
@@ -159,8 +160,11 @@ module CloudstackClient
 
       template = get_template(template_name)
       if !template then
-        puts "Error: Template '#{template_name}' is invalid"
-        exit 1
+        template = get_iso(template_name)
+        if !template then
+          puts "Error: Template '#{template_name}' is invalid"
+          exit 1
+        end
       end
 
       zone = zone_name ? get_zone(zone_name) : get_default_zone
@@ -199,6 +203,16 @@ module CloudstackClient
         network['id']
       }
 
+      if disk_offering
+        disk_offering = get_disk_offering(disk_offering)
+        unless disk_offering
+          msg = zone_name ? "Zone '#{zone_name}' is invalid" : "No default zone found"
+          puts "Error: #{msg}"
+          exit 1
+        end
+
+      end
+
       params = {
           'command' => 'deployVirtualMachine',
           'serviceOfferingId' => service['id'],
@@ -208,6 +222,8 @@ module CloudstackClient
       }
       params['name'] = host_name if host_name
       params['projectid'] = project['id'] if project_name
+      params['diskofferingid'] = disk_offering['id'] if disk_offering
+      params['hypervisor'] = hypervisor || 'vmware' if disk_offering
 
       json = send_async_request(params)
       json['virtualmachine']
@@ -310,7 +326,6 @@ module CloudstackClient
           return s
         end
       }
-
       nil
     end
 
@@ -380,6 +395,47 @@ module CloudstackClient
       json['serviceoffering']
     end
 
+    ##
+    # Lists all available disk offerings.
+
+    def list_disk_offerings(domain = nil)
+      params = {
+          'command' => 'listDiskOfferings'
+      }
+
+      if domain
+        params['domainid'] = list_domains(domain).first["id"]
+      end
+
+      json = send_request(params)
+      json['diskoffering'] || []
+    end
+
+    ##
+    # Get disk offering by name.
+
+    def get_disk_offering(name)
+
+      # TODO: use name parameter
+      # listServiceOfferings in CloudStack 2.2 doesn't seem to work
+      # when the name parameter is specified. When this is fixed,
+      # the name parameter should be added to the request.
+      params = {
+          'command' => 'listDiskOfferings'
+      }
+      json = send_request(params)
+
+      services = json['diskoffering']
+      return nil unless services
+
+      services.each { |s|
+        if s['name'] == name then
+          return s
+        end
+      }
+      nil
+    end
+
     ##
     # Finds the template with the specified name.
 
@@ -433,6 +489,59 @@ module CloudstackClient
       json['template'] || []
     end
 
+    ##
+    # Lists all isos that match the specified filter.
+    #
+    # Allowable filter values are:
+    #
+    # * featured - isos that are featured and are public
+    # * self - isos that have been registered/created by the owner
+    # * self-executable - isos that have been registered/created by the owner that can be used to deploy a new VM
+    # * executable - all isos that can be used to deploy a new VM
+    # * community - isos that are public
+
+    def list_isos(args = {})
+      filter = args[:filter] || 'featured'
+      params = {
+          'command' => 'listIsos',
+          'templateFilter' => filter
+      }
+      params['projectid'] = args[:project_id] if args[:project_id]
+      params['zoneid'] = args[:zone_id] if args[:zone_id]
+      
+      json = send_request(params)
+      json['iso'] || []
+    end
+
+    ##
+    # Finds the template with the specified name.
+
+    def get_iso(name)
+
+      # TODO: use name parameter
+      # listIsos in CloudStack 2.2 doesn't seem to work
+      # when the name parameter is specified. When this is fixed,
+      # the name parameter should be added to the request.
+      params = {
+          'command' => 'listIsos',
+          'templateFilter' => 'executable'
+      }
+      json = send_request(params)
+
+      isos = json['iso']
+      if !isos then
+        return nil
+      end
+
+      isos.each { |t|
+        if t['name'] == name then
+          return t
+        end
+      }
+
+      nil
+    end
+
     ##
     # Finds the network with the specified name.
 
@@ -458,27 +567,26 @@ module CloudstackClient
     ##
     # Finds the default network.
 
-    def get_default_network
+    def get_default_network(zone = nil)
       params = {
           'command' => 'listNetworks',
           'isDefault' => true
       }
+      if zone
+        params['zoneid'] = get_zone(zone)['id']
+      end
       json = send_request(params)
 
       networks = json['network']
       return nil if !networks || networks.empty?
-
-      default = networks.first
-      return default if networks.length == 1
+      return networks.first if networks.length == 1
 
       networks.each { |n|
         if n['type'] == 'Direct' then
-          default = n
-          break
+          return n
         end
       }
-
-      default
+      nil
     end
 
     ##
@@ -491,6 +599,7 @@ module CloudstackClient
       }
       params['projectid'] = args[:project_id] if args[:project_id]
       params['zoneid'] = args[:zone_id] if args[:zone_id]
+      params['isDefault'] = true if args[:isdefault]
       if args[:account]
         domain = list_accounts(name: args[:account])
         if domain.size > 0
@@ -504,6 +613,18 @@ module CloudstackClient
       json['network'] || []
     end
 
+    ##
+    # Delete network.
+
+    def delete_network(id)
+      params = {
+        'command' => 'deleteNetwork',
+        'id' => id,
+      }
+      p json = send_async_request(params)
+      json['network']
+    end
+
     ##
     # Lists all physical networks.
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -95,8 +95,10 @@ files:
 - lib/cloudstack-cli/cli.rb
 - lib/cloudstack-cli/commands/account.rb
 - lib/cloudstack-cli/commands/capacity.rb
+- lib/cloudstack-cli/commands/disk_offering.rb
 - lib/cloudstack-cli/commands/domain.rb
 - lib/cloudstack-cli/commands/ip_address.rb
+- lib/cloudstack-cli/commands/iso.rb
 - lib/cloudstack-cli/commands/load_balancer.rb
 - lib/cloudstack-cli/commands/network.rb
 - lib/cloudstack-cli/commands/offering.rb