knife-ionoscloud 5.1.0 → 6.0.0.alpha.1

data/lib/chef/knife/ionoscloud_snapshot_delete.rb

@@ -20,7 +20,7 @@ class Chef
         $stdout.sync = true
         validate_required_params(@required_options, config)
 
-        snapshot_api = Ionoscloud::SnapshotApi.new(api_client)
+        snapshot_api = Ionoscloud::SnapshotsApi.new(api_client)
 
         @name_args.each do |snapshot_id|
           begin

data/lib/chef/knife/ionoscloud_snapshot_list.rb

@@ -28,7 +28,7 @@ class Chef
           ui.color('Size', :bold)
         ]
 
-        snapshot_api = Ionoscloud::SnapshotApi.new(api_client)
+        snapshot_api = Ionoscloud::SnapshotsApi.new(api_client)
 
         snapshot_api.snapshots_get({ depth: 1 }).items.each do |snapshot|
           snapshot_list << snapshot.id

data/lib/chef/knife/ionoscloud_snapshot_restore.rb

@@ -38,7 +38,7 @@ class Chef
 
         print "#{ui.color('Restoring Snapshot...', :magenta)}"
 
-        volume_api = Ionoscloud::VolumeApi.new(api_client)
+        volume_api = Ionoscloud::VolumesApi.new(api_client)
 
         _, _, headers  = volume_api.datacenters_volumes_restore_snapshot_post_with_http_info(
           config[:datacenter_id],
@@ -49,7 +49,7 @@ class Chef
         dot = ui.color('.', :magenta)
         api_client.wait_for { print dot; is_done? get_request_id headers }
 
-        volume_api = Ionoscloud::VolumeApi.new(api_client)
+        volume_api = Ionoscloud::VolumesApi.new(api_client)
 
         volume = volume_api.datacenters_volumes_find_by_id(config[:datacenter_id], config[:volume_id])
 

data/lib/chef/knife/ionoscloud_template_list.rb

@@ -0,0 +1,46 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudTemplateList < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud template list'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'Retrieve a list of available templates. Templates can be used on specific server types only (CUBE at the moment)'
+        @required_options = [:ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        validate_required_params(@required_options, config)
+
+        template_list = [
+          ui.color('ID', :bold),
+          ui.color('Name', :bold),
+          ui.color('Cores', :bold),
+          ui.color('RAM', :bold),
+          ui.color('Storage Size', :bold),
+        ]
+        templates_api = Ionoscloud::TemplatesApi.new(api_client)
+
+        templates_api.templates_get({ depth: 1 }).items.sort do |a, b|
+          a.properties.cores != b.properties.cores ? a.properties.cores <=> b.properties.cores : a.properties.ram <=> b.properties.ram
+        end.each do |template|
+          template_list << template.id
+          template_list << template.properties.name
+          template_list << Integer(template.properties.cores)
+          template_list << Integer(template.properties.ram)
+          template_list << Integer(template.properties.storage_size)
+        end
+
+        puts ui.list(template_list, :uneven_columns_across, 5)
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_user_ssourl.rb

@@ -26,7 +26,7 @@ class Chef
         validate_required_params(@required_options, config)
 
         begin
-          puts Ionoscloud::UserManagementApi.new(api_client).um_users_s3ssourl_get(config[:user_id]).sso_url
+          puts Ionoscloud::UserS3KeysApi.new(api_client).um_users_s3ssourl_get(config[:user_id]).sso_url
         rescue Ionoscloud::ApiError => err
           raise err unless err.code == 404
           ui.error("User ID #{config[:user_id]} not found.")

data/lib/chef/knife/ionoscloud_volume_attach.rb

@@ -30,7 +30,7 @@ class Chef
         $stdout.sync = true
         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

data/lib/chef/knife/ionoscloud_volume_create.rb

@@ -32,10 +32,6 @@ class Chef
               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',
@@ -44,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',
@@ -59,8 +55,21 @@ class Chef
       option :availability_zone,
               short: '-Z AVAILABILITY_ZONE',
               long: '--availability-zone AVAILABILITY_ZONE',
-              description: 'The volume availability zone of the server',
-              required: false
+              description: 'The volume availability zone of the server'
+
+      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.'
 
       attr_reader :description, :required_options
 
@@ -76,40 +85,29 @@ class Chef
         $stdout.sync = true
         validate_required_params(@required_options, config)
 
-        if !config[:image] && !config[:image_alias]
-          ui.error('Either \'--image\' or \'--image-alias\' parameter must be provided')
-          exit(1)
-        end
-
-        if !config[:ssh_keys] && !config[:image_password]
-          ui.error('Either \'--image-password\' or \'--ssh-keys\' parameter must be provided')
-          exit(1)
-        end
-
-        if config[:ssh_keys]
-          config[:ssh_keys] = config[:ssh_keys].split(',')
-        end
+        config[:ssh_keys] = config[:ssh_keys].split(',') if config[:ssh_keys]
 
         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],
-          {
-            properties: {
-              name: config[:name],
-              size: config[:size],
-              bus: config[:bus] || 'VIRTIO',
-              type: config[:type],
-              licenceType: config[:licence_type],
-              image: config[:image],
-              imageAlias: config[:image_alias],
-              sshKeys: config[:sshKeys],
-              imagePassword: config[:image_password],
-              availabilityZone: config[:availability_zone],
-            }.compact
-          },
+          Ionoscloud::Volume.new(properties: Ionoscloud::VolumeProperties.new(**volume_properties)),
         )
 
         dot = ui.color('.', :magenta)

data/lib/chef/knife/ionoscloud_volume_delete.rb

@@ -26,7 +26,7 @@ class Chef
         $stdout.sync = true
         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

data/lib/chef/knife/ionoscloud_volume_detach.rb

@@ -33,7 +33,7 @@ class Chef
         $stdout.sync = true
         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

data/lib/chef/knife/ionoscloud_volume_list.rb

@@ -45,10 +45,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/knife-ionoscloud/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Ionoscloud
-    VERSION = '5.1.0'
+    VERSION = '6.0.0.alpha.1'
     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_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_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,
           },