knife-ionoscloud 5.1.2 → 6.0.0

data/lib/chef/knife/ionoscloud_volume_create.rb

@@ -25,18 +25,13 @@ class Chef
       option :bus,
               short: '-b BUS',
               long: '--bus BUS',
-              description: 'The bus type of the volume (VIRTIO or IDE)',
-              default: 'VIRTIO'
+              description: 'The bus type of the volume (VIRTIO or IDE)'
 
       option :image,
               short: '-N ID',
               long: '--image ID',
               description: 'The image or snapshot ID'
 
-      option :image_alias,
-              long: '--image-alias IMAGE_ALIAS',
-              description: '(required) The image alias'
-
       option :image_password,
               short: '-P PASSWORD',
               long: '--image-password PASSWORD',
@@ -45,7 +40,7 @@ class Chef
       option :type,
               short: '-t TYPE',
               long: '--type TYPE',
-              description: 'The disk type (HDD OR SSD)'
+              description: 'The disk type (HDD, SSD, SSD Standard, SSD Premium, DAS)'
 
       option :licence_type,
               short: '-l LICENCE',
@@ -76,30 +71,6 @@ class Chef
               '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 :cpu_hot_plug,
-              long: '--cpu-hot-plug CPU_HOT_PLUG',
-              description: 'The licence type of the volume (LINUX, WINDOWS, UNKNOWN, OTHER)'
-
-      option :ram_hot_plug,
-              long: '--ram-hot-plug RAM_HOT_PLUG',
-              description: 'The licence type of the volume (LINUX, WINDOWS, UNKNOWN, OTHER)'
-
-      option :nic_hot_plug,
-              long: '--nic-hot-plug NIC_HOT_PLUG',
-              description: 'The licence type of the volume (LINUX, WINDOWS, UNKNOWN, OTHER)'
-
-      option :nic_hot_unplug,
-              long: '--nic-hot-unplug NIC_HOT_UNPLUG',
-              description: 'The licence type of the volume (LINUX, WINDOWS, UNKNOWN, OTHER)'
-
-      option :disc_virtio_hot_plug,
-              long: '--disc-virtio-hot_plug DISC_VIRTIO_HOT_PLUG',
-              description: 'The licence type of the volume (LINUX, WINDOWS, UNKNOWN, OTHER)'
-
-      option :disc_virtio_hot_unplug,
-              long: '--disc-virtio-hot_unplug DISC_VIRTIO_HOT_UNPLUG',
-              description: 'The licence type of the volume (LINUX, WINDOWS, UNKNOWN, OTHER)'
-
       attr_reader :description, :required_options
 
       def initialize(args = [])
@@ -119,32 +90,25 @@ class Chef
 
         print "#{ui.color('Creating volume...', :magenta)}"
 
-        volume_api = Ionoscloud::VolumeApi.new(api_client)
+        volume_api = Ionoscloud::VolumesApi.new(api_client)
+
+        volume_properties = {
+          name: config[:name],
+          size: config[:size],
+          bus: config[:bus] || 'VIRTIO',
+          type: config[:type],
+          licence_type: config[:licence_type],
+          image: config[:image],
+          ssh_keys: config[:ssh_keys],
+          image_password: config[:image_password],
+          availability_zone: config[:availability_zone],
+          backupunit_id: config[:backupunit_id],
+          user_data: config[:user_data],
+        }.compact
 
         volume, _, headers = volume_api.datacenters_volumes_post_with_http_info(
           config[:datacenter_id],
-          Ionoscloud::Volume.new(
-            properties: Ionoscloud::VolumeProperties.new(
-              name: config[:name],
-              size: config[:size],
-              bus: config[:bus],
-              type: config[:type],
-              licence_type: config[:licence_type],
-              image: config[:image],
-              image_alias: config[:image_alias],
-              ssh_keys: config[:ssh_keys],
-              image_password: config[:image_password],
-              availability_zone: config[:availability_zone],
-              backupunit_id: config[:backupunit_id],
-              user_data: config[:user_data],
-              cpu_hot_plug: (config.key?(:cpu_hot_plug) ? config[:cpu_hot_plug].to_s.downcase == 'true' : nil),
-              ram_hot_plug: (config.key?(:ram_hot_plug) ? config[:ram_hot_plug].to_s.downcase == 'true' : nil),
-              nic_hot_plug: (config.key?(:nic_hot_plug) ? config[:nic_hot_plug].to_s.downcase == 'true' : nil),
-              nic_hot_unplug: (config.key?(:nic_hot_unplug) ? config[:nic_hot_unplug].to_s.downcase == 'true' : nil),
-              disc_virtio_hot_plug: (config.key?(:disc_virtio_hot_plug) ? config[:disc_virtio_hot_plug].to_s.downcase == 'true' : nil),
-              disc_virtio_hot_unplug: (config.key?(:disc_virtio_hot_unplug) ? config[:disc_virtio_hot_unplug].to_s.downcase == 'true' : nil),
-            ),
-          ),
+          Ionoscloud::Volume.new(properties: Ionoscloud::VolumeProperties.new(**volume_properties)),
         )
 
         dot = ui.color('.', :magenta)

data/lib/chef/knife/ionoscloud_volume_delete.rb

@@ -27,7 +27,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        volume_api = Ionoscloud::VolumeApi.new(api_client)
+        volume_api = Ionoscloud::VolumesApi.new(api_client)
 
         @name_args.each do |volume_id|
           begin
@@ -42,6 +42,7 @@ class Chef
           end
 
           print_volume(volume)
+          puts "\n"
 
           begin
             confirm('Do you really want to delete this volume')

data/lib/chef/knife/ionoscloud_volume_detach.rb

@@ -34,7 +34,7 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        server_api = Ionoscloud::ServerApi.new(api_client)
+        server_api = Ionoscloud::ServersApi.new(api_client)
 
         @name_args.each do |volume_id|
           begin
@@ -49,7 +49,14 @@ class Chef
             next
           end
 
-          print_volume(volume)
+          msg_pair('ID', volume.id)
+          msg_pair('Name', volume.properties.name)
+          msg_pair('Size', volume.properties.size)
+          msg_pair('Bus', volume.properties.bus)
+          msg_pair('Image', volume.properties.image)
+          msg_pair('Type', volume.properties.type)
+          msg_pair('Licence Type', volume.properties.licence_type)
+          msg_pair('Zone', volume.properties.availability_zone)
 
           begin
             confirm('Do you really want to detach this volume')

data/lib/chef/knife/ionoscloud_volume_get.rb

@@ -29,7 +29,7 @@ class Chef
         $stdout.sync = true
         handle_extra_config
         validate_required_params(@required_options, config)
-        print_volume(Ionoscloud::VolumeApi.new(api_client).datacenters_volumes_find_by_id(config[:datacenter_id], config[:volume_id]))
+        print_volume(Ionoscloud::VolumesApi.new(api_client).datacenters_volumes_find_by_id(config[:datacenter_id], config[:volume_id]))
       end
     end
   end

data/lib/chef/knife/ionoscloud_volume_list.rb

@@ -46,10 +46,10 @@ class Chef
         opts = { depth: 1 }
 
         if config[:server_id]
-          server_api = Ionoscloud::ServerApi.new(api_client)
+          server_api = Ionoscloud::ServersApi.new(api_client)
           volumes = server_api.datacenters_servers_volumes_get(config[:datacenter_id], config[:server_id], opts)
         else
-          volume_api = Ionoscloud::VolumeApi.new(api_client)
+          volume_api = Ionoscloud::VolumesApi.new(api_client)
           volumes = volume_api.datacenters_volumes_get(config[:datacenter_id], opts)
         end
 

data/lib/chef/knife/ionoscloud_volume_update.rb

@@ -72,12 +72,12 @@ class Chef
         handle_extra_config
         validate_required_params(@required_options, config)
 
-        volume = Ionoscloud::VolumeApi.new(api_client)
+        volume_api = Ionoscloud::VolumesApi.new(api_client)
 
         if @updatable_fields.map { |el| config[el] }.any?
           print "#{ui.color('Updating Volume...', :magenta)}"
 
-          _, _, headers  = volume.datacenters_volumes_patch_with_http_info(
+          _, _, headers  = volume_api.datacenters_volumes_patch_with_http_info(
             config[:datacenter_id],
             config[:volume_id],
             Ionoscloud::VolumeProperties.new(
@@ -99,7 +99,7 @@ class Chef
           ui.warn("Nothing to update, please set one of the attributes #{@updatable_fields}.")
         end
 
-        print_volume(volume.datacenters_volumes_find_by_id(config[:datacenter_id], config[:volume_id]))
+        print_volume(volume_api.datacenters_volumes_find_by_id(config[:datacenter_id], config[:volume_id]))
       end
     end
   end

data/lib/knife-ionoscloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ionoscloud
-    VERSION = '5.1.2'
+    VERSION = '6.0.0'
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

data/spec/chef/knife/ionoscloud_backupunit_create_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudBackupunitCreate do
   end
 
   describe '#run' do
-    it 'should call BackupUnitApi.backupunits_post with the expected arguments and output based on what it receives' do
+    it 'should call BackupUnitsApi.backupunits_post with the expected arguments and output based on what it receives' do
       backupunit = backupunit_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -33,7 +33,7 @@ describe Chef::Knife::IonoscloudBackupunitCreate do
           {
             method: 'POST',
             path: '/backupunits',
-            operation: :'BackupUnitApi.backupunits_post',
+            operation: :'BackupUnitsApi.backupunits_post',
             return_type: 'BackupUnit',
             body: { properties: backupunit.properties.to_hash },
             result: backupunit,

data/spec/chef/knife/ionoscloud_backupunit_delete_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudBackupunitDelete do
   end
 
   describe '#run' do
-    it 'should call BackupUnitApi.backupunits_delete when the ID is valid' do
+    it 'should call BackupUnitsApi.backupunits_delete when the ID is valid' do
       backupunit = backupunit_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -36,14 +36,14 @@ describe Chef::Knife::IonoscloudBackupunitDelete do
           {
             method: 'GET',
             path: "/backupunits/#{backupunit.id}",
-            operation: :'BackupUnitApi.backupunits_find_by_id',
+            operation: :'BackupUnitsApi.backupunits_find_by_id',
             return_type: 'BackupUnit',
             result: backupunit,
           },
           {
             method: 'DELETE',
             path: "/backupunits/#{backupunit.id}",
-            operation: :'BackupUnitApi.backupunits_delete',
+            operation: :'BackupUnitsApi.backupunits_delete',
           },
         ],
       )
@@ -51,7 +51,7 @@ describe Chef::Knife::IonoscloudBackupunitDelete do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should not call BackupUnitApi.backupunits_delete when the ID is not valid' do
+    it 'should not call BackupUnitsApi.backupunits_delete when the ID is not valid' do
       backup_unit = 'invalid_id'
       subject_config = {
         ionoscloud_username: 'email',
@@ -70,7 +70,7 @@ describe Chef::Knife::IonoscloudBackupunitDelete do
           {
             method: 'GET',
             path: "/backupunits/#{backup_unit}",
-            operation: :'BackupUnitApi.backupunits_find_by_id',
+            operation: :'BackupUnitsApi.backupunits_find_by_id',
             return_type: 'BackupUnit',
             exception: Ionoscloud::ApiError.new(code: 404),
           },

data/spec/chef/knife/ionoscloud_backupunit_get_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudBackupunitGet do
   end
 
   describe '#run' do
-    it 'should call BackupUnitApi.backupunits_find_by_id' do
+    it 'should call BackupUnitsApi.backupunits_find_by_id' do
       backupunit = backupunit_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -34,7 +34,7 @@ describe Chef::Knife::IonoscloudBackupunitGet do
           {
             method: 'GET',
             path: "/backupunits/#{backupunit.id}",
-            operation: :'BackupUnitApi.backupunits_find_by_id',
+            operation: :'BackupUnitsApi.backupunits_find_by_id',
             return_type: 'BackupUnit',
             result: backupunit,
           },

data/spec/chef/knife/ionoscloud_backupunit_list_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Knife::IonoscloudBackupunitList do
           {
             method: 'GET',
             path: '/backupunits',
-            operation: :'BackupUnitApi.backupunits_get',
+            operation: :'BackupUnitsApi.backupunits_get',
             return_type: 'BackupUnits',
             result: backupunits,
           },

data/spec/chef/knife/ionoscloud_backupunit_ssourl_spec.rb

@@ -7,7 +7,7 @@ describe Chef::Knife::IonoscloudBackupunitSsourl do
   subject { Chef::Knife::IonoscloudBackupunitSsourl.new }
 
   describe '#run' do
-    it 'should call BackupUnitApi.backupunits_ssourl_get and output the received url when the user ID is valid' do
+    it 'should call BackupUnitsApi.backupunits_ssourl_get and output the received url when the user ID is valid' do
       backupunit = backupunit_mock
       backupunit_sso = backupunit_sso_mock
       subject_config = {
@@ -27,7 +27,7 @@ describe Chef::Knife::IonoscloudBackupunitSsourl do
           {
             method: 'GET',
             path: "/backupunits/#{backupunit.id}/ssourl",
-            operation: :'BackupUnitApi.backupunits_ssourl_get',
+            operation: :'BackupUnitsApi.backupunits_ssourl_get',
             return_type: 'BackupUnitSSO',
             result: backupunit_sso,
           },
@@ -59,7 +59,7 @@ describe Chef::Knife::IonoscloudBackupunitSsourl do
           {
             method: 'GET',
             path: "/backupunits/#{backupunit_id}/ssourl",
-            operation: :'BackupUnitApi.backupunits_ssourl_get',
+            operation: :'BackupUnitsApi.backupunits_ssourl_get',
             return_type: 'BackupUnitSSO',
             exception: Ionoscloud::ApiError.new(code: 404),
           },

data/spec/chef/knife/ionoscloud_backupunit_update_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudBackupunitUpdate do
   end
 
   describe '#run' do
-    it 'should call BackupUnitApi.backupunits_patch' do
+    it 'should call BackupUnitsApi.backupunits_patch' do
       backupunit = backupunit_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -39,7 +39,7 @@ describe Chef::Knife::IonoscloudBackupunitUpdate do
           {
             method: 'PATCH',
             path: "/backupunits/#{backupunit.id}",
-            operation: :'BackupUnitApi.backupunits_patch',
+            operation: :'BackupUnitsApi.backupunits_patch',
             return_type: 'BackupUnit',
             body: { email: subject_config[:email], password: subject_config[:password] },
             result: backupunit,
@@ -47,7 +47,7 @@ describe Chef::Knife::IonoscloudBackupunitUpdate do
           {
             method: 'GET',
             path: "/backupunits/#{backupunit.id}",
-            operation: :'BackupUnitApi.backupunits_find_by_id',
+            operation: :'BackupUnitsApi.backupunits_find_by_id',
             return_type: 'BackupUnit',
             result: backupunit,
           },

data/spec/chef/knife/ionoscloud_base_spec.rb

@@ -27,7 +27,7 @@ describe Chef::Knife::IonoscloudBaseTest do
           {
             method: 'GET',
             path: "/requests/#{request_id}/status",
-            operation: :'RequestApi.requests_status_get',
+            operation: :'RequestsApi.requests_status_get',
             return_type: 'RequestStatus',
             result: request_status,
           },
@@ -47,7 +47,7 @@ describe Chef::Knife::IonoscloudBaseTest do
           {
             method: 'GET',
             path: "/requests/#{request_id}/status",
-            operation: :'RequestApi.requests_status_get',
+            operation: :'RequestsApi.requests_status_get',
             return_type: 'RequestStatus',
             result: request_status,
           },
@@ -67,7 +67,7 @@ describe Chef::Knife::IonoscloudBaseTest do
           {
             method: 'GET',
             path: "/requests/#{request_id}/status",
-            operation: :'RequestApi.requests_status_get',
+            operation: :'RequestsApi.requests_status_get',
             return_type: 'RequestStatus',
             result: request_status,
           },
@@ -89,7 +89,7 @@ describe Chef::Knife::IonoscloudBaseTest do
           {
             method: 'GET',
             path: "/requests/#{request_id}/status",
-            operation: :'RequestApi.requests_status_get',
+            operation: :'RequestsApi.requests_status_get',
             return_type: 'RequestStatus',
             result: request_status,
           },

data/spec/chef/knife/ionoscloud_composite_server_create_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudCompositeServerCreate do
   end
 
   describe '#run' do
-    it 'should call ServerApi.datacenters_servers_post with the expected arguments and output based on what it receives' do
+    it 'should call ServersApi.datacenters_servers_post with the expected arguments and output based on what it receives' do
       server = server_mock({ volumes: Ionoscloud::Volumes.new(items: [volume_mock]), nics: Ionoscloud::Nics.new(items: [nic_mock]) })
       subject_config = {
         ionoscloud_username: 'email',
@@ -30,15 +30,16 @@ describe Chef::Knife::IonoscloudCompositeServerCreate do
         type: server.entities.volumes.items.first.properties.type,
         bus: server.entities.volumes.items.first.properties.bus,
         volume_availability_zone: server.entities.volumes.items.first.properties.availability_zone,
-        licence_type: server.entities.volumes.items.first.properties.licence_type,
-        image_alias: 'debian:latest',
+        image: server.entities.volumes.items.first.properties.image,
+        backupunit_id: server.entities.volumes.items.first.properties.backupunit_id,
+        user_data: server.entities.volumes.items.first.properties.user_data,
         image_password: 'K3tTj8G14a3EgKyNeeiY',
 
         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(','),
-        nat: server.entities.nics.items.first.properties.nat,
+        firewall_type: server.entities.nics.items.first.properties.firewall_type,
       }
 
       subject_config.each { |key, value| subject.config[key] = value }
@@ -56,13 +57,15 @@ describe Chef::Knife::IonoscloudCompositeServerCreate do
 
       expected_entities = server.entities.to_hash
       expected_entities[:volumes][:items][0].delete(:id)
-      expected_entities[:volumes][:items][0][:properties].delete(:image)
       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][:imageAlias] = subject_config[:image_alias]
+      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]
 
       mock_wait_for(subject)
@@ -72,7 +75,7 @@ describe Chef::Knife::IonoscloudCompositeServerCreate do
           {
             method: 'POST',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers",
-            operation: :'ServerApi.datacenters_servers_post',
+            operation: :'ServersApi.datacenters_servers_post',
             return_type: 'Server',
             body: { properties: expected_properties, entities: expected_entities },
             result: server,
@@ -80,7 +83,7 @@ describe Chef::Knife::IonoscloudCompositeServerCreate do
           {
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{server.id}",
-            operation: :'ServerApi.datacenters_servers_find_by_id',
+            operation: :'ServersApi.datacenters_servers_find_by_id',
             return_type: 'Server',
             result: server,
           },

data/spec/chef/knife/ionoscloud_contract_list_spec.rb

@@ -12,8 +12,8 @@ describe Chef::Knife::IonoscloudContractList do
   end
 
   describe '#run' do
-    it 'should call ContractApi.contracts_get' do
-      contract = contract_mock
+    it 'should call ContractResourcesApi.contracts_get' do
+      contracts = contracts_mock
       subject_config = {
         ionoscloud_username: 'email',
         ionoscloud_password: 'password',
@@ -21,28 +21,33 @@ describe Chef::Knife::IonoscloudContractList do
 
       subject_config.each { |key, value| subject.config[key] = value }
 
-      expect(subject).to receive(:puts).with("Contract Type: #{contract.type}")
-      expect(subject).to receive(:puts).with("Contract Owner: #{contract.properties.owner}")
-      expect(subject).to receive(:puts).with("Contract Number: #{contract.properties.contract_number}")
-      expect(subject).to receive(:puts).with("Registration Domain: #{contract.properties.reg_domain}")
-      expect(subject).to receive(:puts).with("Status: #{contract.properties.status}")
-      expect(subject).to receive(:puts).with("Cores per contract: #{contract.properties.resource_limits.cores_per_contract}")
-      expect(subject).to receive(:puts).with("Cores per server: #{contract.properties.resource_limits.cores_per_server}")
-      expect(subject).to receive(:puts).with("Cores provisioned: #{contract.properties.resource_limits.cores_provisioned}")
-      expect(subject).to receive(:puts).with("HDD limit per contract: #{contract.properties.resource_limits.hdd_limit_per_contract}")
-      expect(subject).to receive(:puts).with("HDD limit per volume: #{contract.properties.resource_limits.hdd_limit_per_volume}")
-      expect(subject).to receive(:puts).with("HDD volume provisioned: #{contract.properties.resource_limits.hdd_volume_provisioned}")
-      expect(subject).to receive(:puts).with("RAM per contract: #{contract.properties.resource_limits.ram_per_contract}")
-      expect(subject).to receive(:puts).with("RAM per server: #{contract.properties.resource_limits.ram_per_server}")
-      expect(subject).to receive(:puts).with("RAM provisioned: #{contract.properties.resource_limits.ram_provisioned}")
-      expect(subject).to receive(:puts).with("Reservable IPs: #{contract.properties.resource_limits.reservable_ips}")
-      expect(subject).to receive(:puts).with("Reservable IPs in use: #{contract.properties.resource_limits.reserved_ips_in_use}")
-      expect(subject).to receive(:puts).with("Reservable IPs on contract: #{contract.properties.resource_limits.reserved_ips_on_contract}")
-      expect(subject).to receive(:puts).with("SSD limit per contract: #{contract.properties.resource_limits.ssd_limit_per_contract}")
-      expect(subject).to receive(:puts).with("SSD limit per volume: #{contract.properties.resource_limits.ssd_limit_per_volume}")
-      expect(subject).to receive(:puts).with("SSD volume provisioned: #{contract.properties.resource_limits.ssd_volume_provisioned}")
-      expect(subject).to receive(:puts).with("K8s Cluster Limit Total: #{contract.properties.resource_limits.k8s_cluster_limit_total}")
-      expect(subject).to receive(:puts).with("K8s Clusters provisioned: #{contract.properties.resource_limits.k8s_clusters_provisioned}")
+      expect(subject).to receive(:puts).with("Contract Type: #{contracts.items.first.type}")
+      expect(subject).to receive(:puts).with("Contract Owner: #{contracts.items.first.properties.owner}")
+      expect(subject).to receive(:puts).with("Contract Number: #{contracts.items.first.properties.contract_number}")
+      expect(subject).to receive(:puts).with("Registration Domain: #{contracts.items.first.properties.reg_domain}")
+      expect(subject).to receive(:puts).with("Status: #{contracts.items.first.properties.status}")
+      expect(subject).to receive(:puts).with("Cores per contract: #{contracts.items.first.properties.resource_limits.cores_per_contract}")
+      expect(subject).to receive(:puts).with("Cores per server: #{contracts.items.first.properties.resource_limits.cores_per_server}")
+      expect(subject).to receive(:puts).with("Cores provisioned: #{contracts.items.first.properties.resource_limits.cores_provisioned}")
+      expect(subject).to receive(:puts).with("HDD limit per contract: #{contracts.items.first.properties.resource_limits.hdd_limit_per_contract}")
+      expect(subject).to receive(:puts).with("HDD limit per volume: #{contracts.items.first.properties.resource_limits.hdd_limit_per_volume}")
+      expect(subject).to receive(:puts).with("HDD volume provisioned: #{contracts.items.first.properties.resource_limits.hdd_volume_provisioned}")
+      expect(subject).to receive(:puts).with("RAM per contract: #{contracts.items.first.properties.resource_limits.ram_per_contract}")
+      expect(subject).to receive(:puts).with("RAM per server: #{contracts.items.first.properties.resource_limits.ram_per_server}")
+      expect(subject).to receive(:puts).with("RAM provisioned: #{contracts.items.first.properties.resource_limits.ram_provisioned}")
+      expect(subject).to receive(:puts).with("Reservable IPs: #{contracts.items.first.properties.resource_limits.reservable_ips}")
+      expect(subject).to receive(:puts).with("Reservable IPs in use: #{contracts.items.first.properties.resource_limits.reserved_ips_in_use}")
+      expect(subject).to receive(:puts).with("Reservable IPs on contract: #{contracts.items.first.properties.resource_limits.reserved_ips_on_contract}")
+      expect(subject).to receive(:puts).with("SSD limit per contract: #{contracts.items.first.properties.resource_limits.ssd_limit_per_contract}")
+      expect(subject).to receive(:puts).with("SSD limit per volume: #{contracts.items.first.properties.resource_limits.ssd_limit_per_volume}")
+      expect(subject).to receive(:puts).with("SSD volume provisioned: #{contracts.items.first.properties.resource_limits.ssd_volume_provisioned}")
+      expect(subject).to receive(:puts).with("DAS volume provisioned: #{contracts.items.first.properties.resource_limits.das_volume_provisioned}")
+      expect(subject).to receive(:puts).with("K8s Cluster Limit Total: #{contracts.items.first.properties.resource_limits.k8s_cluster_limit_total}")
+      expect(subject).to receive(:puts).with("K8s Clusters provisioned: #{contracts.items.first.properties.resource_limits.k8s_clusters_provisioned}")
+      expect(subject).to receive(:puts).with("NLB total limit: #{contracts.items.first.properties.resource_limits.nlb_limit_total}")
+      expect(subject).to receive(:puts).with("NLBs provisioned: #{contracts.items.first.properties.resource_limits.nlb_provisioned}")
+      expect(subject).to receive(:puts).with("NAT gateway total limit: #{contracts.items.first.properties.resource_limits.nat_gateway_limit_total}")
+      expect(subject).to receive(:puts).with("NAT gateways provisioned: #{contracts.items.first.properties.resource_limits.nat_gateway_provisioned}")
 
       mock_call_api(
         subject,
@@ -50,9 +55,9 @@ describe Chef::Knife::IonoscloudContractList do
           {
             method: 'GET',
             path: '/contracts',
-            operation: :'ContractApi.contracts_get',
-            return_type: 'Contract',
-            result: contract,
+            operation: :'ContractResourcesApi.contracts_get',
+            return_type: 'Contracts',
+            result: contracts,
           },
         ],
       )