knife-ionoscloud 5.0.0 → 6.0.0.beta.1

data/spec/chef/knife/ionoscloud_nodepool_list_spec.rb

@@ -28,16 +28,18 @@ describe Chef::Knife::IonoscloudNodepoolList do
         subject.ui.color('K8s Version', :bold),
         subject.ui.color('Datacenter ID', :bold),
         subject.ui.color('Node Count', :bold),
+        subject.ui.color('Lan Count', :bold),
         subject.ui.color('State', :bold),
         k8s_nodepools.items.first.id,
         k8s_nodepools.items.first.properties.name,
         k8s_nodepools.items.first.properties.k8s_version,
         k8s_nodepools.items.first.properties.datacenter_id,
         k8s_nodepools.items.first.properties.node_count.to_s,
+        k8s_nodepools.items.first.properties.lans.length,
         k8s_nodepools.items.first.metadata.state,
       ]
 
-      expect(subject.ui).to receive(:list).with(nodepool_list, :uneven_columns_across, 6)
+      expect(subject.ui).to receive(:list).with(nodepool_list, :uneven_columns_across, 7)
 
       mock_call_api(
         subject,

data/spec/chef/knife/ionoscloud_pcc_create_spec.rb

@@ -12,15 +12,16 @@ describe Chef::Knife::IonoscloudPccCreate do
   end
 
   describe '#run' do
-    it 'should call PrivateCrossConnectApi.pccs_post with the expected arguments and output based on what it receives' do
+    it 'should call PrivateCrossConnectsApi.pccs_post with the expected arguments and output based on what it receives' do
       pcc = pcc_mock
+      datacenter_ids = pcc.properties.connectable_datacenters.map { |datacenter| datacenter.id }
+      lan_ids = pcc.properties.peers.map { |peer| peer.id }
       subject_config = {
         ionoscloud_username: 'email',
         ionoscloud_password: 'password',
         name: pcc.properties.name,
         description: pcc.properties.description,
-        peers: pcc.properties.peers.join(','),
-        datacenters: pcc.properties.connectable_datacenters.join(','),
+        peers: datacenter_ids.zip(lan_ids).flatten.compact.join(','),
       }
 
       subject_config.each { |key, value| subject.config[key] = value }
@@ -31,18 +32,48 @@ describe Chef::Knife::IonoscloudPccCreate do
       expect(subject).to receive(:puts).with("Peers: #{pcc.properties.peers.to_s}")
       expect(subject).to receive(:puts).with("Datacenters: #{pcc.properties.connectable_datacenters.to_s}")
 
-      mock_wait_for(subject)
+      3.times { mock_wait_for(subject) }
       mock_call_api(
         subject,
         [
           {
             method: 'POST',
             path: '/pccs',
-            operation: :'PrivateCrossConnectApi.pccs_post',
+            operation: :'PrivateCrossConnectsApi.pccs_post',
             return_type: 'PrivateCrossConnect',
             body: { properties: { name: pcc.properties.name, description: pcc.properties.description } },
             result: pcc,
           },
+          {
+            method: 'GET',
+            path: "/pccs/#{pcc.id}",
+            operation: :'PrivateCrossConnectsApi.pccs_find_by_id',
+            return_type: 'PrivateCrossConnect',
+            result: pcc,
+          },
+          {
+            method: 'PATCH',
+            path: "/datacenters/#{pcc.properties.connectable_datacenters[0].id}/lans/#{pcc.properties.peers[0].id}",
+            operation: :'LansApi.datacenters_lans_patch',
+            return_type: 'Lan',
+            body: { pcc: pcc.id },
+            result: pcc.properties.peers[0],
+          },
+          {
+            method: 'PATCH',
+            path: "/datacenters/#{pcc.properties.connectable_datacenters[1].id}/lans/#{pcc.properties.peers[1].id}",
+            operation: :'LansApi.datacenters_lans_patch',
+            return_type: 'Lan',
+            body: { pcc: pcc.id },
+            result: pcc.properties.peers[1],
+          },
+          {
+            method: 'GET',
+            path: "/pccs/#{pcc.id}",
+            operation: :'PrivateCrossConnectsApi.pccs_find_by_id',
+            return_type: 'PrivateCrossConnect',
+            result: pcc,
+          },
         ],
       )
 

data/spec/chef/knife/ionoscloud_pcc_delete_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudPccDelete do
   end
 
   describe '#run' do
-    it 'should call PrivateCrossConnectApi.pccs_delete when the ID is valid' do
+    it 'should call PrivateCrossConnectsApi.pccs_delete when the ID is valid' do
       pcc = pcc_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -41,14 +41,14 @@ describe Chef::Knife::IonoscloudPccDelete do
           {
             method: 'GET',
             path: "/pccs/#{pcc.id}",
-            operation: :'PrivateCrossConnectApi.pccs_find_by_id',
+            operation: :'PrivateCrossConnectsApi.pccs_find_by_id',
             return_type: 'PrivateCrossConnect',
             result: pcc,
           },
           {
             method: 'DELETE',
             path: "/pccs/#{pcc.id}",
-            operation: :'PrivateCrossConnectApi.pccs_delete',
+            operation: :'PrivateCrossConnectsApi.pccs_delete',
           },
         ],
       )
@@ -56,7 +56,7 @@ describe Chef::Knife::IonoscloudPccDelete do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should not call PrivateCrossConnectApi.pccs_delete when the ID is not valid' do
+    it 'should not call PrivateCrossConnectsApi.pccs_delete when the ID is not valid' do
       pcc_id = 'invalid_id'
       subject_config = {
         ionoscloud_username: 'email',
@@ -75,7 +75,7 @@ describe Chef::Knife::IonoscloudPccDelete do
           {
             method: 'GET',
             path: "/pccs/#{pcc_id}",
-            operation: :'PrivateCrossConnectApi.pccs_find_by_id',
+            operation: :'PrivateCrossConnectsApi.pccs_find_by_id',
             return_type: 'PrivateCrossConnect',
             exception: Ionoscloud::ApiError.new(code: 404),
           },

data/spec/chef/knife/ionoscloud_pcc_list_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudPccList do
   end
 
   describe '#run' do
-    it 'should call PrivateCrossConnectApi.pccs_get' do
+    it 'should call PrivateCrossConnectsApi.pccs_get' do
       pccs = pccs_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -38,7 +38,7 @@ describe Chef::Knife::IonoscloudPccList do
           {
             method: 'GET',
             path: '/pccs',
-            operation: :'PrivateCrossConnectApi.pccs_get',
+            operation: :'PrivateCrossConnectsApi.pccs_get',
             return_type: 'PrivateCrossConnects',
             result: pccs,
           },

data/spec/chef/knife/ionoscloud_request_list_spec.rb

@@ -28,7 +28,7 @@ describe Chef::Knife::IonoscloudRequestList do
   end
 
   describe '#run' do
-    it 'should call RequestApi.resources_get with default options when nothing is set' do
+    it 'should call RequestsApi.resources_get with default options when nothing is set' do
       subject_config = {
         ionoscloud_username: 'email',
         ionoscloud_password: 'password',
@@ -44,7 +44,7 @@ describe Chef::Knife::IonoscloudRequestList do
           {
             method: 'GET',
             path: '/requests',
-            operation: :'RequestApi.requests_get',
+            operation: :'RequestsApi.requests_get',
             options: { depth: 2, limit: 20, offset: 0 },
             return_type: 'Requests',
             result: @requests,
@@ -55,7 +55,7 @@ describe Chef::Knife::IonoscloudRequestList do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should call RequestApi.resources_get with set options if present' do
+    it 'should call RequestsApi.resources_get with set options if present' do
       subject_config = {
         ionoscloud_username: 'email',
         ionoscloud_password: 'password',
@@ -73,7 +73,7 @@ describe Chef::Knife::IonoscloudRequestList do
           {
             method: 'GET',
             path: '/requests',
-            operation: :'RequestApi.requests_get',
+            operation: :'RequestsApi.requests_get',
             options: { depth: 2, limit: subject_config[:limit], offset: subject_config[:offset] },
             return_type: 'Requests',
             result: @requests,
@@ -84,7 +84,7 @@ describe Chef::Knife::IonoscloudRequestList do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should call RequestApi.resources_get with default limit if it is not an Integers' do
+    it 'should call RequestsApi.resources_get with default limit if it is not an Integer' do
       subject_config = {
         ionoscloud_username: 'email',
         ionoscloud_password: 'password',
@@ -103,7 +103,7 @@ describe Chef::Knife::IonoscloudRequestList do
           {
             method: 'GET',
             path: '/requests',
-            operation: :'RequestApi.requests_get',
+            operation: :'RequestsApi.requests_get',
             options: { depth: 2, limit: 20, offset: subject_config[:offset] },
             return_type: 'Requests',
             result: @requests,
@@ -114,7 +114,7 @@ describe Chef::Knife::IonoscloudRequestList do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should call RequestApi.resources_get with default offset if it is not an Integers' do
+    it 'should call RequestsApi.resources_get with default offset if it is not an Integers' do
       subject_config = {
         ionoscloud_username: 'email',
         ionoscloud_password: 'password',
@@ -133,7 +133,126 @@ describe Chef::Knife::IonoscloudRequestList do
           {
             method: 'GET',
             path: '/requests',
-            operation: :'RequestApi.requests_get',
+            operation: :'RequestsApi.requests_get',
+            options: { depth: 2, limit: subject_config[:limit], offset: 0 },
+            return_type: 'Requests',
+            result: @requests,
+          },
+        ],
+      )
+
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+    it 'should call RequestsApi.resources_get with the expected status when set' do
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        status: 'FAILED',
+        limit: 12,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      expect(subject.ui).to receive(:list).with(@request_list, :uneven_columns_across, 4)
+
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: '/requests',
+            operation: :'RequestsApi.requests_get',
+            options: { depth: 2, limit: subject_config[:limit], offset: 0, filter_request_status: subject_config[:status] },
+            return_type: 'Requests',
+            result: @requests,
+          },
+        ],
+      )
+
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+    it 'should call RequestsApi.resources_get with no status when set wrong' do
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        status: 'invalid',
+        limit: 12,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      expect(subject.ui).to receive(:list).with(@request_list, :uneven_columns_across, 4)
+      expect(subject.ui).to receive(:warn).with('status should be one of [QUEUED, RUNNING, DONE, FAILED]')
+
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: '/requests',
+            operation: :'RequestsApi.requests_get',
+            options: { depth: 2, limit: subject_config[:limit], offset: 0 },
+            return_type: 'Requests',
+            result: @requests,
+          },
+        ],
+      )
+
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+
+    it 'should call RequestsApi.resources_get with the expected method when set' do
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        method: 'DELETE',
+        limit: 12,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      expect(subject.ui).to receive(:list).with(@request_list, :uneven_columns_across, 4)
+
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: '/requests',
+            operation: :'RequestsApi.requests_get',
+            options: { depth: 2, limit: subject_config[:limit], offset: 0, filter_method: subject_config[:method] },
+            return_type: 'Requests',
+            result: @requests,
+          },
+        ],
+      )
+
+      expect { subject.run }.not_to raise_error(Exception)
+    end
+
+    it 'should call RequestsApi.resources_get with no method when set wrong' do
+      subject_config = {
+        ionoscloud_username: 'email',
+        ionoscloud_password: 'password',
+        method: 'invalid',
+        limit: 12,
+      }
+
+      subject_config.each { |key, value| subject.config[key] = value }
+
+      expect(subject.ui).to receive(:list).with(@request_list, :uneven_columns_across, 4)
+      expect(subject.ui).to receive(:warn).with('method should be one of [POST, PUT, PATCH, DELETE]')
+
+      mock_call_api(
+        subject,
+        [
+          {
+            method: 'GET',
+            path: '/requests',
+            operation: :'RequestsApi.requests_get',
             options: { depth: 2, limit: subject_config[:limit], offset: 0 },
             return_type: 'Requests',
             result: @requests,

data/spec/chef/knife/ionoscloud_request_status_spec.rb

@@ -7,7 +7,7 @@ describe Chef::Knife::IonoscloudRequestStatus do
   subject { Chef::Knife::IonoscloudRequestStatus.new }
 
   describe '#run' do
-    it 'should call RequestApi.requests_status_get and output the received status when the request ID is valid' do
+    it 'should call RequestsApi.requests_status_get and output the received status when the request ID is valid' do
       request_status = request_status_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -26,7 +26,7 @@ describe Chef::Knife::IonoscloudRequestStatus do
           {
             method: 'GET',
             path: "/requests/#{subject_config[:request_id]}/status",
-            operation: :'RequestApi.requests_status_get',
+            operation: :'RequestsApi.requests_status_get',
             return_type: 'RequestStatus',
             result: request_status,
           },
@@ -58,7 +58,7 @@ describe Chef::Knife::IonoscloudRequestStatus do
           {
             method: 'GET',
             path: "/requests/#{request_id}/status",
-            operation: :'RequestApi.requests_status_get',
+            operation: :'RequestsApi.requests_status_get',
             return_type: 'RequestStatus',
             exception: Ionoscloud::ApiError.new(code: 404),
           },

data/spec/chef/knife/ionoscloud_s3key_create_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudS3keyCreate do
   end
 
   describe '#run' do
-    it 'should call UserManagementApi.um_users_s3keys_post with the expected arguments and output based on what it receives' do
+    it 'should call UserS3KeysApi.um_users_s3keys_post with the expected arguments and output based on what it receives' do
       s3_key = s3_key_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -33,7 +33,7 @@ describe Chef::Knife::IonoscloudS3keyCreate do
           {
             method: 'POST',
             path: "/um/users/#{subject_config[:user_id]}/s3keys",
-            operation: :'UserManagementApi.um_users_s3keys_post',
+            operation: :'UserS3KeysApi.um_users_s3keys_post',
             return_type: 'S3Key',
             result: s3_key,
           },

data/spec/chef/knife/ionoscloud_s3key_delete_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudS3keyDelete do
   end
 
   describe '#run' do
-    it 'should call UserManagementApi.um_users_s3keys_delete when the ID is valid' do
+    it 'should call UserS3KeysApi.um_users_s3keys_delete when the ID is valid' do
       s3_key = s3_key_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -37,14 +37,14 @@ describe Chef::Knife::IonoscloudS3keyDelete do
           {
             method: 'GET',
             path: "/um/users/#{subject_config[:user_id]}/s3keys/#{s3_key.id}",
-            operation: :'UserManagementApi.um_users_s3keys_find_by_key_id',
+            operation: :'UserS3KeysApi.um_users_s3keys_find_by_key_id',
             return_type: 'S3Key',
             result: s3_key,
           },
           {
             method: 'DELETE',
             path: "/um/users/#{subject_config[:user_id]}/s3keys/#{s3_key.id}",
-            operation: :'UserManagementApi.um_users_s3keys_delete',
+            operation: :'UserS3KeysApi.um_users_s3keys_delete',
           },
         ],
       )
@@ -52,7 +52,7 @@ describe Chef::Knife::IonoscloudS3keyDelete do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should not call UserManagementApi.um_users_s3keys_delete when the ID is not valid' do
+    it 'should not call UserS3KeysApi.um_users_s3keys_delete when the ID is not valid' do
       s3_key_id = 'invalid_id'
       subject_config = {
         ionoscloud_username: 'email',
@@ -72,7 +72,7 @@ describe Chef::Knife::IonoscloudS3keyDelete do
           {
             method: 'GET',
             path: "/um/users/#{subject_config[:user_id]}/s3keys/#{s3_key_id}",
-            operation: :'UserManagementApi.um_users_s3keys_find_by_key_id',
+            operation: :'UserS3KeysApi.um_users_s3keys_find_by_key_id',
             return_type: 'S3Key',
             exception: Ionoscloud::ApiError.new(code: 404),
           },

data/spec/chef/knife/ionoscloud_s3key_list_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudS3keyList do
   end
 
   describe '#run' do
-    it 'should call UserManagementApi.um_users_s3keys_get' do
+    it 'should call UserS3KeysApi.um_users_s3keys_get' do
       s3_keys = s3_keys_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -39,7 +39,7 @@ describe Chef::Knife::IonoscloudS3keyList do
           {
             method: 'GET',
             path: "/um/users/#{subject_config[:user_id]}/s3keys",
-            operation: :'UserManagementApi.um_users_s3keys_get',
+            operation: :'UserS3KeysApi.um_users_s3keys_get',
             return_type: 'S3Keys',
             result: s3_keys,
           },