knife-profitbricks 1.2.1 → 2.0.1

data/knife-profitbricks.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "profitbricks-sdk-ruby", "~> 3.0"
+  spec.add_runtime_dependency "profitbricks-sdk-ruby", "~> 4.0"
   spec.add_runtime_dependency "chef", "~> 12"
 
   spec.add_development_dependency "bundler", "~> 1.6"

data/lib/chef/knife/profitbricks_base.rb

@@ -1,4 +1,5 @@
 require 'chef/knife'
+require 'knife-profitbricks/version'
 
 class Chef
   class Knife
@@ -36,6 +37,8 @@ class Chef
           config.url = Chef::Config[:knife][:profitbricks_url]
           config.debug = Chef::Config[:knife][:profitbricks_debug] || false
           config.global_classes = false
+          config.headers = Hash.new
+          config.headers['User-Agent'] = "Chef/#{::Chef::VERSION} knife-profitbricks/#{::Knife::ProfitBricks::VERSION}"
         end
       end
 
@@ -44,6 +47,27 @@ class Chef
           puts "#{ui.color(label, color)}: #{value}"
         end
       end
+
+      def validate_required_params(required_params, params)
+        missing_params = required_params.select do |param|
+           params[param].nil?
+         end
+        def error_and_exit(message)
+          ui.error message
+          exit(1)
+        end
+      end
+
+      def get_image(image_name, image_type, image_location)
+        images = ProfitBricks::Image.list
+        min_image = nil
+        images.each do |image|
+          if image.properties['name'].downcase.include? image_name && image.properties['public'] == true && image.properties['imageType'] == image_type && image.properties['location'] == image_location
+            min_image = image
+          end
+        end
+        min_image
+      end
     end
   end
 end

data/lib/chef/knife/profitbricks_composite_server_create.rb

@@ -16,14 +16,12 @@ class Chef
       option :name,
              short: '-n NAME',
              long: '--name NAME',
-             description: 'Name of the server',
-             required: true
+             description: '(required) Name of the server'
 
       option :cores,
              short: '-C CORES',
              long: '--cores CORES',
-             description: 'The number of processor cores',
-             required: true
+             description: '(required) The number of processor cores'
 
       option :cpufamily,
              short: '-f CPU_FAMILY',
@@ -34,8 +32,7 @@ class Chef
       option :ram,
              short: '-r RAM',
              long: '--ram RAM',
-             description: 'The amount of RAM in MB',
-             required: true
+             description: '(required) The amount of RAM in MB'
 
       option :availabilityzone,
              short: '-a AVAILABILITY_ZONE',
@@ -50,8 +47,7 @@ class Chef
       option :size,
              short: '-S SIZE',
              long: '--size SIZE',
-             description: 'The size of the volume in GB',
-             required: true
+             description: '(required) The size of the volume in GB'
 
       option :bus,
              short: '-b BUS',
@@ -61,18 +57,21 @@ class Chef
       option :image,
              short: '-N ID',
              long: '--image ID',
-             description: 'The image or snapshot ID'
+             description: '(required) The image or snapshot ID'
+
+      option :imagealias,
+             long: '--image-alias IMAGE_ALIAS',
+             description: '(required) The image alias'
 
       option :type,
              short: '-t TYPE',
              long: '--type TYPE',
-             description: 'The disk type (HDD or SSD)',
-             required: true
+             description: '(required) The disk type (HDD or SSD)'
 
       option :licencetype,
              short: '-l LICENCE',
              long: '--licence-type LICENCE',
-             description: 'The licence type of the volume (LINUX, WINDOWS, UNKNOWN, OTHER)'
+             description: 'The licence type of the volume (LINUX, WINDOWS, WINDOWS2016, UNKNOWN, OTHER)'
 
       option :imagepassword,
              short: '-P PASSWORD',
@@ -82,8 +81,7 @@ class Chef
       option :volume_availability_zone,
              short: '-Z AVAILABILITY_ZONE',
              long: '--volume-availability-zone AVAILABILITY_ZONE',
-             description: 'The volume availability zone of the server',
-             required: false
+             description: 'The volume availability zone of the server'
 
       option :sshkeys,
              short: '-K SSHKEY[,SSHKEY,...]',
@@ -106,74 +104,90 @@ class Chef
              long: '--dhcp',
              boolean: true | false,
              default: true,
-             description: 'Set to false if you wish to disable DHCP'
+             description: '(required) Set to false if you wish to disable DHCP'
 
       option :lan,
              short: '-L ID',
              long: '--lan ID',
-             description: 'The LAN ID the NIC will reside on; if the LAN ID does not exist it will be created',
-             required: true
+             description: 'The LAN ID the NIC will reside on; if the LAN ID does not exist it will be created'
 
       option :nat,
              long: '--nat',
-             description: 'Set to enable NAT on the NIC',
-             required: false
+             description: 'Set to enable NAT on the NIC'
 
       def run
         $stdout.sync = true
 
-        print "#{ui.color('Creating composite server...', :magenta)}"
+        validate_required_params(%i[datacenter_id name cores ram size type dhcp lan], Chef::Config[:knife])
+
+        if !Chef::Config[:knife][:image] && !Chef::Config[:knife][:imagealias]
+          ui.error("Either '--image' or '--image-alias' parameter must be provided")
+          exit(1)
+        end
+
+        if !Chef::Config[:knife][:sshkeys] && !Chef::Config[:knife][:imagepassword]
+          ui.error("Either '--image-password' or '--ssh-keys' parameter must be provided")
+          exit(1)
+        end
+
+        print ui.color('Creating composite server...', :magenta).to_s
         volume_params = {
-          name: config[:volumename],
-          size: config[:size],
-          bus: config[:bus] || 'VIRTIO',
-          image: config[:image],
-          type: config[:type],
-          licenceType: config[:licencetype]
+          name: Chef::Config[:knife][:volumename],
+          size: Chef::Config[:knife][:size],
+          bus: Chef::Config[:knife][:bus] || 'VIRTIO',
+          image: Chef::Config[:knife][:image],
+          type: Chef::Config[:knife][:type],
+          licenceType: Chef::Config[:knife][:licencetype]
         }
 
-        if config[:sshkeys]
-          volume_params[:sshKeys] = config[:sshkeys]
+        if Chef::Config[:knife][:image]
+          volume_params['image'] = Chef::Config[:knife][:image]
         end
 
-        if config[:imagepassword]
-          volume_params[:imagePassword] = config[:imagepassword]
+        if Chef::Config[:knife][:imagealias]
+          volume_params['imageAlias'] = Chef::Config[:knife][:imagealias]
+        end
+
+        if Chef::Config[:knife][:sshkeys]
+          volume_params[:sshKeys] = Chef::Config[:knife][:sshkeys]
+        end
+
+        if Chef::Config[:knife][:imagepassword]
+          volume_params[:imagePassword] = Chef::Config[:knife][:imagepassword]
         end
 
         if config[:volume_availability_zone]
-          volume_params[:availabilityZone] = config[:volume_availability_zone]
+          volume_params[:availabilityZone] = Chef::Config[:knife][:volume_availability_zone]
         end
 
         nic_params = {
-          name: config[:nicname],
-          ips: config[:ips],
-          dhcp: config[:dhcp],
-          lan: config[:lan]
+          name: Chef::Config[:knife][:nicname],
+          ips: Chef::Config[:knife][:ips],
+          dhcp: Chef::Config[:knife][:dhcp],
+          lan: Chef::Config[:knife][:lan]
         }
 
-        if config[:nat]
-          nic_params[:nat] = config[:nat]
-        end
+        nic_params[:nat] = Chef::Config[:knife][:nat] if config[:nat]
 
         params = {
-          name: config[:name],
-          cores: config[:cores],
-          cpuFamily: config[:cpufamily],
-          ram: config[:ram],
-          availabilityZone: config[:availabilityzone],
+          name: Chef::Config[:knife][:name],
+          cores: Chef::Config[:knife][:cores],
+          cpuFamily: Chef::Config[:knife][:cpufamily],
+          ram: Chef::Config[:knife][:ram],
+          availabilityZone: Chef::Config[:knife][:availabilityzone],
           volumes: [volume_params],
           nics: [nic_params]
         }
 
         connection
+
         server = ProfitBricks::Server.create(
-          config[:datacenter_id],
+          Chef::Config[:knife][:datacenter_id],
           params.compact
         )
 
         dot = ui.color('.', :magenta)
         server.wait_for(300) { print dot; ready? }
-        server.reload
 
         puts "\n"
         puts "#{ui.color('ID', :cyan)}: #{server.id}"

data/lib/chef/knife/profitbricks_contract_list.rb

@@ -0,0 +1,37 @@
+require 'chef/knife/profitbricks_base'
+
+class Chef
+  class Knife
+    class ProfitbricksContractList < Knife
+      include Knife::ProfitbricksBase
+
+      banner 'knife profitbricks contract list'
+
+      def run
+        $stdout.sync = true
+        connection
+        contract = ProfitBricks::Contract.get
+
+        puts "#{ui.color('Contract Type', :cyan)}: #{contract.type}"
+        puts "#{ui.color('Contract Number', :cyan)}: #{contract.properties['contractNumber']}"
+        puts "#{ui.color('Status', :cyan)}: #{contract.properties['status']}"
+        puts "#{ui.color('Cores per server', :cyan)}: #{contract.properties['resourceLimits']['coresPerServer']}"
+        puts "#{ui.color('Cores per contract', :cyan)}: #{contract.properties['resourceLimits']['coresPerContract']}"
+        puts "#{ui.color('Cores provisioned', :cyan)}: #{contract.properties['resourceLimits']['coresProvisioned']}"
+        puts "#{ui.color('RAM per server', :cyan)}: #{contract.properties['resourceLimits']['ramPerServer']}"
+        puts "#{ui.color('RAM per contract', :cyan)}: #{contract.properties['resourceLimits']['ramPerContract']}"
+        puts "#{ui.color('RAM provisioned', :cyan)}: #{contract.properties['resourceLimits']['ramProvisioned']}"
+        puts "#{ui.color('HDD limit per volume', :cyan)}: #{contract.properties['resourceLimits']['hddLimitPerVolume']}"
+        puts "#{ui.color('HDD limit per contract', :cyan)}: #{contract.properties['resourceLimits']['hddLimitPerContract']}"
+        puts "#{ui.color('HDD volume provisioned', :cyan)}: #{contract.properties['resourceLimits']['hddVolumeProvisioned']}"
+        puts "#{ui.color('SSD limit per volume', :cyan)}: #{contract.properties['resourceLimits']['ssdLimitPerVolume']}"
+        puts "#{ui.color('SSD limit per contract', :cyan)}: #{contract.properties['resourceLimits']['ssdLimitPerContract']}"
+        puts "#{ui.color('SSD volume provisioned', :cyan)}: #{contract.properties['resourceLimits']['ssdVolumeProvisioned']}"
+        puts "#{ui.color('Reservable IPs', :cyan)}: #{contract.properties['resourceLimits']['reservableIps']}"
+        puts "#{ui.color('Reservable IPs on contract', :cyan)}: #{contract.properties['resourceLimits']['reservedIpsOnContract']}"
+        puts "#{ui.color('Reservable IPs in use', :cyan)}: #{contract.properties['resourceLimits']['reservedIpsInUse']}"
+
+      end
+    end
+  end
+end

data/lib/chef/knife/profitbricks_datacenter_create.rb

@@ -11,7 +11,7 @@ class Chef
              short: '-n NAME',
              long: '--name NAME',
              description: 'Name of the data center',
-             required: true
+             proc: proc { |name| Chef::Config[:knife][:name] = name }
 
       option :description,
              short: '-D DESCRIPTION',
@@ -22,25 +22,26 @@ class Chef
              short: '-l LOCATION',
              long: '--location LOCATION',
              description: 'Location of the data center',
-             proc: proc { |location| Chef::Config[:knife][:location] = location },
-             required: true
+             proc: proc { |location| Chef::Config[:knife][:location] = location }#,
 
       def run
         $stdout.sync = true
 
+        validate_required_params(%i(name location), Chef::Config[:knife])
+
         print "#{ui.color('Creating data center...', :magenta)}"
 
         connection
         datacenter = ProfitBricks::Datacenter.create(
-          name: config[:name],
-          description: config[:description],
-          location: config[:location]
+          name: Chef::Config[:knife][:name],
+          description: Chef::Config[:knife][:description],
+          location: Chef::Config[:knife][:location]
         )
 
         dot = ui.color('.', :magenta)
         datacenter.wait_for { print dot; ready? }
-        datacenter.reload
 
+        @dcid = datacenter.id
         puts "\n"
         puts "#{ui.color('ID', :cyan)}: #{datacenter.id}"
         puts "#{ui.color('Name', :cyan)}: #{datacenter.properties['name']}"

data/lib/chef/knife/profitbricks_firewall_create.rb

@@ -33,8 +33,7 @@ class Chef
              long: '--protocol PROTOCOL',
              default: 'TCP',
              description: 'The protocol of the firewall rule (TCP, UDP, ICMP,' \
-                          ' ANY)',
-             required: true
+                          ' ANY)'
 
       option :sourcemac,
              short: '-m MAC',
@@ -78,31 +77,32 @@ class Chef
       def run
         $stdout.sync = true
 
+        validate_required_params(%i(datacenter_id server_id nic_id protocol) , Chef::Config[:knife])
+
         print "#{ui.color('Creating firewall...', :magenta)}"
 
         params = {
-          name: config[:name],
-          protocol: config[:protocol],
-          sourceMac: config[:sourcemac],
-          sourceIp: config[:sourceip],
-          targetIp: config[:targetip],
-          portRangeStart: config[:portrangestart],
-          portRangeEnd: config[:portrangeend],
-          icmpType: config[:icmptype],
-          icmpCode: config[:icmpcode]
+          name: Chef::Config[:knife][:name],
+          protocol: Chef::Config[:knife][:protocol],
+          sourceMac: Chef::Config[:knife][:sourcemac],
+          sourceIp: Chef::Config[:knife][:sourceip],
+          targetIp: Chef::Config[:knife][:targetip],
+          portRangeStart: Chef::Config[:knife][:portrangestart],
+          portRangeEnd: Chef::Config[:knife][:portrangeend],
+          icmpType: Chef::Config[:knife][:icmptype],
+          icmpCode: Chef::Config[:knife][:icmpcode]
         }
 
         connection
         firewall = ProfitBricks::Firewall.create(
-          config[:datacenter_id],
-          config[:server_id],
-          config[:nic_id],
+          Chef::Config[:knife][:datacenter_id],
+          Chef::Config[:knife][:server_id],
+          Chef::Config[:knife][:nic_id],
           params.compact
         )
 
         dot = ui.color('.', :magenta)
         firewall.wait_for { print dot; ready? }
-        firewall.reload
 
         puts "\n"
         puts "#{ui.color('ID', :cyan)}: #{firewall.id}"

data/lib/chef/knife/profitbricks_firewall_delete.rb

@@ -16,22 +16,20 @@ class Chef
       option :server_id,
              short: '-S SERVER_ID',
              long: '--server-id SERVER_ID',
-             description: 'The ID of the server',
-             required: true
-
+             description: 'The ID of the server'
       option :nic_id,
              short: '-N NIC_ID',
              long: '--nic-id NIC_ID',
-             description: 'ID of the NIC',
-             required: true
+             description: 'ID of the NIC'
 
       def run
+        validate_required_params(%i(datacenter_id server_id nic_id), Chef::Config[:knife])
         connection
         @name_args.each do |firewall_id|
           begin
-            firewall = ProfitBricks::Firewall.get(config[:datacenter_id],
-                                                  config[:server_id],
-                                                  config[:nic_id],
+            firewall = ProfitBricks::Firewall.get(Chef::Config[:knife][:datacenter_id],
+                                                  Chef::Config[:knife][:server_id],
+                                                  Chef::Config[:knife][:nic_id],
                                                   firewall_id)
           rescue Excon::Errors::NotFound
             ui.error("Firewall ID #{firewall_id} not found. Skipping.")

data/lib/chef/knife/profitbricks_firewall_list.rb

@@ -16,17 +16,18 @@ class Chef
       option :server_id,
              short: '-S SERVER_ID',
              long: '--server-id SERVER_ID',
-             description: 'The ID of the server',
-             required: true
+             description: 'The ID of the server'
 
       option :nic_id,
              short: '-N NIC_ID',
              long: '--nic-id NIC_ID',
-             description: 'ID of the NIC',
-             required: true
+             description: 'ID of the NIC'
 
       def run
         $stdout.sync = true
+
+        validate_required_params(%i(datacenter_id server_id nic_id), Chef::Config[:knife])
+
         firewall_list = [
           ui.color('ID', :bold),
           ui.color('Name', :bold),
@@ -41,7 +42,7 @@ class Chef
         ]
         connection
 
-        ProfitBricks::Firewall.list(config[:datacenter_id], config[:server_id], config[:nic_id]).each do |firewall|
+        ProfitBricks::Firewall.list(Chef::Config[:knife][:datacenter_id], Chef::Config[:knife][:server_id], Chef::Config[:knife][:nic_id]).each do |firewall|
           firewall_list << firewall.id
           firewall_list << firewall.properties['name']
           firewall_list << firewall.properties['protocol'].to_s

data/lib/chef/knife/profitbricks_ipblock_create.rb

@@ -10,24 +10,23 @@ class Chef
       option :location,
              short: '-l LOCATION',
              long: '--location LOCATION',
-             description: 'Location of the IP block (us/las, de/fra, de/fkb)',
-             required: true
+             description: 'Location of the IP block (us/las, us/ewr, de/fra, de/fkb)'
 
       option :size,
              short: '-S INT',
              long: '--size INT',
-             description: 'The number of IP addresses to reserve',
-             required: true
+             description: 'The number of IP addresses to reserve'
 
       def run
         $stdout.sync = true
+        validate_required_params(%i(size location), Chef::Config[:knife])
 
         print "#{ui.color('Allocating IP block...', :magenta)}"
 
         connection
         ipblock = ProfitBricks::IPBlock.create(
-          location: config[:location],
-          size: config[:size]
+          location: Chef::Config[:knife][:location],
+          size: Chef::Config[:knife][:size]
         )
 
         dot = ui.color('.', :magenta)
@@ -37,7 +36,7 @@ class Chef
         puts "#{ui.color('ID', :cyan)}: #{ipblock.id}"
         puts "#{ui.color('Location', :cyan)}: #{ipblock.properties['location']}"
         puts "#{ui.color('IP Addresses', :cyan)}: #{ipblock.properties['ips']}"
-
+        @ipid = ipblock.id
         puts 'done'
       end
     end