knife-ionoscloud 5.1.2 → 6.0.0

data/spec/chef/knife/ionoscloud_cube_server_create_spec.rb

@@ -0,0 +1,249 @@
+require 'spec_helper'
+require 'ionoscloud_cube_server_create'
+
+Chef::Knife::IonoscloudCubeServerCreate.load_deps
+
+describe Chef::Knife::IonoscloudCubeServerCreate do
+  before :each do
+    subject { Chef::Knife::IonoscloudCubeServerCreate.new }
+
+    allow(subject).to receive(:puts)
+    allow(subject).to receive(:print)
+  end
+
+  describe '#run' do
+    it 'should call ServersApi.datacenters_servers_post with the expected arguments and also make another call to set the boot_volume when set_boot is sent' do
+      template = template_mock
+      server = server_mock(
+        volumes: Ionoscloud::Volumes.new(items: [volume_mock(size: template.properties.storage_size, type: 'DAS')]),
+        nics: Ionoscloud::Nics.new(items: [nic_mock]),
+        ram: template.properties.ram,
+        cores: template.properties.cores,
+        boot_volume: nil,
+        boot_cdrom: Ionoscloud::ResourceReference.new({ id: nil }),
+      )
+
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        datacenter_id: 'datacenter_id',
+
+        template: template.id,
+        name: server.properties.name,
+        cpu_family: server.properties.cpu_family,
+        availability_zone: server.properties.availability_zone,
+
+        volume_name: server.entities.volumes.items.first.properties.name,
+        type: server.entities.volumes.items.first.properties.type,
+        bus: server.entities.volumes.items.first.properties.bus,
+        image: SecureRandom.uuid,
+        image_password: 'K3tTj8G14a3EgKyNeeiY',
+        backupunit_id: server.entities.volumes.items.first.properties.backupunit_id,
+        user_data: server.entities.volumes.items.first.properties.user_data,
+
+        set_boot: true,
+
+        lan: server.entities.nics.items.first.properties.lan,
+        nic_name: server.entities.nics.items.first.properties.name,
+        dhcp: server.entities.nics.items.first.properties.dhcp,
+        ips: server.entities.nics.items.first.properties.ips.join(','),
+        firewall_type: server.entities.nics.items.first.properties.firewall_type,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      expect(subject).to receive(:puts).with("ID: #{server.id}")
+      expect(subject).to receive(:puts).with("Name: #{server.properties.name}")
+      expect(subject).to receive(:puts).with("Type: #{server.properties.type}")
+      expect(subject).to receive(:puts).with("Cores: #{server.properties.cores}")
+      expect(subject).to receive(:puts).with("CPU Family: #{server.properties.cpu_family}")
+      expect(subject).to receive(:puts).with("Ram: #{server.properties.ram}")
+      expect(subject).to receive(:puts).with("Availability Zone: #{server.properties.availability_zone}")
+      expect(subject).to receive(:puts).with("Boot Volume: #{server.entities.volumes.items.first.id}")
+      expect(subject).to receive(:puts).with("Boot CDROM: ")
+
+      expected_properties = server.properties.to_hash
+      expected_properties.delete(:bootCdrom)
+      expected_properties.delete(:bootVolume)
+      expected_properties.delete(:cores)
+      expected_properties.delete(:ram)
+      expected_properties[:type] = 'CUBE'
+      expected_properties[:templateUuid] = template.id
+
+      expected_entities = server.entities.to_hash
+      expected_entities[:volumes][:items][0].delete(:id)
+      expected_entities[:volumes][:items][0][:properties].delete(:size)
+      expected_entities[:volumes][:items][0][:properties].delete(:availabilityZone)
+      expected_entities[:nics][:items][0].delete(:id)
+      expected_entities[:nics][:items][0].delete(:entities)
+      expected_entities[:nics][:items][0][:properties].delete(:mac)
+      expected_entities[:nics][:items][0][:properties].delete(:firewallActive)
+      expected_entities[:nics][:items][0][:properties].delete(:deviceNumber)
+      expected_entities[:nics][:items][0][:properties].delete(:pciSlot)
+
+      expected_entities[:volumes][:items][0][:properties].delete(:licenceType)
+      expected_entities[:volumes][:items][0][:properties][:image] = subject_config[:image]
+      expected_entities[:volumes][:items][0][:properties][:imagePassword] = subject_config[:image_password]
+
+      server.properties.boot_volume = Ionoscloud::ResourceReference.new({ id: server.entities.volumes.items.first.id })
+
+      mock_wait_for(subject)
+      mock_wait_for(subject)
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'POST',
+            path: "/datacenters/#{subject_config[:datacenter_id]}/servers",
+            operation: :'ServersApi.datacenters_servers_post',
+            return_type: 'Server',
+            body: { properties: expected_properties, entities: expected_entities },
+            result: server,
+          },
+          {
+            method: 'GET',
+            path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{server.id}",
+            operation: :'ServersApi.datacenters_servers_find_by_id',
+            return_type: 'Server',
+            result: server,
+          },
+          {
+            method: 'PATCH',
+            path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{server.id}",
+            operation: :'ServersApi.datacenters_servers_patch',
+            return_type: 'Server',
+            body: { bootVolume: { id: server.entities.volumes.items[0].id } },
+            result: server,
+          },
+          {
+            method: 'GET',
+            path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{server.id}",
+            operation: :'ServersApi.datacenters_servers_find_by_id',
+            return_type: 'Server',
+            result: server,
+          },
+        ],
+      )
+
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+    it 'should call ServersApi.datacenters_servers_post with the expected arguments and should not make another call to set the boot_volume when set_boot is not sent' do
+      template = template_mock
+      server = server_mock(
+        volumes: Ionoscloud::Volumes.new(items: [volume_mock(size: template.properties.storage_size, type: 'DAS')]),
+        nics: Ionoscloud::Nics.new(items: [nic_mock]),
+        ram: template.properties.ram,
+        cores: template.properties.cores,
+        boot_volume: nil,
+        boot_cdrom: Ionoscloud::ResourceReference.new({ id: nil }),
+      )
+
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        datacenter_id: 'datacenter_id',
+
+        template: template.id,
+        name: server.properties.name,
+        cpu_family: server.properties.cpu_family,
+        availability_zone: server.properties.availability_zone,
+
+        volume_name: server.entities.volumes.items.first.properties.name,
+        type: server.entities.volumes.items.first.properties.type,
+        bus: server.entities.volumes.items.first.properties.bus,
+        image: SecureRandom.uuid,
+        image_password: 'K3tTj8G14a3EgKyNeeiY',
+        backupunit_id: server.entities.volumes.items.first.properties.backupunit_id,
+        user_data: server.entities.volumes.items.first.properties.user_data,
+
+        set_boot: false,
+
+        lan: server.entities.nics.items.first.properties.lan,
+        nic_name: server.entities.nics.items.first.properties.name,
+        dhcp: server.entities.nics.items.first.properties.dhcp,
+        ips: server.entities.nics.items.first.properties.ips.join(','),
+        firewall_type: server.entities.nics.items.first.properties.firewall_type,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      expect(subject).to receive(:puts).with("ID: #{server.id}")
+      expect(subject).to receive(:puts).with("Name: #{server.properties.name}")
+      expect(subject).to receive(:puts).with("Type: #{server.properties.type}")
+      expect(subject).to receive(:puts).with("Cores: #{server.properties.cores}")
+      expect(subject).to receive(:puts).with("CPU Family: #{server.properties.cpu_family}")
+      expect(subject).to receive(:puts).with("Ram: #{server.properties.ram}")
+      expect(subject).to receive(:puts).with("Availability Zone: #{server.properties.availability_zone}")
+      expect(subject).to receive(:puts).with("Boot Volume: #{server.entities.volumes.items.first.id}")
+      expect(subject).to receive(:puts).with("Boot CDROM: ")
+
+      expected_properties = server.properties.to_hash
+      expected_properties.delete(:bootCdrom)
+      expected_properties.delete(:bootVolume)
+      expected_properties.delete(:cores)
+      expected_properties.delete(:ram)
+      expected_properties[:type] = 'CUBE'
+      expected_properties[:templateUuid] = template.id
+
+      expected_entities = server.entities.to_hash
+      expected_entities[:volumes][:items][0].delete(:id)
+      expected_entities[:volumes][:items][0][:properties].delete(:size)
+      expected_entities[:volumes][:items][0][:properties].delete(:availabilityZone)
+      expected_entities[:nics][:items][0].delete(:id)
+      expected_entities[:nics][:items][0].delete(:entities)
+      expected_entities[:nics][:items][0][:properties].delete(:mac)
+      expected_entities[:nics][:items][0][:properties].delete(:firewallActive)
+      expected_entities[:nics][:items][0][:properties].delete(:deviceNumber)
+      expected_entities[:nics][:items][0][:properties].delete(:pciSlot)
+
+      expected_entities[:volumes][:items][0][:properties].delete(:licenceType)
+      expected_entities[:volumes][:items][0][:properties][:image] = subject_config[:image]
+      expected_entities[:volumes][:items][0][:properties][:imagePassword] = subject_config[:image_password]
+
+      server.properties.boot_volume = Ionoscloud::ResourceReference.new({ id: server.entities.volumes.items.first.id })
+
+      mock_wait_for(subject)
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'POST',
+            path: "/datacenters/#{subject_config[:datacenter_id]}/servers",
+            operation: :'ServersApi.datacenters_servers_post',
+            return_type: 'Server',
+            body: { properties: expected_properties, entities: expected_entities },
+            result: server,
+          },
+          {
+            method: 'GET',
+            path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{server.id}",
+            operation: :'ServersApi.datacenters_servers_find_by_id',
+            return_type: 'Server',
+            result: server,
+          },
+        ],
+      )
+
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+    it 'should not make any call if any required option is missing' do
+      required_options = subject.instance_variable_get(:@required_options)
+
+      arrays_without_one_element(required_options).each do |test_case|
+
+        test_case[:array].each { |value| subject.config[value] = 'test' }
+
+        expect(subject).to receive(:puts).with("Missing required parameters #{test_case[:removed]}")
+        expect(subject.api_client).not_to receive(:call_api)
+
+        expect { subject.run }.to raise_error(SystemExit) do |error|
+          expect(error.status).to eq(1)
+        end
+
+        required_options.each { |value| subject.config[value] = nil }
+      end
+    end
+  end
+end

data/spec/chef/knife/ionoscloud_datacenter_create_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudDatacenterCreate do
   end
 
   describe '#run' do
-    it 'should call DataCenterApi.datacenters_post with the expected arguments and output based on what it receives' do
+    it 'should call DataCentersApi.datacenters_post with the expected arguments and output based on what it receives' do
       datacenter = datacenter_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -35,6 +35,7 @@ describe Chef::Knife::IonoscloudDatacenterCreate do
 
       expected_body = datacenter.properties.to_hash
       expected_body.delete(:version)
+      expected_body.delete(:cpuArchitecture)
 
       mock_wait_for(subject)
       mock_call_api(
@@ -43,18 +44,11 @@ describe Chef::Knife::IonoscloudDatacenterCreate do
           {
             method: 'POST',
             path: '/datacenters',
-            operation: :'DataCenterApi.datacenters_post',
+            operation: :'DataCentersApi.datacenters_post',
             return_type: 'Datacenter',
             body: { properties: expected_body },
             result: datacenter,
           },
-          {
-            method: 'GET',
-            path: "/datacenters/#{datacenter.id}",
-            operation: :'DataCenterApi.datacenters_find_by_id',
-            return_type: 'Datacenter',
-            result: datacenter,
-          },
         ],
       )
 

data/spec/chef/knife/ionoscloud_datacenter_delete_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudDatacenterDelete do
   end
 
   describe '#run' do
-    it 'should call DataCenterApi.datacenters_delete when the ID is valid' do
+    it 'should call DataCentersApi.datacenters_delete when the ID is valid' do
       datacenter = datacenter_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -40,14 +40,14 @@ describe Chef::Knife::IonoscloudDatacenterDelete do
           {
             method: 'GET',
             path: "/datacenters/#{datacenter.id}",
-            operation: :'DataCenterApi.datacenters_find_by_id',
+            operation: :'DataCentersApi.datacenters_find_by_id',
             return_type: 'Datacenter',
             result: datacenter,
           },
           {
             method: 'DELETE',
             path: "/datacenters/#{datacenter.id}",
-            operation: :'DataCenterApi.datacenters_delete',
+            operation: :'DataCentersApi.datacenters_delete',
           },
         ],
       )
@@ -55,7 +55,7 @@ describe Chef::Knife::IonoscloudDatacenterDelete do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should not call DataCenterApi.datacenters_delete when the user ID is not valid' do
+    it 'should not call DataCentersApi.datacenters_delete when the user ID is not valid' do
       datacenter_id = 'invalid_id'
       subject_config = {
         ionoscloud_username: 'email',
@@ -74,7 +74,7 @@ describe Chef::Knife::IonoscloudDatacenterDelete do
           {
             method: 'GET',
             path: "/datacenters/#{datacenter_id}",
-            operation: :'DataCenterApi.datacenters_find_by_id',
+            operation: :'DataCentersApi.datacenters_find_by_id',
             return_type: 'Datacenter',
             exception: Ionoscloud::ApiError.new(code: 404),
           },

data/spec/chef/knife/ionoscloud_datacenter_get_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudDatacenterGet do
   end
 
   describe '#run' do
-    it 'should call DataCenterApi.datacenters_find_by_id' do
+    it 'should call DataCentersApi.datacenters_find_by_id' do
       datacenter = datacenter_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -38,7 +38,7 @@ describe Chef::Knife::IonoscloudDatacenterGet do
           {
             method: 'GET',
             path: "/datacenters/#{datacenter.id}",
-            operation: :'DataCenterApi.datacenters_find_by_id',
+            operation: :'DataCentersApi.datacenters_find_by_id',
             return_type: 'Datacenter',
             result: datacenter,
           },

data/spec/chef/knife/ionoscloud_datacenter_list_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudDatacenterList do
   end
 
   describe '#run' do
-    it 'should call DataCenterApi.datacenters_get' do
+    it 'should call DataCentersApi.datacenters_get' do
       datacenters = datacenters_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -26,8 +26,8 @@ describe Chef::Knife::IonoscloudDatacenterList do
         subject.ui.color('Name', :bold),
         subject.ui.color('Description', :bold),
         subject.ui.color('Location', :bold),
+        subject.ui.color('CPU Architectures', :bold),
         subject.ui.color('Version', :bold),
-        subject.ui.color('Sec Auth Protection', :bold),
       ]
 
       datacenters.items.each do |datacenter|
@@ -35,8 +35,8 @@ describe Chef::Knife::IonoscloudDatacenterList do
         datacenter_list << datacenter.properties.name
         datacenter_list << datacenter.properties.description
         datacenter_list << datacenter.properties.location
+        datacenter_list << datacenter.properties.cpu_architecture.map { |arch| arch.cpu_family }
         datacenter_list << datacenter.properties.version.to_s
-        datacenter_list << datacenter.properties.sec_auth_protection.to_s
       end
 
       expect(subject.ui).to receive(:list).with(datacenter_list, :uneven_columns_across, 6)
@@ -47,7 +47,7 @@ describe Chef::Knife::IonoscloudDatacenterList do
           {
             method: 'GET',
             path: '/datacenters',
-            operation: :'DataCenterApi.datacenters_get',
+            operation: :'DataCentersApi.datacenters_get',
             return_type: 'Datacenters',
             result: datacenters,
           },

data/spec/chef/knife/ionoscloud_datacenter_update_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudDatacenterUpdate do
   end
 
   describe '#run' do
-    it 'should call DataCenterApi.datacenters_patch' do
+    it 'should call DataCentersApi.datacenters_patch' do
       datacenter = datacenter_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -43,7 +43,7 @@ describe Chef::Knife::IonoscloudDatacenterUpdate do
           {
             method: 'PATCH',
             path: "/datacenters/#{datacenter.id}",
-            operation: :'DataCenterApi.datacenters_patch',
+            operation: :'DataCentersApi.datacenters_patch',
             return_type: 'Datacenter',
             body: { name: subject_config[:name], description: subject_config[:description] },
             result: datacenter,
@@ -51,7 +51,7 @@ describe Chef::Knife::IonoscloudDatacenterUpdate do
           {
             method: 'GET',
             path: "/datacenters/#{datacenter.id}",
-            operation: :'DataCenterApi.datacenters_find_by_id',
+            operation: :'DataCentersApi.datacenters_find_by_id',
             return_type: 'Datacenter',
             result: datacenter,
           },

data/spec/chef/knife/ionoscloud_firewall_create_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudFirewallCreate do
   end
 
   describe '#run' do
-    it 'should call NicApi.datacenters_servers_nics_firewallrules_post with the expected arguments and output based on what it receives' do
+    it 'should call FirewallRulesApi.datacenters_servers_nics_firewallrules_post with the expected arguments and output based on what it receives' do
       firewall = firewall_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -29,12 +29,14 @@ describe Chef::Knife::IonoscloudFirewallCreate do
         port_range_end: firewall.properties.port_range_end,
         icmp_type: firewall.properties.icmp_type,
         icmp_code: firewall.properties.icmp_code,
+        type: firewall.properties.type,
       }
 
       subject_config.each { |key, value| subject.config[key] = value }
 
       expect(subject).to receive(:puts).with("ID: #{firewall.id}")
       expect(subject).to receive(:puts).with("Name: #{firewall.properties.name}")
+      expect(subject).to receive(:puts).with("Type: #{firewall.properties.type}")
       expect(subject).to receive(:puts).with("Protocol: #{firewall.properties.protocol}")
       expect(subject).to receive(:puts).with("Source MAC: #{firewall.properties.source_mac}")
       expect(subject).to receive(:puts).with("Source IP: #{firewall.properties.source_ip}")
@@ -51,7 +53,7 @@ describe Chef::Knife::IonoscloudFirewallCreate do
           {
             method: 'POST',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/nics/#{subject_config[:nic_id]}/firewallrules",
-            operation: :'NicApi.datacenters_servers_nics_firewallrules_post',
+            operation: :'FirewallRulesApi.datacenters_servers_nics_firewallrules_post',
             return_type: 'FirewallRule',
             body: { properties: firewall.properties.to_hash },
             result: firewall,
@@ -59,7 +61,7 @@ describe Chef::Knife::IonoscloudFirewallCreate do
           {
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/nics/#{subject_config[:nic_id]}/firewallrules/#{firewall.id}",
-            operation: :'NicApi.datacenters_servers_nics_firewallrules_find_by_id',
+            operation: :'FirewallRulesApi.datacenters_servers_nics_firewallrules_find_by_id',
             return_type: 'FirewallRule',
             result: firewall,
           },

data/spec/chef/knife/ionoscloud_firewall_delete_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudFirewallDelete do
   end
 
   describe '#run' do
-    it 'should call NicApi.datacenters_servers_nics_firewallrules_firewallrules_delete when the ID is valid' do
+    it 'should call FirewallRulesApi.datacenters_servers_nics_firewallrules_firewallrules_delete when the ID is valid' do
       firewall = firewall_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -28,6 +28,7 @@ describe Chef::Knife::IonoscloudFirewallDelete do
 
       expect(subject).to receive(:puts).with("ID: #{firewall.id}")
       expect(subject).to receive(:puts).with("Name: #{firewall.properties.name}")
+      expect(subject).to receive(:puts).with("Type: #{firewall.properties.type}")
       expect(subject).to receive(:puts).with("Protocol: #{firewall.properties.protocol}")
       expect(subject).to receive(:puts).with("Source MAC: #{firewall.properties.source_mac}")
       expect(subject).to receive(:puts).with("Source IP: #{firewall.properties.source_ip}")
@@ -47,7 +48,7 @@ describe Chef::Knife::IonoscloudFirewallDelete do
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/"\
                   "nics/#{subject_config[:nic_id]}/firewallrules/#{firewall.id}",
-            operation: :'NicApi.datacenters_servers_nics_firewallrules_find_by_id',
+            operation: :'FirewallRulesApi.datacenters_servers_nics_firewallrules_find_by_id',
             return_type: 'FirewallRule',
             result: firewall,
           },
@@ -55,7 +56,7 @@ describe Chef::Knife::IonoscloudFirewallDelete do
             method: 'DELETE',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/"\
                   "nics/#{subject_config[:nic_id]}/firewallrules/#{firewall.id}",
-            operation: :'NicApi.datacenters_servers_nics_firewallrules_delete',
+            operation: :'FirewallRulesApi.datacenters_servers_nics_firewallrules_delete',
           },
         ],
       )
@@ -63,7 +64,7 @@ describe Chef::Knife::IonoscloudFirewallDelete do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should not call NicApi.datacenters_servers_nics_firewallrules_delete when the user ID is not valid' do
+    it 'should not call FirewallRulesApi.datacenters_servers_nics_firewallrules_delete when the user ID is not valid' do
       firewall_id = 'invalid_id'
       subject_config = {
         ionoscloud_username: 'email',
@@ -86,7 +87,7 @@ describe Chef::Knife::IonoscloudFirewallDelete do
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/"\
                   "nics/#{subject_config[:nic_id]}/firewallrules/#{firewall_id}",
-            operation: :'NicApi.datacenters_servers_nics_firewallrules_find_by_id',
+            operation: :'FirewallRulesApi.datacenters_servers_nics_firewallrules_find_by_id',
             return_type: 'FirewallRule',
             exception: Ionoscloud::ApiError.new(code: 404),
           },

data/spec/chef/knife/ionoscloud_firewall_get_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudFirewallGet do
   end
 
   describe '#run' do
-    it 'should call NicApi.datacenters_servers_nics_firewallrules_find_by_id' do
+    it 'should call FirewallRulesApi.datacenters_servers_nics_firewallrules_find_by_id' do
       firewall = firewall_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -28,6 +28,7 @@ describe Chef::Knife::IonoscloudFirewallGet do
 
       expect(subject).to receive(:puts).with("ID: #{firewall.id}")
       expect(subject).to receive(:puts).with("Name: #{firewall.properties.name}")
+      expect(subject).to receive(:puts).with("Type: #{firewall.properties.type}")
       expect(subject).to receive(:puts).with("Protocol: #{firewall.properties.protocol}")
       expect(subject).to receive(:puts).with("Source MAC: #{firewall.properties.source_mac}")
       expect(subject).to receive(:puts).with("Source IP: #{firewall.properties.source_ip}")
@@ -45,7 +46,7 @@ describe Chef::Knife::IonoscloudFirewallGet do
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/"\
                   "nics/#{subject_config[:nic_id]}/firewallrules/#{firewall.id}",
-            operation: :'NicApi.datacenters_servers_nics_firewallrules_find_by_id',
+            operation: :'FirewallRulesApi.datacenters_servers_nics_firewallrules_find_by_id',
             return_type: 'FirewallRule',
             result: firewall,
           },

data/spec/chef/knife/ionoscloud_firewall_list_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudFirewallList do
   end
 
   describe '#run' do
-    it 'should call NicApi.datacenters_servers_nics_firewallrules_get' do
+    it 'should call FirewallRulesApi.datacenters_servers_nics_firewallrules_get' do
       firewalls = firewalls_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -35,6 +35,7 @@ describe Chef::Knife::IonoscloudFirewallList do
         subject.ui.color('Port Range End', :bold),
         subject.ui.color('ICMP Type', :bold),
         subject.ui.color('ICMP CODE', :bold),
+        subject.ui.color('Type', :bold),
       ]
 
       firewalls.items.each do |firewall|
@@ -48,9 +49,10 @@ describe Chef::Knife::IonoscloudFirewallList do
         firewall_list << firewall.properties.port_range_end.to_s
         firewall_list << firewall.properties.icmp_type.to_s
         firewall_list << firewall.properties.icmp_code.to_s
+        firewall_list << firewall.properties.type.to_s
       end
 
-      expect(subject.ui).to receive(:list).with(firewall_list, :uneven_columns_across, 10)
+      expect(subject.ui).to receive(:list).with(firewall_list, :uneven_columns_across, 11)
 
       mock_call_api(
         subject,
@@ -59,7 +61,7 @@ describe Chef::Knife::IonoscloudFirewallList do
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/"\
                   "nics/#{subject_config[:nic_id]}/firewallrules",
-            operation: :'NicApi.datacenters_servers_nics_firewallrules_get',
+            operation: :'FirewallRulesApi.datacenters_servers_nics_firewallrules_get',
             return_type: 'FirewallRules',
             result: firewalls,
           },

data/spec/chef/knife/ionoscloud_firewall_update_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudFirewallUpdate do
   end
 
   describe '#run' do
-    it 'should call NicApi.datacenters_servers_nics_firewallrules_patch' do
+    it 'should call FirewallRulesApi.datacenters_servers_nics_firewallrules_patch' do
       firewall = firewall_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -37,6 +37,7 @@ describe Chef::Knife::IonoscloudFirewallUpdate do
 
       expect(subject).to receive(:puts).with("ID: #{firewall.id}")
       expect(subject).to receive(:puts).with("Name: #{subject_config[:name]}")
+      expect(subject).to receive(:puts).with("Type: #{firewall.properties.type}")
       expect(subject).to receive(:puts).with("Protocol: #{subject_config[:protocol]}")
       expect(subject).to receive(:puts).with("Source MAC: #{subject_config[:source_mac]}")
       expect(subject).to receive(:puts).with("Source IP: #{subject_config[:source_ip]}")
@@ -76,7 +77,7 @@ describe Chef::Knife::IonoscloudFirewallUpdate do
             method: 'PATCH',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/"\
             "nics/#{subject_config[:nic_id]}/firewallrules/#{firewall.id}",
-            operation: :'NicApi.datacenters_servers_nics_firewallrules_patch',
+            operation: :'FirewallRulesApi.datacenters_servers_nics_firewallrules_patch',
             return_type: 'FirewallRule',
             body: expected_body,
             result: firewall,
@@ -85,7 +86,7 @@ describe Chef::Knife::IonoscloudFirewallUpdate do
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/"\
                   "nics/#{subject_config[:nic_id]}/firewallrules/#{firewall.id}",
-            operation: :'NicApi.datacenters_servers_nics_firewallrules_find_by_id',
+            operation: :'FirewallRulesApi.datacenters_servers_nics_firewallrules_find_by_id',
             return_type: 'FirewallRule',
             result: firewall,
           },