knife-ionoscloud 5.0.0 → 6.0.0.beta.1

data/spec/chef/knife/ionoscloud_nic_list_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudNicList do
   end
 
   describe '#run' do
-    it 'should call NicApi.datacenters_servers_nics_get' do
+    it 'should call NetworkInterfacesApi.datacenters_servers_nics_get' do
       nics = nics_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -28,23 +28,29 @@ describe Chef::Knife::IonoscloudNicList do
         subject.ui.color('Name', :bold),
         subject.ui.color('IPs', :bold),
         subject.ui.color('DHCP', :bold),
-        subject.ui.color('NAT', :bold),
         subject.ui.color('LAN', :bold),
+        subject.ui.color('Firewall Type', :bold),
+        subject.ui.color('Device Number', :bold),
+        subject.ui.color('PCI Slot', :bold),
         nics.items.first.id,
         nics.items.first.properties.name,
         nics.items.first.properties.ips.to_s,
         nics.items.first.properties.dhcp.to_s,
-        nics.items.first.properties.nat.to_s,
         nics.items.first.properties.lan.to_s,
+        nics.items.first.properties.firewall_type.to_s,
+        nics.items.first.properties.device_number.to_s,
+        nics.items.first.properties.pci_slot.to_s,
         nics.items[1].id,
         nics.items[1].properties.name,
         nics.items[1].properties.ips.to_s,
         nics.items[1].properties.dhcp.to_s,
-        nics.items[1].properties.nat.to_s,
         nics.items[1].properties.lan.to_s,
+        nics.items[1].properties.firewall_type.to_s,
+        nics.items[1].properties.device_number.to_s,
+        nics.items[1].properties.pci_slot.to_s,
       ]
 
-      expect(subject.ui).to receive(:list).with(nic_list, :uneven_columns_across, 6)
+      expect(subject.ui).to receive(:list).with(nic_list, :uneven_columns_across, 8)
 
       mock_call_api(
         subject,
@@ -52,7 +58,7 @@ describe Chef::Knife::IonoscloudNicList do
           {
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/nics",
-            operation: :'NicApi.datacenters_servers_nics_get',
+            operation: :'NetworkInterfacesApi.datacenters_servers_nics_get',
             return_type: 'Nics',
             result: nics,
           },

data/spec/chef/knife/ionoscloud_node_list_spec.rb

@@ -27,16 +27,18 @@ describe Chef::Knife::IonoscloudNodeList do
         subject.ui.color('ID', :bold),
         subject.ui.color('Name', :bold),
         subject.ui.color('Public IP', :bold),
+        subject.ui.color('Private IP', :bold),
         subject.ui.color('K8s Version', :bold),
         subject.ui.color('State', :bold),
         k8s_nodes.items.first.id,
         k8s_nodes.items.first.properties.name,
         k8s_nodes.items.first.properties.public_ip,
+        k8s_nodes.items.first.properties.private_ip,
         k8s_nodes.items.first.properties.k8s_version,
         k8s_nodes.items.first.metadata.state,
       ]
 
-      expect(subject.ui).to receive(:list).with(node_list, :uneven_columns_across, 5)
+      expect(subject.ui).to receive(:list).with(node_list, :uneven_columns_across, 6)
 
       mock_call_api(
         subject,

data/spec/chef/knife/ionoscloud_nodepool_create_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Knife::IonoscloudNodepoolCreate do
       maintenance_window = "#{nodepool.properties.maintenance_window.day_of_the_week}, #{nodepool.properties.maintenance_window.time}"
 
       expected_body = nodepool.properties.to_hash
-      expected_body[:lans].map! { |lan| lan.delete(:properties); lan[:id] = Integer(lan[:id]); lan }
+      expected_body[:lans].map! { |lan| lan.delete(:dhcp); lan.delete(:routes); lan[:id] = Integer(lan[:id]); lan }
       expected_body.delete(:publicIps)
       expected_body.delete(:availableUpgradeVersions)
 
@@ -55,6 +55,20 @@ describe Chef::Knife::IonoscloudNodepoolCreate do
       expect(subject).to receive(:puts).with("RAM: #{nodepool.properties.ram_size}")
       expect(subject).to receive(:puts).with("Storage Type: #{nodepool.properties.storage_type}")
       expect(subject).to receive(:puts).with("Storage Size: #{nodepool.properties.storage_size}")
+      expect(subject).to receive(:puts).with("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}")
       expect(subject).to receive(:puts).with("Availability Zone: #{nodepool.properties.availability_zone}")
       expect(subject).to receive(:puts).with("Auto Scaling: #{auto_scaling}")
       expect(subject).to receive(:puts).with("Maintenance Window: #{maintenance_window}")

data/spec/chef/knife/ionoscloud_nodepool_lan_add_spec.rb

@@ -0,0 +1,226 @@
+require 'spec_helper'
+require 'ionoscloud_nodepool_lan_add'
+
+Chef::Knife::IonoscloudNodepoolLanAdd.load_deps
+
+describe Chef::Knife::IonoscloudNodepoolLanAdd do
+  before :each do
+    subject { Chef::Knife::IonoscloudNodepoolLanAdd.new }
+
+    allow(subject).to receive(:puts)
+    allow(subject).to receive(:print)
+  end
+
+  describe '#run' do
+    it 'should call KubernetesApi.k8s_nodepools_put to add the lan when the ID is valid' do
+      nodepool = k8s_nodepool_mock
+      nodepool_lan = nodepool_lan_mock
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        cluster_id: 'cluster_id',
+        nodepool_id: nodepool.id,
+        lan_id: nodepool_lan.id,
+        no_dhcp: !nodepool_lan.dhcp,
+        routes: [nodepool_lan.routes.first.network, nodepool_lan.routes.first.gateway_ip].join(','),
+        yes: true,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      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}"
+
+      expect(subject.ui).to receive(:info).with("Adding Lan #{subject_config[:lan_id]} to the Nodepoool.")
+      expect(subject).to receive(:puts).with("ID: #{nodepool.id}")
+      expect(subject).to receive(:puts).with("Name: #{nodepool.properties.name}")
+      expect(subject).to receive(:puts).with("K8s Version: #{nodepool.properties.k8s_version}")
+      expect(subject).to receive(:puts).with("Node Count: #{nodepool.properties.node_count}")
+      expect(subject).to receive(:puts).with("Lans: #{(nodepool.properties.lans + [nodepool_lan]).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}")
+      expect(subject).to receive(:puts).with("Auto Scaling: #{auto_scaling}")
+      expect(subject).to receive(:puts).with("Maintenance Window: #{maintenance_window}")
+      expect(subject).to receive(:puts).with("State: #{nodepool.metadata.state}")
+
+
+      expected_body = nodepool.properties.to_hash
+      expected_body[:lans] << nodepool_lan.to_hash
+      expected_body.delete(:name)
+      expected_body.delete(:datacenterId)
+      expected_body.delete(:ramSize)
+      expected_body.delete(:cpuFamily)
+      expected_body.delete(:coresCount)
+      expected_body.delete(:storageSize)
+      expected_body.delete(:storageType)
+      expected_body.delete(:availabilityZone)
+      expected_body.delete(:availableUpgradeVersions)
+
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: "/k8s/#{subject_config[:cluster_id]}/nodepools/#{subject_config[:nodepool_id]}",
+            operation: :'KubernetesApi.k8s_nodepools_find_by_id',
+            return_type: 'KubernetesNodePool',
+            result: nodepool,
+          },
+          {
+            method: 'PUT',
+            path: "/k8s/#{subject_config[:cluster_id]}/nodepools/#{subject_config[:nodepool_id]}",
+            operation: :'KubernetesApi.k8s_nodepools_put',
+            body: { properties: expected_body },
+            return_type: 'KubernetesNodePoolForPut',
+            result: nodepool,
+          },
+        ],
+      )
+
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+    it 'should call KubernetesApi.k8s_nodepools_put to update the lan when the ID is valid' do
+      new_gateway = '1.11.1.1'
+      nodepool = k8s_nodepool_mock()
+      nodepool_lan = nodepool_lan_mock(id: nodepool.properties.lans.first.id, gateway_ip: new_gateway)
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        cluster_id: 'cluster_id',
+        nodepool_id: nodepool.id,
+        lan_id: nodepool_lan.id,
+        no_dhcp: !nodepool_lan.dhcp,
+        routes: [nodepool_lan.routes.first.network, nodepool_lan.routes.first.gateway_ip].join(','),
+        yes: true,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      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}"
+
+      expect(subject.ui).to receive(:info).with("Updating Lan #{subject_config[:lan_id]} in the Nodepoool.")
+      expect(subject).to receive(:puts).with("ID: #{nodepool.id}")
+      expect(subject).to receive(:puts).with("Name: #{nodepool.properties.name}")
+      expect(subject).to receive(:puts).with("K8s Version: #{nodepool.properties.k8s_version}")
+      expect(subject).to receive(:puts).with("Node Count: #{nodepool.properties.node_count}")
+      expect(subject).to receive(:puts).with("Lans: #{[nodepool.properties.lans[1], nodepool_lan].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}")
+      expect(subject).to receive(:puts).with("Auto Scaling: #{auto_scaling}")
+      expect(subject).to receive(:puts).with("Maintenance Window: #{maintenance_window}")
+      expect(subject).to receive(:puts).with("State: #{nodepool.metadata.state}")
+
+
+      expected_body = nodepool.properties.to_hash
+      expected_body[:lans] = [expected_body[:lans][1], nodepool_lan.to_hash]
+      expected_body.delete(:name)
+      expected_body.delete(:datacenterId)
+      expected_body.delete(:ramSize)
+      expected_body.delete(:cpuFamily)
+      expected_body.delete(:coresCount)
+      expected_body.delete(:storageSize)
+      expected_body.delete(:storageType)
+      expected_body.delete(:availabilityZone)
+      expected_body.delete(:availableUpgradeVersions)
+
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: "/k8s/#{subject_config[:cluster_id]}/nodepools/#{subject_config[:nodepool_id]}",
+            operation: :'KubernetesApi.k8s_nodepools_find_by_id',
+            return_type: 'KubernetesNodePool',
+            result: nodepool,
+          },
+          {
+            method: 'PUT',
+            path: "/k8s/#{subject_config[:cluster_id]}/nodepools/#{subject_config[:nodepool_id]}",
+            operation: :'KubernetesApi.k8s_nodepools_put',
+            body: { properties: expected_body },
+            return_type: 'KubernetesNodePoolForPut',
+            result: nodepool,
+          },
+        ],
+      )
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+    it 'should not call LoadBalancersApi.datacenters_loadbalancers_delete when the ID is not valid' do
+      nodepool = k8s_nodepool_mock
+      nic_id = 'invalid_id'
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        cluster_id: 'cluster_id',
+        nodepool_id: 'nodepool_id',
+        lan_id: 'lan_id',
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      expect(subject.ui).to receive(:error).with("Nodepool ID #{subject_config[:nodepool_id]} not found.")
+
+      expect(subject.api_client).not_to receive(:wait_for)
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: "/k8s/#{subject_config[:cluster_id]}/nodepools/#{subject_config[:nodepool_id]}",
+            operation: :'KubernetesApi.k8s_nodepools_find_by_id',
+            return_type: 'KubernetesNodePool',
+            result: nodepool,
+            exception: Ionoscloud::ApiError.new(code: 404),
+          },
+        ],
+      )
+
+      expect { subject.run }.to raise_error(SystemExit) do |error|
+        expect(error.status).to eq(1)
+      end
+    end
+
+    it 'should not make any call if any required option is missing' do
+      required_options = subject.instance_variable_get(:@required_options)
+
+      arrays_without_one_element(required_options).each do |test_case|
+
+        test_case[:array].each { |value| subject.config[value] = 'test' }
+
+        expect(subject).to receive(:puts).with("Missing required parameters #{test_case[:removed]}")
+        expect(subject.api_client).not_to receive(:call_api)
+
+        expect { subject.run }.to raise_error(SystemExit) do |error|
+          expect(error.status).to eq(1)
+        end
+
+        required_options.each { |value| subject.config[value] = nil }
+      end
+    end
+  end
+end

data/spec/chef/knife/ionoscloud_nodepool_lan_remove.rb

@@ -0,0 +1,199 @@
+require 'spec_helper'
+require 'ionoscloud_nodepool_lan_remove'
+
+Chef::Knife::IonoscloudNodepoolLanRemove.load_deps
+
+describe Chef::Knife::IonoscloudNodepoolLanRemove do
+  before :each do
+    subject { Chef::Knife::IonoscloudNodepoolLanRemove.new }
+
+    allow(subject).to receive(:puts)
+    allow(subject).to receive(:print)
+  end
+
+  describe '#run' do
+    it 'should call KubernetesApi.k8s_nodepools_put to remove the lan when the ID is valid and the lan exists on the nodepool' do
+      nodepool = k8s_nodepool_mock
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        cluster_id: 'cluster_id',
+        nodepool_id: nodepool.id,
+        yes: true,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+      subject.name_args = [nodepool.properties.lans.first.id]
+
+      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}"
+
+      expect(subject.ui).to receive(:info).with("Removing Lans #{subject.name_args} from the Nodepoool.")
+      expect(subject).to receive(:puts).with("ID: #{nodepool.id}")
+      expect(subject).to receive(:puts).with("Name: #{nodepool.properties.name}")
+      expect(subject).to receive(:puts).with("K8s Version: #{nodepool.properties.k8s_version}")
+      expect(subject).to receive(:puts).with("Node Count: #{nodepool.properties.node_count}")
+      expect(subject).to receive(:puts).with("Lans: #{[nodepool.properties.lans[1]].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}")
+      expect(subject).to receive(:puts).with("Auto Scaling: #{auto_scaling}")
+      expect(subject).to receive(:puts).with("Maintenance Window: #{maintenance_window}")
+      expect(subject).to receive(:puts).with("State: #{nodepool.metadata.state}")
+
+
+      expected_body = nodepool.properties.to_hash
+      expected_body[:lans] = [expected_body[:lans][1]]
+      expected_body.delete(:name)
+      expected_body.delete(:datacenterId)
+      expected_body.delete(:ramSize)
+      expected_body.delete(:cpuFamily)
+      expected_body.delete(:coresCount)
+      expected_body.delete(:storageSize)
+      expected_body.delete(:storageType)
+      expected_body.delete(:availabilityZone)
+      expected_body.delete(:availableUpgradeVersions)
+
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: "/k8s/#{subject_config[:cluster_id]}/nodepools/#{subject_config[:nodepool_id]}",
+            operation: :'KubernetesApi.k8s_nodepools_find_by_id',
+            return_type: 'KubernetesNodePool',
+            result: nodepool,
+          },
+          {
+            method: 'PUT',
+            path: "/k8s/#{subject_config[:cluster_id]}/nodepools/#{subject_config[:nodepool_id]}",
+            operation: :'KubernetesApi.k8s_nodepools_put',
+            body: { properties: expected_body },
+            return_type: 'KubernetesNodePoolForPut',
+            result: nodepool,
+          },
+        ],
+      )
+
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+    it 'should call KubernetesApi.k8s_nodepools_put to remove the lan when the ID is valid but the lan does not exist on the nodepool' do
+      nodepool = k8s_nodepool_mock
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        cluster_id: 'cluster_id',
+        nodepool_id: nodepool.id,
+        yes: true,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+      subject.name_args = [123]
+
+      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}"
+
+      expect(subject.ui).to receive(:info).with("None of the specified Lan IDs (#{subject.name_args}) are present on the Nodepoool.")
+      expect(subject).to receive(:puts).with("ID: #{nodepool.id}")
+      expect(subject).to receive(:puts).with("Name: #{nodepool.properties.name}")
+      expect(subject).to receive(:puts).with("K8s Version: #{nodepool.properties.k8s_version}")
+      expect(subject).to receive(:puts).with("Node Count: #{nodepool.properties.node_count}")
+      expect(subject).to receive(:puts).with("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}")
+      expect(subject).to receive(:puts).with("Auto Scaling: #{auto_scaling}")
+      expect(subject).to receive(:puts).with("Maintenance Window: #{maintenance_window}")
+      expect(subject).to receive(:puts).with("State: #{nodepool.metadata.state}")
+
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: "/k8s/#{subject_config[:cluster_id]}/nodepools/#{subject_config[:nodepool_id]}",
+            operation: :'KubernetesApi.k8s_nodepools_find_by_id',
+            return_type: 'KubernetesNodePool',
+            result: nodepool,
+          },
+        ],
+      )
+
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+    it 'should not call LoadBalancersApi.datacenters_loadbalancers_delete when the ID is not valid' do
+      nodepool = k8s_nodepool_mock
+      nic_id = 'invalid_id'
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        cluster_id: 'cluster_id',
+        nodepool_id: 'nodepool_id',
+        lan_id: 'lan_id',
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      expect(subject.ui).to receive(:error).with("Nodepool ID #{subject_config[:nodepool_id]} not found.")
+
+      expect(subject.api_client).not_to receive(:wait_for)
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: "/k8s/#{subject_config[:cluster_id]}/nodepools/#{subject_config[:nodepool_id]}",
+            operation: :'KubernetesApi.k8s_nodepools_find_by_id',
+            return_type: 'KubernetesNodePool',
+            result: nodepool,
+            exception: Ionoscloud::ApiError.new(code: 404),
+          },
+        ],
+      )
+
+      expect { subject.run }.to raise_error(SystemExit) do |error|
+        expect(error.status).to eq(1)
+      end
+    end
+
+    it 'should not make any call if any required option is missing' do
+      required_options = subject.instance_variable_get(:@required_options)
+
+      arrays_without_one_element(required_options).each do |test_case|
+
+        test_case[:array].each { |value| subject.config[value] = 'test' }
+
+        expect(subject).to receive(:puts).with("Missing required parameters #{test_case[:removed]}")
+        expect(subject.api_client).not_to receive(:call_api)
+
+        expect { subject.run }.to raise_error(SystemExit) do |error|
+          expect(error.status).to eq(1)
+        end
+
+        required_options.each { |value| subject.config[value] = nil }
+      end
+    end
+  end
+end