knife-ionoscloud 5.1.2 → 6.0.0.alpha.1

data/lib/chef/knife/ionoscloud_composite_server_create.rb

@@ -87,6 +87,20 @@ class Chef
               long: '--ssh-keys SSHKEY1,SSHKEY2,...',
               description: 'A list of public SSH keys to include'
 
+      option :backupunit_id,
+              short: '-B BACKUPUNIT_ID',
+              long: '--backupunit BACKUPUNIT_ID',
+              description: 'The uuid of the Backup Unit that user has access to. The property is immutable and is only allowed '\
+              'to be set on a new volume creation. It is mandatory to provide either \'public image\' or \'imageAlias\' in '\
+              'conjunction with this property.'
+
+      option :user_data,
+              short: '-u USER_DATA',
+              long: '--user-data USER_DATA',
+              description: 'The cloud-init configuration for the volume as base64 encoded string. The property is '\
+              'immutable and is only allowed to be set on a new volume creation. It is mandatory to provide either \'public image\' '\
+              'or \'imageAlias\' that has cloud-init compatibility in conjunction with this property.'
+
       option :nic_name,
               long: '--nic-name NAME',
               description: 'Name of the NIC'
@@ -108,9 +122,11 @@ class Chef
               long: '--lan ID',
               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'
+      option :firewall_type,
+              long: '--firewall-type FIREWALL_TYPE',
+              description: 'The type of firewall rules that will be allowed on the NIC. If it is not specified it will take the '\
+              'default value INGRESS',
+              default: 'INGRESS'
 
       attr_reader :description, :required_options
 
@@ -125,11 +141,10 @@ class Chef
 
       def run
         $stdout.sync = true
-        handle_extra_config
         validate_required_params(@required_options, config)
 
-        config[:ssh_keys] = config[:ssh_keys].split(',') if config[:ssh_keys] && config[:ssh_keys].instance_of?(String)
-        config[:ips] = config[:ips].split(',') if config[:ips] && config[:ips].instance_of?(String)
+        config[:ssh_keys] = config[:ssh_keys].split(',') if config[:ssh_keys]
+        config[:ips] = config[:ips].split(',') if config[:ips]
 
         print ui.color('Creating composite server...', :magenta).to_s
 
@@ -145,6 +160,8 @@ class Chef
             type: config[:type],
             licence_type: config[:licence_type],
             availability_zone: config[:volume_availability_zone],
+            backupunit_id: config[:backupunit_id],
+            user_data: config[:user_data],
           }.compact)
         )
 
@@ -154,7 +171,7 @@ class Chef
             ips: config[:ips],
             dhcp: config[:dhcp],
             lan: config[:lan],
-            nat: !config[:nat].nil?,
+            firewall_type: config[:firewall_type],
           }.compact)
         )
 
@@ -176,14 +193,26 @@ class Chef
           ),
         )
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        server_api = Ionoscloud::ServersApi.new(api_client)
 
         server, _, headers = server_api.datacenters_servers_post_with_http_info(config[:datacenter_id], server)
 
         dot = ui.color('.', :magenta)
         api_client.wait_for { print dot; is_done? get_request_id headers }
 
-        print_server(server_api.datacenters_servers_find_by_id(config[:datacenter_id], server.id))
+        server = server_api.datacenters_servers_find_by_id(config[:datacenter_id], server.id)
+
+        puts "\n"
+        puts "#{ui.color('ID', :cyan)}: #{server.id}"
+        puts "#{ui.color('Name', :cyan)}: #{server.properties.name}"
+        puts "#{ui.color('Cores', :cyan)}: #{server.properties.cores}"
+        puts "#{ui.color('CPU Family', :cyan)}: #{server.properties.cpu_family}"
+        puts "#{ui.color('Ram', :cyan)}: #{server.properties.ram}"
+        puts "#{ui.color('Availability Zone', :cyan)}: #{server.properties.availability_zone}"
+        puts "#{ui.color('Boot Volume', :cyan)}: #{server.properties.boot_volume ? server.properties.boot_volume.id : ''}"
+        puts "#{ui.color('Boot CDROM', :cyan)}: #{server.properties.boot_cdrom ? server.properties.boot_cdrom.id : ''}"
+
+        puts 'done'
       end
     end
   end

data/lib/chef/knife/ionoscloud_contract_list.rb

@@ -18,33 +18,41 @@ class Chef
 
       def run
         $stdout.sync = true
-        handle_extra_config
         validate_required_params(@required_options, config)
 
-        contract = Ionoscloud::ContractApi.new(api_client).contracts_get()
+        contracts = Ionoscloud::ContractResourcesApi.new(api_client).contracts_get()
 
-        puts "#{ui.color('Contract Type', :cyan)}: #{contract.type}"
-        puts "#{ui.color('Contract Owner', :cyan)}: #{contract.properties.owner}"
-        puts "#{ui.color('Contract Number', :cyan)}: #{contract.properties.contract_number}"
-        puts "#{ui.color('Registration Domain', :cyan)}: #{contract.properties.reg_domain}"
-        puts "#{ui.color('Status', :cyan)}: #{contract.properties.status}"
-        puts "#{ui.color('Cores per contract', :cyan)}: #{contract.properties.resource_limits.cores_per_contract}"
-        puts "#{ui.color('Cores per server', :cyan)}: #{contract.properties.resource_limits.cores_per_server}"
-        puts "#{ui.color('Cores provisioned', :cyan)}: #{contract.properties.resource_limits.cores_provisioned}"
-        puts "#{ui.color('HDD limit per contract', :cyan)}: #{contract.properties.resource_limits.hdd_limit_per_contract}"
-        puts "#{ui.color('HDD limit per volume', :cyan)}: #{contract.properties.resource_limits.hdd_limit_per_volume}"
-        puts "#{ui.color('HDD volume provisioned', :cyan)}: #{contract.properties.resource_limits.hdd_volume_provisioned}"
-        puts "#{ui.color('RAM per contract', :cyan)}: #{contract.properties.resource_limits.ram_per_contract}"
-        puts "#{ui.color('RAM per server', :cyan)}: #{contract.properties.resource_limits.ram_per_server}"
-        puts "#{ui.color('RAM provisioned', :cyan)}: #{contract.properties.resource_limits.ram_provisioned}"
-        puts "#{ui.color('Reservable IPs', :cyan)}: #{contract.properties.resource_limits.reservable_ips}"
-        puts "#{ui.color('Reservable IPs in use', :cyan)}: #{contract.properties.resource_limits.reserved_ips_in_use}"
-        puts "#{ui.color('Reservable IPs on contract', :cyan)}: #{contract.properties.resource_limits.reserved_ips_on_contract}"
-        puts "#{ui.color('SSD limit per contract', :cyan)}: #{contract.properties.resource_limits.ssd_limit_per_contract}"
-        puts "#{ui.color('SSD limit per volume', :cyan)}: #{contract.properties.resource_limits.ssd_limit_per_volume}"
-        puts "#{ui.color('SSD volume provisioned', :cyan)}: #{contract.properties.resource_limits.ssd_volume_provisioned}"
-        puts "#{ui.color('K8s Cluster Limit Total', :cyan)}: #{contract.properties.resource_limits.k8s_cluster_limit_total}"
-        puts "#{ui.color('K8s Clusters provisioned', :cyan)}: #{contract.properties.resource_limits.k8s_clusters_provisioned}"
+        contracts.items.each do
+          |contract|
+          puts "#{ui.color('Contract Type', :cyan)}: #{contract.type}"
+          puts "#{ui.color('Contract Owner', :cyan)}: #{contract.properties.owner}"
+          puts "#{ui.color('Contract Number', :cyan)}: #{contract.properties.contract_number}"
+          puts "#{ui.color('Registration Domain', :cyan)}: #{contract.properties.reg_domain}"
+          puts "#{ui.color('Status', :cyan)}: #{contract.properties.status}"
+          puts "#{ui.color('Cores per contract', :cyan)}: #{contract.properties.resource_limits.cores_per_contract}"
+          puts "#{ui.color('Cores per server', :cyan)}: #{contract.properties.resource_limits.cores_per_server}"
+          puts "#{ui.color('Cores provisioned', :cyan)}: #{contract.properties.resource_limits.cores_provisioned}"
+          puts "#{ui.color('HDD limit per contract', :cyan)}: #{contract.properties.resource_limits.hdd_limit_per_contract}"
+          puts "#{ui.color('HDD limit per volume', :cyan)}: #{contract.properties.resource_limits.hdd_limit_per_volume}"
+          puts "#{ui.color('HDD volume provisioned', :cyan)}: #{contract.properties.resource_limits.hdd_volume_provisioned}"
+          puts "#{ui.color('RAM per contract', :cyan)}: #{contract.properties.resource_limits.ram_per_contract}"
+          puts "#{ui.color('RAM per server', :cyan)}: #{contract.properties.resource_limits.ram_per_server}"
+          puts "#{ui.color('RAM provisioned', :cyan)}: #{contract.properties.resource_limits.ram_provisioned}"
+          puts "#{ui.color('Reservable IPs', :cyan)}: #{contract.properties.resource_limits.reservable_ips}"
+          puts "#{ui.color('Reservable IPs in use', :cyan)}: #{contract.properties.resource_limits.reserved_ips_in_use}"
+          puts "#{ui.color('Reservable IPs on contract', :cyan)}: #{contract.properties.resource_limits.reserved_ips_on_contract}"
+          puts "#{ui.color('SSD limit per contract', :cyan)}: #{contract.properties.resource_limits.ssd_limit_per_contract}"
+          puts "#{ui.color('SSD limit per volume', :cyan)}: #{contract.properties.resource_limits.ssd_limit_per_volume}"
+          puts "#{ui.color('SSD volume provisioned', :cyan)}: #{contract.properties.resource_limits.ssd_volume_provisioned}"
+          puts "#{ui.color('DAS volume provisioned', :cyan)}: #{contract.properties.resource_limits.das_volume_provisioned}"
+          puts "#{ui.color('K8s Cluster Limit Total', :cyan)}: #{contract.properties.resource_limits.k8s_cluster_limit_total}"
+          puts "#{ui.color('K8s Clusters provisioned', :cyan)}: #{contract.properties.resource_limits.k8s_clusters_provisioned}"
+          puts "#{ui.color('NLB total limit', :cyan)}: #{contract.properties.resource_limits.nlb_limit_total}"
+          puts "#{ui.color('NLBs provisioned', :cyan)}: #{contract.properties.resource_limits.nlb_provisioned}"
+          puts "#{ui.color('NAT gateway total limit', :cyan)}: #{contract.properties.resource_limits.nat_gateway_limit_total}"
+          puts "#{ui.color('NAT gateways provisioned', :cyan)}: #{contract.properties.resource_limits.nat_gateway_provisioned}"
+          puts "\n"
+        end
       end
     end
   end

data/lib/chef/knife/ionoscloud_cube_server_create.rb

@@ -0,0 +1,215 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudCubeServerCreate < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud cube server create (options)'
+
+      option :datacenter_id,
+              short: '-D DATACENTER_ID',
+              long: '--datacenter-id DATACENTER_ID',
+              description: 'Name of the virtual datacenter'
+
+      option :name,
+              short: '-n NAME',
+              long: '--name NAME',
+              description: '(required) Name of the server'
+
+      option :template,
+              long: '--template TEMPLATE_UUID',
+              description: 'The UUID of the template for creating a CUBE server; the available templates for CUBE servers can be found on the templates resource'
+
+      option :cpu_family,
+              short: '-f CPU_FAMILY',
+              long: '--cpu-family CPU_FAMILY',
+              description: 'The family of processor cores (INTEL_XEON or AMD_OPTERON)',
+              default: 'INTEL_SKYLAKE'
+
+      option :availability_zone,
+              short: '-a AVAILABILITY_ZONE',
+              long: '--availability-zone AVAILABILITY_ZONE',
+              description: 'The availability zone of the server',
+              default: 'AUTO'
+
+      option :volume_name,
+              long: '--volume-name NAME',
+              description: 'Name of the volume'
+
+      option :bus,
+              short: '-b BUS',
+              long: '--bus BUS',
+              description: 'The bus type of the volume (VIRTIO or IDE)'
+
+      option :image,
+              short: '-N ID',
+              long: '--image ID',
+              description: '(required) The image or snapshot ID'
+
+      option :licence_type,
+              short: '-l LICENCE',
+              long: '--licence-type LICENCE',
+              description: 'The licence type of the volume (LINUX, WINDOWS, WINDOWS2016, UNKNOWN, OTHER)'
+
+      option :image_password,
+              short: '-P PASSWORD',
+              long: '--image-password PASSWORD',
+              description: 'The password set on the image for the "root" or "Administrator" user'
+
+      option :ssh_keys,
+              short: '-K SSHKEY[,SSHKEY,...]',
+              long: '--ssh-keys SSHKEY1,SSHKEY2,...',
+              description: 'A list of public SSH keys to include'
+
+      option :backupunit_id,
+              short: '-B BACKUPUNIT_ID',
+              long: '--backupunit BACKUPUNIT_ID',
+              description: 'The uuid of the Backup Unit that user has access to. The property is immutable and is only allowed '\
+              'to be set on a new volume creation. It is mandatory to provide either \'public image\' or \'imageAlias\' in '\
+              'conjunction with this property.'
+
+      option :user_data,
+              short: '-u USER_DATA',
+              long: '--user-data USER_DATA',
+              description: 'The cloud-init configuration for the volume as base64 encoded string. The property is '\
+              'immutable and is only allowed to be set on a new volume creation. It is mandatory to provide either \'public image\' '\
+              'or \'imageAlias\' that has cloud-init compatibility in conjunction with this property.'
+
+      option :set_boot,
+              long: '--set-boot',
+              description: 'Whether to set the volume as the boot volume'
+
+      option :nic_name,
+              long: '--nic-name NAME',
+              description: 'Name of the NIC'
+
+      option :ips,
+              short: '-i IP[,IP,...]',
+              long: '--ips IP[,IP,...]',
+              description: 'IPs assigned to the NIC'
+
+      option :dhcp,
+              short: '-h',
+              long: '--dhcp',
+              boolean: true | false,
+              default: true,
+              description: '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'
+
+      option :firewall_type,
+              short: '-t FIREWALL_TYPE',
+              long: '--firewall-type FIREWALL_TYPE',
+              description: 'The type of firewall rules that will be allowed on the NIC. If it is not specified it will take the '\
+              'default value INGRESS',
+              default: 'INGRESS'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'This creates a new cube server with an attached volume and NIC in a specified virtual data center.'
+        @required_options = [
+          :datacenter_id, :name, :template, :ionoscloud_username, :ionoscloud_password,
+        ]
+      end
+
+      def run
+        $stdout.sync = true
+        validate_required_params(@required_options, config)
+
+        config[:ssh_keys] = config[:ssh_keys].split(',') if config[:ssh_keys]
+        config[:ips] = config[:ips].split(',') if config[:ips]
+
+        print ui.color('Creating cube server...', :magenta).to_s
+
+        volumes = [Ionoscloud::Volume.new(
+          properties: Ionoscloud::VolumeProperties.new({
+            name: config[:volume_name],
+            bus: config[:bus] || 'VIRTIO',
+            image: config[:image],
+            ssh_keys: config[:ssh_keys],
+            image_password: config[:image_password],
+            type: 'DAS',
+            licence_type: config[:licence_type],
+            backupunit_id: config[:backupunit_id],
+            user_data: config[:user_data],
+          }.compact)
+        )]
+
+        nics = []
+
+        if config[:nic_name] || config[:ips] || config[:dhcp] || config[:lan]
+          nics = [
+            Ionoscloud::Nic.new(
+              properties: Ionoscloud::NicProperties.new({
+                name: config[:nic_name],
+                ips: config[:ips],
+                dhcp: config[:dhcp],
+                lan: config[:lan],
+                firewall_type: config[:firewall_type],
+              }.compact)
+            )
+          ]
+        end
+
+        server = Ionoscloud::Server.new(
+          properties: Ionoscloud::ServerProperties.new({
+            name: config[:name],
+            type: 'CUBE',
+            template_uuid: config[:template],
+            cpu_family: config[:cpu_family],
+            ram: config[:ram],
+            availability_zone: config[:availability_zone],
+          }.compact),
+          entities: Ionoscloud::ServerEntities.new(
+            volumes: {
+               items: volumes,
+            },
+            nics: {
+              items: nics,
+            },
+          ),
+        )
+
+        server_api = Ionoscloud::ServersApi.new(api_client)
+
+        server, _, headers = server_api.datacenters_servers_post_with_http_info(config[:datacenter_id], server)
+
+        dot = ui.color('.', :magenta)
+        api_client.wait_for { print dot; is_done? get_request_id headers }
+
+        server = server_api.datacenters_servers_find_by_id(config[:datacenter_id], server.id, depth: 1)
+
+        if config[:set_boot]
+          changes = Ionoscloud::ServerProperties.new(boot_volume: { id: server.entities.volumes.items[0].id })
+          _, _, headers = server_api.datacenters_servers_patch_with_http_info(
+            config[:datacenter_id], server.id, changes,
+          )
+
+          api_client.wait_for { is_done? get_request_id headers }
+
+          server = server_api.datacenters_servers_find_by_id(config[:datacenter_id], server.id, depth: 1)
+        end
+
+        puts "\n"
+        puts "#{ui.color('ID', :cyan)}: #{server.id}"
+        puts "#{ui.color('Name', :cyan)}: #{server.properties.name}"
+        puts "#{ui.color('Type', :cyan)}: #{server.properties.type}"
+        puts "#{ui.color('Cores', :cyan)}: #{server.properties.cores}"
+        puts "#{ui.color('CPU Family', :cyan)}: #{server.properties.cpu_family}"
+        puts "#{ui.color('Ram', :cyan)}: #{server.properties.ram}"
+        puts "#{ui.color('Availability Zone', :cyan)}: #{server.properties.availability_zone}"
+        puts "#{ui.color('Boot Volume', :cyan)}: #{server.properties.boot_volume ? server.properties.boot_volume.id : ''}"
+        puts "#{ui.color('Boot CDROM', :cyan)}: #{server.properties.boot_cdrom ? server.properties.boot_cdrom.id : ''}"
+
+        puts 'done'
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_datacenter_create.rb

@@ -37,27 +37,29 @@ class Chef
 
       def run
         $stdout.sync = true
-        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Creating data center...', :magenta)}"
 
-        datacenter_api = Ionoscloud::DataCenterApi.new(api_client)
+        datacenter_api = Ionoscloud::DataCentersApi.new(api_client)
 
-        datacenter, _, headers  = datacenter_api.datacenters_post_with_http_info(
-          Ionoscloud::Datacenter.new(
-            properties: Ionoscloud::DatacenterProperties.new(
-              name: config[:name],
-              description: config[:description],
-              location: config[:location],
-            ),
-          ),
-        )
+        datacenter, _, headers  = datacenter_api.datacenters_post_with_http_info({
+          properties: {
+            name: config[:name],
+            description: config[:description],
+            location: config[:location],
+          }.compact,
+        })
 
         dot = ui.color('.', :magenta)
         api_client.wait_for { print dot; is_done? get_request_id headers }
 
-        print_datacenter(datacenter_api.datacenters_find_by_id(datacenter.id))
+        puts "\n"
+        puts "#{ui.color('ID', :cyan)}: #{datacenter.id}"
+        puts "#{ui.color('Name', :cyan)}: #{datacenter.properties.name}"
+        puts "#{ui.color('Description', :cyan)}: #{datacenter.properties.description}"
+        puts "#{ui.color('Location', :cyan)}: #{datacenter.properties.location}"
+        puts 'done'
       end
     end
   end

data/lib/chef/knife/ionoscloud_datacenter_delete.rb

@@ -20,10 +20,9 @@ class Chef
 
       def run
         $stdout.sync = true
-        handle_extra_config
         validate_required_params(@required_options, config)
 
-        datacenter_api = Ionoscloud::DataCenterApi.new(api_client)
+        datacenter_api = Ionoscloud::DataCentersApi.new(api_client)
 
         @name_args.each do |datacenter_id|
           begin
@@ -34,8 +33,14 @@ class Chef
             next
           end
 
-          print_datacenter(datacenter)
+          msg_pair('ID', datacenter.id)
+          msg_pair('Name', datacenter.properties.name)
+          msg_pair('Description', datacenter.properties.description)
+          msg_pair('Location', datacenter.properties.location)
+          msg_pair('Version', datacenter.properties.version)
+
           puts "\n"
+
           begin
             confirm('Do you really want to delete this data center')
           rescue SystemExit => exc

data/lib/chef/knife/ionoscloud_datacenter_list.rb

@@ -23,7 +23,6 @@ class Chef
 
       def run
         $stdout.sync = true
-        handle_extra_config
         validate_required_params(@required_options, config)
 
         datacenter_list = [
@@ -31,19 +30,19 @@ class Chef
           ui.color('Name', :bold),
           ui.color('Description', :bold),
           ui.color('Location', :bold),
+          ui.color('CPU Architectures', :bold),
           ui.color('Version', :bold),
-          ui.color('Sec Auth Protection', :bold),
         ]
 
-        datacenter_api = Ionoscloud::DataCenterApi.new(api_client)
+        datacenter_api = Ionoscloud::DataCentersApi.new(api_client)
 
         datacenter_api.datacenters_get({ depth: 1 }).items.each do |datacenter|
           datacenter_list << datacenter.id
           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
 
         puts ui.list(datacenter_list, :uneven_columns_across, 6)

data/lib/chef/knife/ionoscloud_firewall_create.rb

@@ -25,7 +25,7 @@ class Chef
       option :name,
               short: '-n NAME',
               long: '--name NAME',
-              description: 'Name of the Firewall Rule'
+              description: 'Name of the NIC'
 
       option :protocol,
               short: '-P PROTOCOL',
@@ -57,7 +57,6 @@ class Chef
               description: 'Defines the start range of the allowed port(s)'
 
       option :port_range_end,
-              short: '-t PORT',
               long: '--port-range-end PORT',
               description: 'Defines the end range of the allowed port(s)'
 
@@ -71,6 +70,12 @@ class Chef
               description: 'Defines the allowed code (from 0 to 254) if the' \
                           ' protocol ICMP is chosen; null allows all codes'
 
+      option :type,
+              short: '--t TYPE',
+              long: '--type TYPE',
+              description: 'The type of firewall rule. If is not specified, it will take the default value INGRESS',
+              default: 'INGRESS'
+
       attr_reader :description, :required_options
 
       def initialize(args = [])
@@ -82,7 +87,6 @@ class Chef
 
       def run
         $stdout.sync = true
-        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Creating firewall...', :magenta)}"
@@ -97,11 +101,12 @@ class Chef
           port_range_end: config[:port_range_end],
           icmp_type: config[:icmp_type],
           icmp_code: config[:icmp_code],
+          type: config[:type]
         }
 
-        nic_api = Ionoscloud::NicApi.new(api_client)
+        firewallrules_api = Ionoscloud::FirewallRulesApi.new(api_client)
 
-        firewall, _, headers = nic_api.datacenters_servers_nics_firewallrules_post_with_http_info(
+        firewall, _, headers = firewallrules_api.datacenters_servers_nics_firewallrules_post_with_http_info(
           config[:datacenter_id],
           config[:server_id],
           config[:nic_id],
@@ -111,14 +116,26 @@ class Chef
         dot = ui.color('.', :magenta)
         api_client.wait_for { print dot; is_done? get_request_id headers }
 
-        firewall = nic_api.datacenters_servers_nics_firewallrules_find_by_id(
+        firewall = firewallrules_api.datacenters_servers_nics_firewallrules_find_by_id(
           config[:datacenter_id],
           config[:server_id],
           config[:nic_id],
           firewall.id,
         )
 
-        print_firewall_rule(firewall)
+        puts "\n"
+        puts "#{ui.color('ID', :cyan)}: #{firewall.id}"
+        puts "#{ui.color('Name', :cyan)}: #{firewall.properties.name}"
+        puts "#{ui.color('Protocol', :cyan)}: #{firewall.properties.protocol}"
+        puts "#{ui.color('Source MAC', :cyan)}: #{firewall.properties.source_mac}"
+        puts "#{ui.color('Source IP', :cyan)}: #{firewall.properties.source_ip}"
+        puts "#{ui.color('Target IP', :cyan)}: #{firewall.properties.target_ip}"
+        puts "#{ui.color('Port Range Start', :cyan)}: #{firewall.properties.port_range_start}"
+        puts "#{ui.color('Port Range End', :cyan)}: #{firewall.properties.port_range_end}"
+        puts "#{ui.color('ICMP Type', :cyan)}: #{firewall.properties.icmp_type}"
+        puts "#{ui.color('ICMP Code', :cyan)}: #{firewall.properties.icmp_code}"
+        puts "#{ui.color('Type', :cyan)}: #{firewall.properties.type}"
+        puts 'done'
       end
     end
   end

data/lib/chef/knife/ionoscloud_firewall_delete.rb

@@ -33,14 +33,13 @@ class Chef
 
       def run
         $stdout.sync = true
-        handle_extra_config
         validate_required_params(@required_options, config)
 
-        nic_api = Ionoscloud::NicApi.new(api_client)
+        firewallrules_api = Ionoscloud::FirewallRulesApi.new(api_client)
 
         @name_args.each do |firewall_id|
           begin
-            firewall = nic_api.datacenters_servers_nics_firewallrules_find_by_id(
+            firewall = firewallrules_api.datacenters_servers_nics_firewallrules_find_by_id(
               config[:datacenter_id], config[:server_id], config[:nic_id], firewall_id,
             )
           rescue Ionoscloud::ApiError => err
@@ -49,8 +48,17 @@ class Chef
             next
           end
 
-          print_firewall_rule(firewall)
-          puts "\n"
+          msg_pair('ID', firewall.id)
+          msg_pair('Name', firewall.properties.name)
+          msg_pair('Protocol', firewall.properties.protocol)
+          msg_pair('Source MAC', firewall.properties.source_mac)
+          msg_pair('Source IP', firewall.properties.source_ip)
+          msg_pair('Target IP', firewall.properties.target_ip)
+          msg_pair('Port Range Start', firewall.properties.port_range_start)
+          msg_pair('Port Range End', firewall.properties.port_range_end)
+          msg_pair('ICMP Type', firewall.properties.icmp_type)
+          msg_pair('ICMP Code', firewall.properties.icmp_code)
+          msg_pair('Type', firewall.properties.type)
 
           begin
             confirm('Do you really want to delete this firewall rule')
@@ -58,7 +66,7 @@ class Chef
             next
           end
 
-          _, _, headers = nic_api.datacenters_servers_nics_firewallrules_delete_with_http_info(
+          _, _, headers = firewallrules_api.datacenters_servers_nics_firewallrules_delete_with_http_info(
             config[:datacenter_id], config[:server_id], config[:nic_id], firewall_id,
           )
           ui.warn("Deleted Firewall rule #{firewall.id}. Request ID: #{get_request_id headers}")

data/lib/chef/knife/ionoscloud_firewall_list.rb

@@ -33,7 +33,6 @@ class Chef
 
       def run
         $stdout.sync = true
-        handle_extra_config
         validate_required_params(@required_options, config)
 
         firewall_list = [
@@ -47,11 +46,12 @@ class Chef
           ui.color('Port Range End', :bold),
           ui.color('ICMP Type', :bold),
           ui.color('ICMP CODE', :bold),
+          ui.color('Type', :bold),
         ]
 
-        nic_api = Ionoscloud::NicApi.new(api_client)
+        firewallrules_api = Ionoscloud::FirewallRulesApi.new(api_client)
 
-        nic_api.datacenters_servers_nics_firewallrules_get(
+        firewallrules_api.datacenters_servers_nics_firewallrules_get(
           config[:datacenter_id], config[:server_id], config[:nic_id], { depth: 1 }
         ).items.each do |firewall|
           firewall_list << firewall.id
@@ -64,9 +64,10 @@ class Chef
           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
 
-        puts ui.list(firewall_list, :uneven_columns_across, 10)
+        puts ui.list(firewall_list, :uneven_columns_across, 11)
       end
     end
   end