knife-profitbricks 1.2.1 → 2.0.1

data/lib/chef/knife/profitbricks_volume_delete.rb

@@ -17,7 +17,7 @@ class Chef
         connection
         @name_args.each do |volume_id|
           begin
-            volume = ProfitBricks::Volume.get(config[:datacenter_id], volume_id)
+            volume = ProfitBricks::Volume.get(Chef::Config[:knife][:datacenter_id], volume_id)
           rescue Excon::Errors::NotFound
             ui.error("Volume ID #{volume_id} not found. Skipping.")
             next

data/lib/chef/knife/profitbricks_volume_detach.rb

@@ -16,14 +16,14 @@ 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'
 
       def run
         connection
+        validate_required_params(%i(datacenter_id server_id), Chef::Config[:knife])
         @name_args.each do |volume_id|
           begin
-            volume = ProfitBricks::Volume.get(config[:datacenter_id], nil, volume_id)
+            volume = ProfitBricks::Volume.get(Chef::Config[:knife][:datacenter_id], nil, volume_id)
           rescue Excon::Errors::NotFound
             ui.error("Volume ID #{volume_id} not found. Skipping.")
             next
@@ -37,7 +37,7 @@ class Chef
 
           confirm('Do you really want to detach this volume')
 
-          volume.detach(config[:server_id])
+          volume.detach(Chef::Config[:knife][:server_id])
           ui.msg("Detaching volume #{volume_id} from server")
         end
       end

data/lib/chef/knife/profitbricks_volume_list.rb

@@ -16,8 +16,7 @@ class Chef
       option :server_id,
              short: '-S SERVER_ID',
              long: '--server-id SERVER_ID',
-             description: 'The ID of the server',
-             required: false
+             description: 'The ID of the server'
 
       def run
         $stdout.sync = true
@@ -33,8 +32,8 @@ class Chef
         ]
 
         connection
-        if defined?(config[:server_id]) && config[:server_id]
-          server = ProfitBricks::Server.get(config[:datacenter_id], config[:server_id])
+        if defined?(Chef::Config[:knife][:server_id])
+          server = ProfitBricks::Server.get(Chef::Config[:knife][:datacenter_id], Chef::Config[:knife][:server_id])
           server.list_volumes.each do |volume|
             volume_list << volume.id
             volume_list << volume.properties['name']
@@ -44,9 +43,9 @@ class Chef
             volume_list << volume.properties['type']
             volume_list << volume.properties['availabilityZone']
             volume_list << volume.properties['deviceNumber'].to_s
-          end 
+          end
         else
-          ProfitBricks::Volume.list(config[:datacenter_id]).each do |volume|
+          ProfitBricks::Volume.list(Chef::Config[:knife][:datacenter_id]).each do |volume|
             volume_list << volume.id
             volume_list << volume.properties['name']
             volume_list << volume.properties['size'].to_s

data/lib/knife-profitbricks/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module ProfitBricks
-    VERSION = '1.2.1'
+    VERSION = '2.0.1'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/chef/knife/profitbricks_composite_server_create_spec.rb

@@ -0,0 +1,64 @@
+require 'spec_helper'
+require 'profitbricks_composite_server_create'
+
+Chef::Knife::ProfitbricksCompositeServerCreate.load_deps
+
+describe Chef::Knife::ProfitbricksCompositeServerCreate do
+  subject { Chef::Knife::ProfitbricksCompositeServerCreate.new }
+
+  ProfitBricks.configure do |config|
+    config.username = ENV['PROFITBRICKS_USERNAME']
+    config.password = ENV['PROFITBRICKS_PASSWORD']
+    config.url = ENV['PROFITBRICKS_API_URL']
+    config.debug = false
+    config.global_classes = false
+  end
+
+  before :each do
+    @dcid = ''
+    allow(subject).to receive(:puts)
+  end
+
+  after :each do
+    datacenter = ProfitBricks::Datacenter.get(@dcid)
+    datacenter.delete
+  end
+
+  describe '#run' do
+    it 'should create a composite server' do
+
+      datacenter = ProfitBricks::Datacenter.create(name: 'Chef test',
+                                                   description: 'Chef test datacenter',
+                                                   location: 'us/las')
+
+      datacenter.wait_for { ready? }
+
+      @dcid = datacenter.id
+
+      {
+        profitbricks_username: ENV['PROFITBRICKS_USERNAME'],
+        profitbricks_password: ENV['PROFITBRICKS_PASSWORD'],
+        profitbricks_url: ENV['PROFITBRICKS_API_URL'],
+        name: 'Chef test',
+        cores: '2',
+        ram: '2048',
+        size: 4,
+        dhcp: true,
+        lan: 1,
+        datacenter_id: @dcid,
+        imagealias: 'ubuntu:latest',
+        type: 'HDD',
+        imagepassword: 'K3tTj8G14a3EgKyNeeiY'
+      }.each do |key, value|
+        Chef::Config[:knife][key] = value
+      end
+
+      expect(subject).to receive(:puts).with('Name: Chef test')
+      expect(subject).to receive(:puts).with('Cores: 2')
+      expect(subject).to receive(:puts).with('CPU Family: ')
+      expect(subject).to receive(:puts).with('Ram: 2048')
+      expect(subject).to receive(:puts).with('Availability Zone: ')
+      subject.run
+    end
+  end
+end

data/spec/chef/knife/profitbricks_contract_list_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'profitbricks_contract_list'
+
+Chef::Knife::ProfitbricksContractList.load_deps
+
+describe Chef::Knife::ProfitbricksContractList do
+  let(:contract_list) { Chef::Knife::ProfitbricksContractList.new }
+
+  before :each do
+    allow(contract_list).to receive(:puts)
+  end
+
+  describe '#run' do
+    it 'should output the column headers' do
+      expect(contract_list).to receive(:puts).with('Contract Type: contract')
+      expect(contract_list).to receive(:puts).with('Status: BILLABLE')
+      contract_list.run
+    end
+  end
+end

data/spec/chef/knife/profitbricks_datacenter_create_spec.rb

@@ -0,0 +1,44 @@
+require 'spec_helper'
+require 'profitbricks_datacenter_create'
+
+Chef::Knife::ProfitbricksDatacenterCreate.load_deps
+
+describe Chef::Knife::ProfitbricksDatacenterCreate do
+  subject { Chef::Knife::ProfitbricksDatacenterCreate.new }
+
+  before :each do
+    {
+      name: 'Chef test',
+      description: 'Chef test datacenter',
+      location: 'us/las'
+    }.each do |key, value|
+      Chef::Config[:knife][key] = value
+    end
+
+    allow(subject).to receive(:puts)
+  end
+
+  after :each do
+    ProfitBricks.configure do |config|
+      config.username = Chef::Config[:knife][:profitbricks_username]
+      config.password = Chef::Config[:knife][:profitbricks_password]
+      config.url = Chef::Config[:knife][:profitbricks_url]
+      config.debug = Chef::Config[:knife][:profitbricks_debug] || false
+      config.global_classes = false
+    end
+
+    dcid = subject.instance_variable_get :@dcid
+    datacenter = ProfitBricks::Datacenter.get(dcid)
+    datacenter.delete
+    datacenter.wait_for { ready? }
+  end
+
+  describe '#run' do
+    it 'should create a data center' do
+      expect(subject).to receive(:puts).with('Name: Chef test')
+      expect(subject).to receive(:puts).with('Description: Chef test datacenter')
+      expect(subject).to receive(:puts).with('Location: us/las')
+      subject.run
+    end
+  end
+end

data/spec/chef/knife/profitbricks_datacenter_delete_spec.rb

@@ -0,0 +1,39 @@
+require 'spec_helper'
+require 'profitbricks_datacenter_delete'
+
+Chef::Knife::ProfitbricksDatacenterDelete.load_deps
+
+describe Chef::Knife::ProfitbricksDatacenterDelete do
+  subject { Chef::Knife::ProfitbricksDatacenterDelete.new }
+
+  before :each do
+    allow(subject).to receive(:puts)
+    allow(subject.ui).to receive(:confirm)
+
+    subject.config[:yes] = true
+
+    ProfitBricks.configure do |config|
+      config.username = Chef::Config[:knife][:profitbricks_username]
+      config.password = Chef::Config[:knife][:profitbricks_password]
+      config.url = Chef::Config[:knife][:profitbricks_url]
+      config.debug = Chef::Config[:knife][:profitbricks_debug] || false
+      config.global_classes = false
+    end
+
+    @datacenter = ProfitBricks::Datacenter.create(name: 'Chef test',
+                                                  description: 'Chef test datacenter',
+                                                  location: 'us/las')
+
+    @datacenter.wait_for { ready? }
+    subject.name_args = [@datacenter.id]
+  end
+
+  describe '#run' do
+    it 'should delete a data center' do
+      expect(subject).to receive(:puts).with('Name: Chef test')
+      expect(subject).to receive(:puts).with('Description: Chef test datacenter')
+      expect(subject).to receive(:puts).with('Location: us/las')
+      subject.run
+    end
+  end
+end

data/spec/chef/knife/profitbricks_datacenter_list_spec.rb

@@ -4,20 +4,21 @@ require 'profitbricks_datacenter_list'
 Chef::Knife::ProfitbricksDatacenterList.load_deps
 
 describe Chef::Knife::ProfitbricksDatacenterList do
+  let(:datacenter_list) { Chef::Knife::ProfitbricksDatacenterList.new }
+
   before :each do
-    subject { Chef::Knife::ProfitbricksDatacenterList.new }
-    allow(subject).to receive(:puts)
+    allow(datacenter_list).to receive(:puts)
   end
 
   describe '#run' do
     it 'should output the column headers' do
-      expect(subject).to receive(:puts).with(/^ID\s+Name\s+Description\s+Location\s+Version\s*$/)
-      subject.run
+      expect(datacenter_list).to receive(:puts).with(/^ID\s+Name\s+Description\s+Location\s+Version\s*$/)
+      datacenter_list.run
     end
 
     it 'should output the data center locations' do
-      expect(subject).to receive(:puts).with(/(?:us\/las)/)
-      subject.run
+      expect(datacenter_list).to receive(:puts).with(/^ID\s+Name\s+Description\s+Location\s+Version\s*$/)
+      datacenter_list.run
     end
   end
 end

data/spec/chef/knife/profitbricks_firewall_create_spec.rb

@@ -0,0 +1,74 @@
+require 'spec_helper'
+require 'profitbricks_firewall_create'
+
+Chef::Knife::ProfitbricksFirewallCreate.load_deps
+
+describe Chef::Knife::ProfitbricksFirewallCreate do
+  before :each do
+    ProfitBricks.configure do |config|
+      config.username = Chef::Config[:knife][:profitbricks_username]
+      config.password = Chef::Config[:knife][:profitbricks_password]
+      config.url = Chef::Config[:knife][:profitbricks_url]
+      config.debug = Chef::Config[:knife][:profitbricks_debug] || false
+      config.global_classes = false
+    end
+    @dcid = ''
+
+    datacenter = ProfitBricks::Datacenter.create(name: 'Chef test',
+                                                 description: 'Chef test datacenter',
+                                                 location: 'us/las')
+
+    datacenter.wait_for { ready? }
+    @dcid = datacenter.id
+
+    @server = ProfitBricks::Server.create(datacenter.id, name: 'Chef Test',
+                                                         ram: 1024,
+                                                         cores: 1,
+                                                         availabilityZone: 'ZONE_1',
+                                                         cpuFamily: 'INTEL_XEON')
+    @server.wait_for { ready? }
+
+    @nic = ProfitBricks::NIC.create(datacenter.id, @server.id, name: 'Chef Test',
+                                                               dhcp: true,
+                                                               lan: 1,
+                                                               firewallActive: true,
+                                                               nat: false)
+    @nic.wait_for { ready? }
+
+    allow(subject).to receive(:puts)
+  end
+
+  after :each do
+    datacenter = ProfitBricks::Datacenter.get(@dcid)
+    datacenter.delete
+    datacenter.wait_for { ready? }
+  end
+
+  describe '#run' do
+    it 'should output the column headers' do
+      {
+        datacenter_id: @dcid,
+        server_id: @server.id,
+        nic_id: @nic.id,
+        name: 'Chef test',
+        protocol: 'TCP',
+        portrangestart: '22',
+        portrangeend: 22
+      }.each do |key, value|
+        Chef::Config[:knife][key] = value
+      end
+
+      expect(subject).to receive(:puts).with('Name: Chef test')
+      expect(subject).to receive(:puts).with('Protocol: TCP')
+      expect(subject).to receive(:puts).with('Source MAC: ')
+      expect(subject).to receive(:puts).with('Source IP: ')
+      expect(subject).to receive(:puts).with('Target IP: ')
+      expect(subject).to receive(:puts).with('Port Range Start: 22')
+      expect(subject).to receive(:puts).with('Port Range End: 22')
+      expect(subject).to receive(:puts).with('ICMP Type: ')
+      expect(subject).to receive(:puts).with('ICMP Code: ')
+
+      subject.run
+    end
+  end
+end

data/spec/chef/knife/profitbricks_firewall_delete_spec.rb

@@ -0,0 +1,86 @@
+require 'spec_helper'
+require 'profitbricks_firewall_delete'
+
+Chef::Knife::ProfitbricksFirewallDelete.load_deps
+
+describe Chef::Knife::ProfitbricksFirewallDelete do
+  subject { Chef::Knife::ProfitbricksFirewallDelete.new }
+
+  before :each do
+    allow(subject).to receive(:puts)
+    allow(subject.ui).to receive(:confirm)
+
+    subject.config[:yes] = true
+
+    ProfitBricks.configure do |config|
+      config.username = Chef::Config[:knife][:profitbricks_username]
+      config.password = Chef::Config[:knife][:profitbricks_password]
+      config.url = Chef::Config[:knife][:profitbricks_url]
+      config.debug = Chef::Config[:knife][:profitbricks_debug] || false
+      config.global_classes = false
+    end
+
+    @dcid = ''
+
+    datacenter = ProfitBricks::Datacenter.create(name: 'Chef test',
+                                                 description: 'Chef test datacenter',
+                                                 location: 'us/las')
+
+    datacenter.wait_for { ready? }
+    @dcid = datacenter.id
+
+    @server = ProfitBricks::Server.create(datacenter.id, name: 'Chef Test',
+                                                         ram: 1024,
+                                                         cores: 1,
+                                                         availabilityZone: 'ZONE_1',
+                                                         cpuFamily: 'INTEL_XEON')
+    @server.wait_for { ready? }
+
+    @nic = ProfitBricks::NIC.create(datacenter.id, @server.id, name: 'Chef Test',
+                                                               dhcp: true,
+                                                               lan: 1,
+                                                               firewallActive: true,
+                                                               nat: false)
+    @nic.wait_for { ready? }
+
+    @fw = ProfitBricks::Firewall.create(datacenter.id, @server.id, @nic.id,
+                                        name: 'SSH',
+                                        protocol: 'TCP',
+                                        sourceMac: '01:23:45:67:89:00',
+                                        sourceIp: nil,
+                                        targetIp: nil,
+                                        portRangeStart: 22,
+                                        portRangeEnd: 22,
+                                        icmpType: nil,
+                                        icmpCode: nil)
+
+    @fw.wait_for { ready? }
+  end
+
+  after :each do
+    datacenter = ProfitBricks::Datacenter.get(@dcid)
+    datacenter.delete
+    datacenter.wait_for { ready? }
+  end
+
+  describe '#run' do
+    it 'should delete a firewall rule' do
+      subject.name_args = [@fw.id]
+
+      {
+        datacenter_id: @dcid,
+        server_id: @server.id,
+        nic_id: @nic.id
+      }.each do |key, value|
+        Chef::Config[:knife][key] = value
+      end
+
+      expect(subject).to receive(:puts).with('Name: SSH')
+      expect(subject).to receive(:puts).with('Protocol: TCP')
+      expect(subject).to receive(:puts).with('Source MAC: 01:23:45:67:89:00')
+      expect(subject).to receive(:puts).with('Port Range Start: 22')
+      expect(subject).to receive(:puts).with('Port Range End: 22')
+      subject.run
+    end
+  end
+end

data/spec/chef/knife/profitbricks_firewall_list_spec.rb

@@ -0,0 +1,61 @@
+require 'spec_helper'
+require 'profitbricks_firewall_list'
+
+Chef::Knife::ProfitbricksFirewallList.load_deps
+
+describe Chef::Knife::ProfitbricksFirewallList do
+  before :each do
+    ProfitBricks.configure do |config|
+      config.username = Chef::Config[:knife][:profitbricks_username]
+      config.password = Chef::Config[:knife][:profitbricks_password]
+      config.url = Chef::Config[:knife][:profitbricks_url]
+      config.debug = Chef::Config[:knife][:profitbricks_debug] || false
+      config.global_classes = false
+    end
+    @dcid = ''
+
+    datacenter = ProfitBricks::Datacenter.create(name: 'Chef test',
+                                                 description: 'Chef test datacenter',
+                                                 location: 'us/las')
+
+    datacenter.wait_for { ready? }
+    @dcid = datacenter.id
+
+    @server = ProfitBricks::Server.create(datacenter.id, name: 'Chef Test',
+                                                         ram: 1024,
+                                                         cores: 1,
+                                                         availabilityZone: 'ZONE_1',
+                                                         cpuFamily: 'INTEL_XEON')
+    @server.wait_for { ready? }
+
+    @nic = ProfitBricks::NIC.create(datacenter.id, @server.id, name: 'Chef Test',
+                                                               dhcp: true,
+                                                               lan: 1,
+                                                               firewallActive: true,
+                                                               nat: false)
+    @nic.wait_for { ready? }
+
+    allow(subject).to receive(:puts)
+  end
+
+  after :each do
+    datacenter = ProfitBricks::Datacenter.get(@dcid)
+    datacenter.delete
+    datacenter.wait_for { ready? }
+  end
+
+  describe '#run' do
+    it 'should output the column headers' do
+      {
+        datacenter_id: @dcid,
+        server_id: @server.id,
+        nic_id: @nic.id
+      }.each do |key, value|
+        Chef::Config[:knife][key] = value
+      end
+
+      expect(subject).to receive(:puts).with("ID  Name  Protocol  Source MAC  Source IP  Target IP  Port Range Start  Port Range End  ICMP Type  ICMP CODE\n")
+      subject.run
+    end
+  end
+end