knife-cloudstack 0.0.14 → 0.0.15

data/lib/chef/knife/cs_server_list.rb

@@ -85,7 +85,9 @@ module KnifeCloudstack
 
       output_format(connection_result)
 
-      rules = connection.list_port_forwarding_rules
+      rules = connection.list_port_forwarding_rules(nil, true)
+      public_list = connection.list_public_ip_addresses(true)
+
 
       connection_result.each do |r|
         name = r['name']
@@ -98,7 +100,7 @@ module KnifeCloudstack
           locate_config_value(:fields).downcase.split(',').each { |n| object_list << ((r[("#{n}").strip]).to_s || 'N/A') }
         else
           object_list << r['name']
-          object_list << (connection.get_server_public_ip(r, rules) || '')
+          r['nic'].empty? ? object_list << "N/A" : object_list << (connection.get_server_public_ip(r, rules, public_list) || '')
           object_list << r['serviceofferingname']
           object_list << r['templatename']
           object_list << r['state']

data/lib/chef/knife/cs_stack_create.rb

@@ -16,11 +16,17 @@
 # limitations under the License.
 #
 
+require 'chef/knife/cs_base'
+require 'chef/knife/cs_baselist'
+
 module KnifeCloudstack
   class CsStackCreate < Chef::Knife
 
     attr_accessor :current_stack
 
+    include Chef::Knife::KnifeCloudstackBase
+    include Chef::Knife::KnifeCloudstackBaseList
+
     deps do
       require 'chef/json_compat'
       require 'chef/mash'
@@ -29,7 +35,6 @@ module KnifeCloudstack
       require 'net/ssh'
       require 'net/ssh/multi'
       require 'knife-cloudstack/connection'
-      require 'chef/knife'
       Chef::Knife.load_deps
       Chef::Knife::Ssh.load_deps
       Chef::Knife::NodeRunListRemove.load_deps
@@ -38,24 +43,6 @@ module KnifeCloudstack
 
     banner "knife cs stack create JSON_FILE (options)"
 
-    option :cloudstack_url,
-           :short => "-U URL",
-           :long => "--cloudstack-url URL",
-           :description => "The CloudStack endpoint URL",
-           :proc => Proc.new { |url| Chef::Config[:knife][:cloudstack_url] = url }
-
-    option :cloudstack_api_key,
-           :short => "-A KEY",
-           :long => "--cloudstack-api-key KEY",
-           :description => "Your CloudStack API key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_api_key] = key }
-
-    option :cloudstack_secret_key,
-           :short => "-K SECRET",
-           :long => "--cloudstack-secret-key SECRET",
-           :description => "Your CloudStack secret key",
-           :proc => Proc.new { |key| Chef::Config[:knife][:cloudstack_secret_key] = key }
-
     option :ssh_user,
            :short => "-x USERNAME",
            :long => "--ssh-user USERNAME",
@@ -72,6 +59,8 @@ module KnifeCloudstack
            :description => "The SSH identity file used for authentication"
 
     def run
+      validate_base_options
+
       file_path = File.expand_path(@name_args.first)
       unless File.exist?(file_path) then
         ui.error "Stack file '#{file_path}' not found. Please check the path."
@@ -81,25 +70,12 @@ module KnifeCloudstack
       data = File.read file_path
       stack = Chef::JSONCompat.from_json data
       create_stack stack
-
-      #puts "Stack: #{stack.inspect}"
-    end
-
-    def connection
-      if (!@connection) then
-        url = locate_config_value(:cloudstack_url)
-        api_key = locate_config_value(:cloudstack_api_key)
-        secret_key = locate_config_value(:cloudstack_secret_key)
-        @connection = CloudstackClient::Connection.new(url, api_key, secret_key)
-      end
-      @connection
     end
 
     def create_stack(stack)
       @current_stack = Mash.new(stack)
       current_stack[:servers].each do |server|
         if server[:name]
-
           # create server(s)
           names = server[:name].split(/[\s,]+/)
           names.each do |n|
@@ -120,16 +96,21 @@ module KnifeCloudstack
     def create_server(server)
 
       cmd = KnifeCloudstack::CsServerCreate.new([server[:name]])
-
       # configure and run command
       # TODO: validate parameters
       cmd.config[:ssh_user] = config[:ssh_user]
       cmd.config[:ssh_password] = config[:ssh_password]
-      cmd.config[:ssh_port] = Chef::Config[:knife][:ssh_port] || config[:ssh_port]
+      cmd.config[:ssh_port] = config[:ssh_port] || "22" # Chef::Config[:knife][:ssh_port]
       cmd.config[:identity_file] = config[:identity_file]
       cmd.config[:cloudstack_template] = server[:template] if server[:template]
       cmd.config[:cloudstack_service] = server[:service] if server[:service]
-      cmd.config[:cloudstack_zone] = server[:service] if server[:zone]
+      cmd.config[:cloudstack_zone] = server[:zone] if server[:zone]
+      server.has_key?(:public_ip) ? cmd.config[:public_ip] = server[:public_ip] : cmd.config[:no_public_ip] = true
+      cmd.config[:bootstrap] = server[:bootstrap] if server.has_key?(:bootstrap) 
+      cmd.config[:bootstrap_protocol] = server[:bootstrap_protocol] || "ssh"  
+      cmd.config[:distro] = server[:distro] || "chef-full"  
+      cmd.config[:template_file] = server[:template_file] if server.has_key?(:template_file)  
+      cmd.config[:no_host_key_verify] = server[:no_host_key_verify] if server.has_key?(:no_host_key_verify)  
       cmd.config[:cloudstack_networks] = server[:networks].split(/[\s,]+/) if server[:networks]
       cmd.config[:run_list] = server[:run_list].split(/[\s,]+/) if server[:run_list]
       cmd.config[:port_rules] = server[:port_rules].split(/[\s,]+/) if server[:port_rules]
@@ -139,7 +120,6 @@ module KnifeCloudstack
       end
 
       cmd.run_with_pretty_exceptions
-
     end
 
     def run_actions(actions)
@@ -171,7 +151,7 @@ module KnifeCloudstack
         query = "(#{query})" + " AND chef_environment:#{get_environment}"
       end
 
-      Chef::Chef::Log.debug("Searching for nodes: #{query}")
+      Chef::Log.debug("Searching for nodes: #{query}")
 
       q = Chef::Search::Query.new
       nodes = Array(q.search(:node, query))
@@ -315,11 +295,5 @@ module KnifeCloudstack
         puts hosts.join("\n")
       end
     end
-
-    def locate_config_value(key)
-      key = key.to_sym
-      Chef::Config[:knife][key] || config[key]
-    end
-
   end
 end

data/lib/chef/knife/cs_template_list.rb

@@ -78,7 +78,7 @@ module KnifeCloudstack
         locate_config_value(:listall),
         nil,
         nil,
-        locate_config_value(:templatefilter)
+        params = { 'templatefilter' => locate_config_value(:templatefilter) }
       )
 
       output_format(connection_result)

data/lib/chef/knife/cs_volume_create.rb

@@ -0,0 +1,108 @@
+#
+# Author:: Jeremy Baumont (<jbaumont@schubergphilis.com>)
+# Copyright:: Copyright (c) Schuberg Philis 2013 
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require 'chef/knife/cs_base'
+
+module KnifeCloudstack
+    class CsVolumeCreate < Chef::Knife
+
+	include Chef::Knife::KnifeCloudstackBase
+
+	deps do
+	    require 'knife-cloudstack/connection'
+	    Chef::Knife.load_deps
+	end
+
+	banner "knife cs volume create NAME (options)"
+
+	option :name,
+	    :long => "--name NAME",
+	    :description => "The name of the disk volume.",
+	    :required => true,
+	    :on => :head
+
+	option :account,
+	    :long => "--account ACCOUNT_NAME",
+	    :description => "The account associated with the disk volume. Must be used with the domainId parameter."
+
+	option :diskofferingid,
+	    :long => "--diskofferingid ID",
+	    :description => "The ID of the disk offering. Either diskOfferingId or snapshotId must be passed in."
+
+	option :domainid,
+	    :long => "--domainid ID",
+	    :description => "The domain ID associated with the disk offering. If used with the account parameter returns the disk volume associated with the account for the specified domain."
+
+	option :size,
+	    :long => "--size SIZE",
+	    :description => "Arbitrary volume size."
+
+	option :snapshotid,
+	    :long => "--snapshotid ID",
+	    :description => "The snapshot ID for the disk volume. Either diskOfferingId or snapshotId must be passed in."
+
+	option :zoneid,
+	    :long => "--zoneid ID",
+	    :description => "The ID of the availability zone.",
+	    :required => true,
+	    :on => :head
+
+
+	def run
+	    validate_base_options
+
+	    Chef::Log.debug("Validate hostname and options")
+	    if  locate_config_value(:name)
+		volumename = locate_config_value(:name)
+	    else
+		volumename = @name_args.first
+		unless /^[a-zA-Z0-9][a-zA-Z0-9_\-#]*$/.match volumename then
+		    ui.error "Invalid volumename. Please specify a simple name without any spaces"
+		    exit 1
+		end
+	    end
+
+	    print "#{ui.color("Creating volume: #{volumename}", :magenta)}\n"
+
+	    params = {
+		'command' => 'createVolume',
+		'name' => volumename,
+	    }
+
+	    params['account'] = locate_config_value(:account) if locate_config_value(:account)
+	    params['diskofferingid'] = locate_config_value(:diskofferingid) if locate_config_value(:diskofferingid)
+	    params['domainid'] = locate_config_value(:domainid) if locate_config_value(:domainid)
+	    params['projectid'] = locate_config_value(:projectid) if locate_config_value(:projectid)
+	    params['size'] = locate_config_value(:size) if locate_config_value(:size)
+	    params['snapshotid'] = locate_config_value(:snapshotid) if locate_config_value(:snapshotid)
+	    params['zoneid'] = locate_config_value(:zoneid) if locate_config_value(:zoneid)
+
+	    json = connection.send_request(params)
+
+	    if ! json then
+		ui.error("Unable to create volume")
+		exit 1
+	    end
+
+	    print "Volume #{json['id']} is being created in the background\n";
+
+	    return json['id']
+	end
+
+    end # class
+end

data/lib/knife-cloudstack/connection.rb

@@ -3,6 +3,7 @@
 # Author:: KC Braunschweig (<kcbraunschweig@gmail.com>)
 # Author:: Sander Botman (<sbotman@schubergphilis.com>)
 # Author:: Frank Breedijk (<fbreedijk@schubergphilis.com>)
+# Author:: Sander van Harmelen (<svanharmelen@schubergphilis.com>)
 # Copyright:: Copyright (c) 2011 Edmunds, Inc.
 # License:: Apache License, Version 2.0
 #
@@ -27,7 +28,24 @@ require 'cgi'
 require 'net/http'
 require 'json'
 require 'highline/import'
-require 'knife-cloudstack/string_to_regexp'
+
+class String
+  def to_regexp
+    return nil unless self.strip.match(/\A\/(.*)\/(.*)\Z/mx)
+    regexp , flags = $1 , $2
+    return nil if !regexp || flags =~ /[^xim]/m
+
+    x = /x/.match(flags) && Regexp::EXTENDED
+    i = /i/.match(flags) && Regexp::IGNORECASE
+    m = /m/.match(flags) && Regexp::MULTILINE
+
+    Regexp.new regexp , [x,i,m].inject(0){|a,f| f ? a+f : a }
+  end
+
+  def is_uuid?
+    self.strip =~ /^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$/ ? true : false
+  end
+end
 
 module CloudstackClient
   class Connection
@@ -35,23 +53,26 @@ module CloudstackClient
     ASYNC_POLL_INTERVAL = 5.0
     ASYNC_TIMEOUT = 600
 
-    def initialize(api_url, api_key, secret_key, project_name=nil, use_ssl=true)
+    def initialize(api_url, api_key, secret_key, project_name=nil, no_ssl_verify=false, api_proxy=nil)
       @api_url = api_url
       @api_key = api_key
       @secret_key = secret_key
-      @project_id = nil
-      @use_ssl = use_ssl
-      if project_name
-        project = get_project(project_name)
-        if !project then
-          puts "Project #{project_name} does not exist"
-          exit 1
-        end
-        @project_id = project['id']
-      end
-
+      @no_ssl_verify = no_ssl_verify
+      @project_id = get_project_id(project_name) if project_name || nil
+      @api_proxy = api_proxy
     end
 
+    ##
+    # Get project id
+    def get_project_id(name)
+      project = get_project(name)
+      if !project then
+        puts "Project #{project_name} does not exist"
+        exit 1
+      end
+      project['id']
+    end
+  
     ##
     # Finds the server with the specified name.
 
@@ -76,16 +97,23 @@ module CloudstackClient
     ##
     # Finds the public ip for a server
 
-    def get_server_public_ip(server, cached_rules=nil)
+    def get_server_public_ip(server, cached_rules=nil, cached_nat=nil)
       return nil unless server
       # find the public ip
       nic = get_server_default_nic(server)
+
       ssh_rule = get_ssh_port_forwarding_rule(server, cached_rules)
-      if ssh_rule
-        return ssh_rule['ipaddress']
-      end
+      return ssh_rule['ipaddress'] if ssh_rule
+
+      winrm_rule = get_winrm_port_forwarding_rule(server, cached_rules)
+      return winrm_rule['ipaddress'] if winrm_rule 
+
       #check for static NAT
-      ip_addr = list_public_ip_addresses.find {|v| v['virtualmachineid'] == server['id']}
+      if cached_nat
+        ip_addr = cached_nat.find {|v| v['virtualmachineid'] == server['id']}
+      else
+        ip_addr = list_public_ip_addresses.find {|v| v['virtualmachineid'] == server['id']}
+      end
       if ip_addr
         return ip_addr['ipaddress']
       end
@@ -116,23 +144,15 @@ module CloudstackClient
       end
     end
 
-    ## 
+    ##
     # List all the objects based on the command that is specified.
-    
-    def list_object(command, json_result, filter=nil, listall=nil, keyword=nil, name=nil, templatefilter=nil)
-      params = {
-          'command' => command
-      }
+
+    def list_object(command, json_result, filter=nil, listall=nil, keyword=nil, name=nil, params={})
+      params['command'] = command
       params['listall'] = true if listall || name || keyword unless listall == false
       params['keyword'] = keyword if keyword
       params['name'] = name if name
 
-      if templatefilter
-        template = 'featured'
-        template = templatefilter.downcase if ["featured","self","self-executable","executable","community"].include?(templatefilter.downcase)
-        params['templateFilter'] = template
-      end
-
       json = send_request(params)
       Chef::Log.debug("JSON (list_object) result: #{json}")
 
@@ -155,7 +175,7 @@ module CloudstackClient
     ##
     # Deploys a new server using the specified parameters.
 
-    def create_server(host_name, service_name, template_name, zone_name=nil, network_names=[], extra_params)
+    def create_server(host_name, service_name, template_name, disk_name=nil, zone_name=nil, network_names=[], extra_params)
 
       if host_name then
         if get_server(host_name) then
@@ -170,12 +190,20 @@ module CloudstackClient
         exit 1
       end
 
-      template = get_template(template_name)
+      template = get_template(template_name, zone_name)
       if !template then
         puts "Error: Template '#{template_name}' is invalid"
         exit 1
       end
 
+      if disk_name then
+        disk = get_disk_offering(disk_name)
+        if !disk then
+          puts "Error: Disk offering '#{disk_name}' is invalid"
+          exit 1
+        end
+      end
+
       zone = zone_name ? get_zone(zone_name) : get_default_zone
       if !zone then
         msg = zone_name ? "Zone '#{zone_name}' is invalid" : "No default zone found"
@@ -183,37 +211,56 @@ module CloudstackClient
         exit 1
       end
 
-      networks = []
-      network_names.each do |name|
-        network = get_network(name)
-        if !network then
-          puts "Error: Network '#{name}' not found"
+      if zone['networktype'] != 'Basic' then
+      # If this is a Basic zone no networkids are needed in the params
+
+        networks = []
+        if network_names.nil? then
+          networks << get_default_network(zone['id'])
+        else
+          network_names.each do |name|
+            network = get_network(name)
+            if !network then
+              puts "Error: Network '#{name}' not found"
+            end
+            networks << get_network(name)
+          end
+        end
+
+        if networks.empty? then
+          networks << get_default_network(zone['id'])
+        end
+        if networks.empty? then
+          puts "No default network found"
           exit 1
         end
-        networks << get_network(name)
-      end
-      if networks.empty? then
-        networks << get_default_network(zone['id'])
-      end
-      if networks.empty? then
-        puts "No default network found"
-        exit 1
-      end
-      network_ids = networks.map { |network|
-        network['id']
-      }
+        network_ids = networks.map { |network|
+          network['id']
+        }
+
+        params = {
+            'command' => 'deployVirtualMachine',
+            'serviceOfferingId' => service['id'],
+            'templateId' => template['id'],
+            'zoneId' => zone['id'],
+            'networkids' => network_ids.join(',')
+        }
+
+      elsif
+
+        params = {
+            'command' => 'deployVirtualMachine',
+            'serviceOfferingId' => service['id'],
+            'templateId' => template['id'],
+            'zoneId' => zone['id']
+        }
 
-      params = {
-          'command' => 'deployVirtualMachine',
-          'serviceOfferingId' => service['id'],
-          'templateId' => template['id'],
-          'zoneId' => zone['id'],
-          'networkids' => network_ids.join(',')
-      }
+      end
 
       params.merge!(extra_params) if extra_params
 
       params['name'] = host_name if host_name
+      params['diskOfferingId'] = disk['id'] if disk
 
       json = send_async_request(params)
       json['virtualmachine']
@@ -318,11 +365,12 @@ module CloudstackClient
       return nil unless services
 
       services.each { |s|
-        if s['name'] == name then
-          return s
+        if name.is_uuid? then
+          return s if s['id'] == name
+        else
+          return s if s['name'] == name
         end
       }
-
       nil
     end
 
@@ -337,32 +385,63 @@ module CloudstackClient
       json['serviceoffering'] || []
     end
 
+    def list_security_groups
+      params = {
+          'command' => 'listSecurityGroups'
+      }
+      json = send_request(params)
+      json['securitygroups'] || []
+    end
+
+
     ##
     # Finds the template with the specified name.
 
-    def get_template(name)
+    def get_template(name, zone_name=nil)
 
       # TODO: use name parameter
       # listTemplates 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.
+
+      zone = zone_name ? get_zone(zone_name) : get_default_zone
+
       params = {
           'command' => 'listTemplates',
-          'templateFilter' => 'executable'
+          'templateFilter' => 'executable',
       }
+      params['zoneid'] = zone['id'] if zone
+
       json = send_request(params)
 
       templates = json['template']
-      if !templates then
-        return nil
-      end
+      return nil unless templates
 
       templates.each { |t|
-        if t['name'] == name then
-          return t
+        if name.is_uuid? then
+          return t if t['id'] == name
+        else
+          return t if t['name'] == name
         end
       }
+      nil
+    end
+
+    ##
+    # Finds the disk offering with the specified name.
+
+    def get_disk_offering(name)
+      params = {
+          'command' => 'listDiskOfferings',
+      }
+      json = send_request(params)
+      disks = json['diskoffering']
+
+      return nil if !disks
 
+      disks.each { |d|
+        return d if d['name'] == name
+      }
       nil
     end
 
@@ -397,12 +476,14 @@ module CloudstackClient
       json = send_request(params)
       projects = json['project']
       return nil unless projects
+
       projects.each { |n|
-        if n['name'] == name then
-          return n
+        if name.is_uuid? then
+          return n if n['id'] == name
+        else
+          return n if n['name'] == name
         end
       }
-
       nil
     end
 
@@ -436,11 +517,12 @@ module CloudstackClient
       return nil unless networks
 
       networks.each { |n|
-        if n['name'] == name then
-          return n
+        if name.is_uuid? then
+          return n if n['id'] == name
+        else
+          return n if n['name'] == name
         end
       }
-
       nil
     end
 
@@ -496,11 +578,12 @@ module CloudstackClient
       return nil unless networks
 
       networks.each { |z|
-        if z['name'] == name then
-          return z
+        if name.is_uuid? then
+          return z if z['id'] == name
+        else
+          return z if z['name'] == name
         end
       }
-
       nil
     end
 
@@ -516,7 +599,8 @@ module CloudstackClient
 
       zones = json['zone']
       return nil unless zones
-
+      # zones.sort! # sort zones so we always return the same zone
+      # !this gives error in our production environment so need to retest this
       zones.first
     end
 
@@ -545,8 +629,9 @@ module CloudstackClient
       json['publicipaddress'].first
     end
 
-    def list_public_ip_addresses()
-      params = { 'command' => 'listPublicIpAddresses'}
+    def list_public_ip_addresses(listall=false)
+      params = { 'command' => 'listPublicIpAddresses' } 
+      params['listall'] = listall
 
       json = send_request(params)
       return json['publicipaddress'] || []
@@ -560,13 +645,13 @@ module CloudstackClient
           'zoneId' => zone_id
       }
       #Choose the first network from the list
-      if networks.size > 0
-        params['networkId'] = get_network(networks.first)['id']
-      else
+      if networks.nil? || networks.empty?
         default_network = get_default_network(zone_id)
         params['networkId'] = default_network['id']
+      else
+        params['networkId'] = get_network(networks.first)['id']
       end
-      print "params: #{params}"
+      Chef::Log.debug("associate ip params: #{params}")
       json = send_async_request(params)
       json['ipaddress']
     end
@@ -600,15 +685,26 @@ module CloudstackClient
       send_async_request(params)
     end
 
-    def create_firewall_rule(ipaddress_id, protocol, start_port, end_port, cidr_list)
-      params = {
-        'command' => 'createFirewallRule',
-        'ipaddressId' => ipaddress_id,
-        'protocol' => protocol,
-        'startport' =>  start_port,
-        'endport' => end_port,
-        'cidrlist' => cidr_list
-      }
+    def create_firewall_rule(ipaddress_id, protocol, param3, param4, cidr_list)
+      if protocol == "ICMP"
+        params = {
+          'command' => 'createFirewallRule',
+          'ipaddressId' => ipaddress_id,
+          'protocol' => protocol,
+          'icmptype' =>  param3,
+          'icmpcode' => param4,
+          'cidrlist' => cidr_list
+        }
+      else
+        params = {
+          'command' => 'createFirewallRule',
+          'ipaddressId' => ipaddress_id,
+          'protocol' => protocol,
+          'startport' =>  param3,
+          'endport' => param4,
+          'cidrlist' => cidr_list
+        }
+      end
       send_async_request(params)
     end
 
@@ -629,11 +725,10 @@ module CloudstackClient
     ##
     # Lists all port forwarding rules.
 
-    def list_port_forwarding_rules(ip_address_id=nil)
-      params = {
-          'command' => 'listPortForwardingRules'
-      }
+    def list_port_forwarding_rules(ip_address_id=nil, listall=false)
+      params = { 'command' => 'listPortForwardingRules' }
       params['ipAddressId'] = ip_address_id if ip_address_id
+      params['listall'] = listall
       json = send_request(params)
       json['portforwardingrule']
     end
@@ -649,6 +744,20 @@ module CloudstackClient
             r['publicport'] == '22'
       }.first
     end
+ 
+    ## 
+    # Gets the WINRM port forwarding rule for the specified server.
+
+    def get_winrm_port_forwarding_rule(server, cached_rules=nil)
+      rules = cached_rules || list_port_forwarding_rules || []
+      rules.find_all { |r|
+        r['virtualmachineid'] == server['id'] &&
+           (r['privateport'] == '5985' &&
+            r['publicport'] == '5985') ||
+           (r['privateport'] == '5986' &&
+            r['publicport'] == '5986')
+      }.first
+    end
 
     ##
     # Creates a port forwarding rule.
@@ -666,6 +775,25 @@ module CloudstackClient
       json['portforwardingrule']
     end
 
+    def http_client_builder
+      http_proxy = proxy_uri
+      if http_proxy.nil?
+        Net::HTTP
+      else
+        Chef::Log.debug("Using #{http_proxy.host}:#{http_proxy.port} for proxy")
+        user = http_proxy.user if http_proxy.user
+        pass = http_proxy.password if http_proxy.password
+        Net::HTTP.Proxy(http_proxy.host, http_proxy.port, user, pass)
+      end
+    end
+
+    def proxy_uri
+      return nil if @api_proxy.nil?
+      result = URI.parse(@api_proxy)
+      return result unless result.host.nil? || result.host.empty?
+      nil
+    end
+
     ##
     # Sends a synchronous request to the CloudStack API and returns the response as a Hash.
     #
@@ -688,20 +816,34 @@ module CloudstackClient
       signature = Base64.encode64(signature).chomp
       signature = CGI.escape(signature)
 
+      if @api_url.nil? || @api_url.empty?
+        puts "Error: Please specify a valid API URL."
+        exit 1
+      end
+
       url = "#{@api_url}?#{data}&signature=#{signature}"
       Chef::Log.debug("URL: #{url}")
       uri = URI.parse(url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = @use_ssl
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+
+      http = http_client_builder.new(uri.host, uri.port)
+ 
+      if uri.scheme == "https"
+        http.use_ssl = true
+        # Still need to do some testing on SSL, so will fix this later
+        if @no_ssl_verify
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
+        else
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE 
+        end
+      end 
       request = Net::HTTP::Get.new(uri.request_uri)
       response = http.request(request)
 
       if !response.is_a?(Net::HTTPOK) then
         case response.code
         when "432"
-          puts "\n" 
-          puts "Error #{response.code}: Your account does not have the right to execute this command or the command does not exist."
+          puts "\n"
+          puts "Error #{response.code}: Your account does not have the right to execute this command is locked or the command does not exist."
         else
           puts "Error #{response.code}: #{response.message}"
           puts JSON.pretty_generate(JSON.parse(response.body))
@@ -736,6 +878,7 @@ module CloudstackClient
         print "."
 
         if status == 1 then
+          print "\n"
           return json['jobresult']
         elsif status == 2 then
           print "\n"