knife-ionoscloud 5.0.0 → 6.0.0.beta.1

data/lib/chef/knife/ionoscloud_nodepool_delete.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         kubernetes_api = Ionoscloud::KubernetesApi.new(api_client)
@@ -36,11 +37,36 @@ class Chef
             next
           end
 
+          auto_scaling = "Min node count: #{nodepool.properties.auto_scaling.min_node_count}, Max node count:#{nodepool.properties.auto_scaling.max_node_count}"
+          maintenance_window = "#{nodepool.properties.maintenance_window.day_of_the_week}, #{nodepool.properties.maintenance_window.time}"
+
           msg_pair('ID', nodepool.id)
           msg_pair('Name', nodepool.properties.name)
           msg_pair('K8s Version', nodepool.properties.k8s_version)
           msg_pair('Datacenter ID', nodepool.properties.datacenter_id)
           msg_pair('Node Count', nodepool.properties.node_count)
+          msg_pair('CPU Family', nodepool.properties.cpu_family)
+          msg_pair('Cores Count', nodepool.properties.cores_count)
+          msg_pair('RAM', nodepool.properties.ram_size)
+          msg_pair('Storage Type', nodepool.properties.storage_type)
+          msg_pair('Storage Size', nodepool.properties.storage_size)
+          msg_pair('Lans', nodepool.properties.lans.map do
+            |lan|
+            {
+              id: lan.id,
+              dhcp: lan.dhcp,
+              routes: lan.routes ? lan.routes.map do
+                |route|
+                {
+                  network: route.network,
+                  gateway_ip: route.gateway_ip,
+                }
+              end : []
+            }
+          end)
+          msg_pair('Availability Zone', nodepool.properties.availability_zone)
+          msg_pair('Auto Scaling', auto_scaling)
+          msg_pair('Maintenance Window', maintenance_window)
           msg_pair('State', nodepool.metadata.state)
 
           puts "\n"

data/lib/chef/knife/ionoscloud_nodepool_lan_add.rb

@@ -0,0 +1,129 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudNodepoolLanAdd < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud nodepool lan add (options)'
+
+      option :cluster_id,
+              short: '-C CLUSTER_ID',
+              long: '--cluster-id CLUSTER_ID',
+              description: 'ID of the Kubernetes cluster'
+
+      option :nodepool_id,
+              short: '-N NODEPOOL_ID',
+              long: '--nodepool NODEPOOL_ID',
+              description: 'The ID of the K8s Nodepool'
+
+      option :lan_id,
+              short: '-L LAN_ID',
+              long: '--lan LAN_ID',
+              description: 'The ID of the LAN'
+
+      option :no_dhcp,
+              long: '--nodhcp',
+              boolean: true,
+              default: false,
+              description: 'Indicates if the Kubernetes Node Pool LAN will reserve an IP using DHCP'
+
+      option :routes,
+              long: '--routes NETWORK,GATEWAY_IP [NETWORK,GATEWAY_IP]',
+              description: 'An array of additional LANs attached to worker nodes'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'Adds or updates a LAN within a Nodepool.'
+        @required_options = [:cluster_id, :nodepool_id, :lan_id, :ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        handle_extra_config
+        validate_required_params(@required_options, config)
+
+        kubernetes_api = Ionoscloud::KubernetesApi.new(api_client)
+
+        begin
+          nodepool = kubernetes_api.k8s_nodepools_find_by_id(config[:cluster_id], config[:nodepool_id])
+        rescue Ionoscloud::ApiError => err
+          raise err unless err.code == 404
+          ui.error("Nodepool ID #{config[:nodepool_id]} not found.")
+          exit(1)
+        end
+
+        routes = []
+        config[:routes] = config[:routes].split(',') if config[:routes] && config[:routes].instance_of?(String)
+        config[:routes].each_slice(2) do |network, gateway_ip|
+          routes << Ionoscloud::KubernetesNodePoolLanRoutes.new(
+            network: network,
+            gateway_ip: gateway_ip,
+          )
+        end
+
+        new_lan = Ionoscloud::KubernetesNodePoolLan.new(
+          id: Integer(config[:lan_id]),
+          dhcp: !config[:no_dhcp],
+          routes: routes,
+        )
+
+        existing = nodepool.properties.lans.select { |lan| lan.id == new_lan.id }
+
+        new_nodepool = Ionoscloud::KubernetesNodePool.new(
+          properties: Ionoscloud::KubernetesNodePoolPropertiesForPut.new(
+            node_count: nodepool.properties.node_count,
+            k8s_version: nodepool.properties.k8s_version,
+            maintenance_window: nodepool.properties.maintenance_window,
+            auto_scaling: nodepool.properties.auto_scaling,
+            public_ips: nodepool.properties.public_ips,
+            lans: nodepool.properties.lans,
+          ),
+        )
+
+        new_nodepool.properties.lans = new_nodepool.properties.lans.delete_if { |lan| lan.id == new_lan.id }
+        new_nodepool.properties.lans << new_lan
+
+        nodepool = kubernetes_api.k8s_nodepools_put(
+          config[:cluster_id], config[:nodepool_id], new_nodepool,
+        )
+
+        if existing.length > 0
+          ui.info("Updating Lan #{config[:lan_id]} in the Nodepoool.")
+        else
+          ui.info("Adding Lan #{config[:lan_id]} to the Nodepoool.")
+        end
+
+        auto_scaling = "Min node count: #{nodepool.properties.auto_scaling.min_node_count}, Max node count:#{nodepool.properties.auto_scaling.max_node_count}"
+        maintenance_window = "#{nodepool.properties.maintenance_window.day_of_the_week}, #{nodepool.properties.maintenance_window.time}"
+
+        puts "\n"
+        puts "#{ui.color('ID', :cyan)}: #{nodepool.id}"
+        puts "#{ui.color('Name', :cyan)}: #{nodepool.properties.name}"
+        puts "#{ui.color('K8s Version', :cyan)}: #{nodepool.properties.k8s_version}"
+        puts "#{ui.color('Node Count', :cyan)}: #{nodepool.properties.node_count}"
+        puts "#{ui.color('Lans', :cyan)}: #{nodepool.properties.lans.map do
+          |lan|
+          {
+            id: lan.id,
+            dhcp: lan.dhcp,
+            routes: lan.routes ? lan.routes.map do
+              |route|
+              {
+                network: route.network,
+                gateway_ip: route.gateway_ip,
+              }
+            end : []
+          }
+        end}"
+        puts "#{ui.color('Auto Scaling', :cyan)}: #{auto_scaling}"
+        puts "#{ui.color('Maintenance Window', :cyan)}: #{maintenance_window}"
+        puts "#{ui.color('State', :cyan)}: #{nodepool.metadata.state}"
+        puts 'done'
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_nodepool_lan_remove.rb

@@ -0,0 +1,97 @@
+require_relative 'ionoscloud_base'
+
+class Chef
+  class Knife
+    class IonoscloudNodepoolLanRemove < Knife
+      include Knife::IonoscloudBase
+
+      banner 'knife ionoscloud nodepool lan remove LAN_ID [LAN_ID] (options)'
+
+      option :cluster_id,
+              short: '-C CLUSTER_ID',
+              long: '--cluster-id CLUSTER_ID',
+              description: 'ID of the Kubernetes cluster'
+
+      option :nodepool_id,
+              short: '-N NODEPOOL_ID',
+              long: '--nodepool NODEPOOL_ID',
+              description: 'The ID of the K8s Nodepool'
+
+      attr_reader :description, :required_options
+
+      def initialize(args = [])
+        super(args)
+        @description =
+        'Adds or updates a LAN within a Nodepool.'
+        @required_options = [:cluster_id, :nodepool_id, :ionoscloud_username, :ionoscloud_password]
+      end
+
+      def run
+        $stdout.sync = true
+        handle_extra_config
+        validate_required_params(@required_options, config)
+
+        kubernetes_api = Ionoscloud::KubernetesApi.new(api_client)
+
+        begin
+          nodepool = kubernetes_api.k8s_nodepools_find_by_id(config[:cluster_id], config[:nodepool_id])
+        rescue Ionoscloud::ApiError => err
+          raise err unless err.code == 404
+          ui.error("Nodepool ID #{config[:nodepool_id]} not found.")
+          exit(1)
+        end
+
+        existing = nodepool.properties.lans.select { |lan| @name_args.map { |id| Integer(id) }.include? lan.id }
+
+        if existing.length > 0
+          new_nodepool = Ionoscloud::KubernetesNodePool.new(
+            properties: Ionoscloud::KubernetesNodePoolPropertiesForPut.new(
+              node_count: nodepool.properties.node_count,
+              k8s_version: nodepool.properties.k8s_version,
+              maintenance_window: nodepool.properties.maintenance_window,
+              auto_scaling: nodepool.properties.auto_scaling,
+              public_ips: nodepool.properties.public_ips,
+              lans: nodepool.properties.lans,
+            ),
+          )
+          new_nodepool.properties.lans.delete_if { |lan| @name_args.map { |id| Integer(id) }.include? lan.id }
+
+          nodepool = kubernetes_api.k8s_nodepools_put(
+            config[:cluster_id], config[:nodepool_id], new_nodepool,
+          )
+
+          ui.info("Removing Lans #{@name_args} from the Nodepoool.")
+        else
+          ui.info("None of the specified Lan IDs (#{@name_args}) are present on the Nodepoool.")
+        end
+
+        auto_scaling = "Min node count: #{nodepool.properties.auto_scaling.min_node_count}, Max node count:#{nodepool.properties.auto_scaling.max_node_count}"
+        maintenance_window = "#{nodepool.properties.maintenance_window.day_of_the_week}, #{nodepool.properties.maintenance_window.time}"
+
+        puts "\n"
+        puts "#{ui.color('ID', :cyan)}: #{nodepool.id}"
+        puts "#{ui.color('Name', :cyan)}: #{nodepool.properties.name}"
+        puts "#{ui.color('K8s Version', :cyan)}: #{nodepool.properties.k8s_version}"
+        puts "#{ui.color('Node Count', :cyan)}: #{nodepool.properties.node_count}"
+        puts "#{ui.color('Lans', :cyan)}: #{nodepool.properties.lans.map do
+          |lan|
+          {
+            id: lan.id,
+            dhcp: lan.dhcp,
+            routes: lan.routes ? lan.routes.map do
+              |route|
+              {
+                network: route.network,
+                gateway_ip: route.gateway_ip,
+              }
+            end : []
+          }
+        end}"
+        puts "#{ui.color('Auto Scaling', :cyan)}: #{auto_scaling}"
+        puts "#{ui.color('Maintenance Window', :cyan)}: #{maintenance_window}"
+        puts "#{ui.color('State', :cyan)}: #{nodepool.metadata.state}"
+        puts 'done'
+      end
+    end
+  end
+end

data/lib/chef/knife/ionoscloud_nodepool_list.rb

@@ -23,6 +23,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         nodepool_list = [
@@ -31,6 +32,7 @@ class Chef
           ui.color('K8s Version', :bold),
           ui.color('Datacenter ID', :bold),
           ui.color('Node Count', :bold),
+          ui.color('Lan Count', :bold),
           ui.color('State', :bold),
         ]
 
@@ -42,9 +44,10 @@ class Chef
           nodepool_list << nodepool.properties.k8s_version
           nodepool_list << nodepool.properties.datacenter_id
           nodepool_list << nodepool.properties.node_count.to_s
+          nodepool_list << nodepool.properties.lans.length
           nodepool_list << nodepool.metadata.state
         end
-        puts ui.list(nodepool_list, :uneven_columns_across, 6)
+        puts ui.list(nodepool_list, :uneven_columns_across, 7)
       end
     end
   end

data/lib/chef/knife/ionoscloud_pcc_create.rb

@@ -18,13 +18,9 @@ class Chef
               description: 'Description of the data center'
 
       option :peers,
-              long: '--peers LAN_ID [LAN_ID]',
+              long: '--peers DATACENTER_ID,LAN_ID [DATACENTER_ID,LAN_ID]',
               description: 'An array of LANs joined to this private cross connect'
 
-      option :datacenters,
-              long: '--datacenters DATACENTER_IS [DATACENTER_IS]',
-              description: 'An array of datacenters joined to this private cross connect'
-
       attr_reader :description, :required_options
 
       def initialize(args = [])
@@ -36,14 +32,18 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         print "#{ui.color('Creating private cross connect...', :magenta)}"
 
-        pcc_api = Ionoscloud::PrivateCrossConnectApi.new(api_client)
+        pcc_api = Ionoscloud::PrivateCrossConnectsApi.new(api_client)
+        config[:peers] = config[:peers].split(',') if config[:peers] && config[:peers].instance_of?(String)
 
-        config[:peers] = config[:peers].split(',').map { |peer| { id: peer } } unless config[:peers].nil?
-        config[:datacenters] = config[:datacenters].split(',').map { |datacenter| { id: datacenter } } unless config[:datacenters].nil?
+        if config[:peers] && config[:peers].length % 2 != 0
+          ui.error('Each Lan ID should correspond to one Datacenter ID!')
+          exit(1)
+        end
 
         pcc, _, headers  = pcc_api.pccs_post_with_http_info({
           properties: {
@@ -55,6 +55,34 @@ class Chef
         dot = ui.color('.', :magenta)
         api_client.wait_for { print dot; is_done? get_request_id headers }
 
+        pcc = pcc_api.pccs_find_by_id(pcc.id)
+
+        if config[:peers]
+          lan_api = Ionoscloud::LansApi.new(api_client)
+
+          header_list = []
+          allowed_datacenters_ids = pcc.properties.connectable_datacenters.map { |datacenter| datacenter.id }
+          config[:peers].each_slice(2) do |datacenter_id, lan_id|
+            if !allowed_datacenters_ids.include? datacenter_id
+              ui.error("Datacenter ID #{datacenter_id} is not allowed")
+              exit(1)
+            end
+            _, _, headers = lan_api.datacenters_lans_patch_with_http_info(
+              datacenter_id,
+              lan_id,
+              { pcc: pcc.id },
+            )
+            header_list << headers
+          end
+
+          header_list.each do |headers|
+            dot = ui.color('.', :magenta)
+            api_client.wait_for { print dot; is_done? get_request_id headers }
+          end
+        end
+
+        pcc = pcc_api.pccs_find_by_id(pcc.id)
+
         puts "\n"
         puts "#{ui.color('ID', :cyan)}: #{pcc.id}"
         puts "#{ui.color('Name', :cyan)}: #{pcc.properties.name}"

data/lib/chef/knife/ionoscloud_pcc_delete.rb

@@ -18,9 +18,10 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
-        pcc_api = Ionoscloud::PrivateCrossConnectApi.new(api_client)
+        pcc_api = Ionoscloud::PrivateCrossConnectsApi.new(api_client)
 
         @name_args.each do |pcc_id|
           begin

data/lib/chef/knife/ionoscloud_pcc_list.rb

@@ -18,6 +18,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         pcc_list = [
@@ -26,7 +27,7 @@ class Chef
           ui.color('Description', :bold),
         ]
 
-        pcc_api = Ionoscloud::PrivateCrossConnectApi.new(api_client)
+        pcc_api = Ionoscloud::PrivateCrossConnectsApi.new(api_client)
 
         pcc_api.pccs_get({ depth: 1 }).items.each do |pcc|
           pcc_list << pcc.id

data/lib/chef/knife/ionoscloud_request_list.rb

@@ -10,17 +10,22 @@ class Chef
       option :limit,
               short: '-l LIMIT',
               long: '--limit LIMIT',
-              description: 'The maximum number of results.'
+              description: 'The maximum number of requests to look into.'
 
       option :offset,
               short: '-o OFFSET',
               long: '--offset OFFSET',
               description: 'The request number from which to return results.'
 
-      # option :status,
-      #         short: '-s STATUS',
-      #         long: '--status STATUS',
-      #         description: 'Request status filter to fetch all the request based on a particular status [QUEUED, RUNNING, DONE, FAILED]'
+      option :status,
+              short: '-s STATUS',
+              long: '--status STATUS',
+              description: 'Request status filter to fetch all the request based on a particular status [QUEUED, RUNNING, DONE, FAILED]'
+
+      option :method,
+              short: '-m METHOD',
+              long: '--method METHOD',
+              description: 'Request method filter to fetch all the request based on a particular method [POST, PUT, PATCH, DELETE]'
 
       attr_reader :description, :required_options
 
@@ -37,6 +42,7 @@ class Chef
 
       def run
         $stdout.sync = true
+        handle_extra_config
         validate_required_params(@required_options, config)
 
         request_list = [
@@ -46,7 +52,7 @@ class Chef
           ui.color('Targets', :bold),
         ]
 
-        request_api = Ionoscloud::RequestApi.new(api_client)
+        request_api = Ionoscloud::RequestsApi.new(api_client)
 
         begin
           config[:limit] = Integer(config[:limit])
@@ -72,13 +78,21 @@ class Chef
           offset: config[:offset],
         }
 
-        # if config[:status] && ['QUEUED', 'RUNNING', 'DONE', 'FAILED'].include?(config[:status])
-        #   opts[:status] = config[:status]
-        # end
+        if config[:status] && ['QUEUED', 'RUNNING', 'DONE', 'FAILED'].include?(config[:status])
+          opts[:filter_request_status] = config[:status]
+        end
+
+        if config[:status] && !['QUEUED', 'RUNNING', 'DONE', 'FAILED'].include?(config[:status])
+          ui.warn('status should be one of [QUEUED, RUNNING, DONE, FAILED]')
+        end
 
-        # if config[:status] && !['QUEUED', 'RUNNING', 'DONE', 'FAILED'].include?(config[:status])
-        #   ui.warn('status should be one of [QUEUED, RUNNING, DONE, FAILED]')
-        # end
+        if config[:method] && ['POST', 'PUT', 'PATCH', 'DELETE'].include?(config[:method])
+          opts[:filter_method] = config[:method]
+        end
+
+        if config[:method] && !['POST', 'PUT', 'PATCH', 'DELETE'].include?(config[:method])
+          ui.warn('method should be one of [POST, PUT, PATCH, DELETE]')
+        end
 
         request_api.requests_get(opts).items.each do |request|
           request_list << request.id