knife-ionoscloud 5.1.0 → 6.0.0.alpha.1

data/spec/chef/knife/ionoscloud_volume_delete_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudVolumeDelete do
   end
 
   describe '#run' do
-    it 'should call VolumeApi.datacenters_volumes_delete when the ID is valid' do
+    it 'should call VolumesApi.datacenters_volumes_delete when the ID is valid' do
       volume = volume_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -42,14 +42,14 @@ describe Chef::Knife::IonoscloudVolumeDelete do
           {
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/volumes/#{volume.id}",
-            operation: :'VolumeApi.datacenters_volumes_find_by_id',
+            operation: :'VolumesApi.datacenters_volumes_find_by_id',
             return_type: 'Volume',
             result: volume,
           },
           {
             method: 'DELETE',
             path: "/datacenters/#{subject_config[:datacenter_id]}/volumes/#{volume.id}",
-            operation: :'VolumeApi.datacenters_volumes_delete',
+            operation: :'VolumesApi.datacenters_volumes_delete',
           },
         ],
       )
@@ -57,7 +57,7 @@ describe Chef::Knife::IonoscloudVolumeDelete do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should not call VolumeApi.datacenters_volumes_delete when the ID is not valid' do
+    it 'should not call VolumesApi.datacenters_volumes_delete when the ID is not valid' do
       volume_id = 'invalid_id'
       subject_config = {
         ionoscloud_username: 'email',
@@ -77,7 +77,7 @@ describe Chef::Knife::IonoscloudVolumeDelete do
           {
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/volumes/#{volume_id}",
-            operation: :'VolumeApi.datacenters_volumes_find_by_id',
+            operation: :'VolumesApi.datacenters_volumes_find_by_id',
             return_type: 'Volume',
             exception: Ionoscloud::ApiError.new(code: 404),
           },

data/spec/chef/knife/ionoscloud_volume_detach_spec.rb

@@ -12,7 +12,7 @@ describe Chef::Knife::IonoscloudVolumeDetach do
   end
 
   describe '#run' do
-    it 'should call ServerApi.datacenters_servers_volumes_delete when the ID is valid' do
+    it 'should call ServersApi.datacenters_servers_volumes_delete when the ID is valid' do
       volume = volume_mock
       subject_config = {
         ionoscloud_username: 'email',
@@ -43,14 +43,14 @@ describe Chef::Knife::IonoscloudVolumeDetach do
           {
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/volumes/#{volume.id}",
-            operation: :'ServerApi.datacenters_servers_volumes_find_by_id',
+            operation: :'ServersApi.datacenters_servers_volumes_find_by_id',
             return_type: 'Volume',
             result: volume,
           },
           {
             method: 'DELETE',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/volumes/#{volume.id}",
-            operation: :'ServerApi.datacenters_servers_volumes_delete',
+            operation: :'ServersApi.datacenters_servers_volumes_delete',
           },
         ],
       )
@@ -58,7 +58,7 @@ describe Chef::Knife::IonoscloudVolumeDetach do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should not call ServerApi.datacenters_servers_volumes_delete when the ID is not valid' do
+    it 'should not call ServersApi.datacenters_servers_volumes_delete when the ID is not valid' do
       volume_id = 'invalid_id'
       subject_config = {
         ionoscloud_username: 'email',
@@ -79,7 +79,7 @@ describe Chef::Knife::IonoscloudVolumeDetach do
           {
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/volumes/#{volume_id}",
-            operation: :'ServerApi.datacenters_servers_volumes_find_by_id',
+            operation: :'ServersApi.datacenters_servers_volumes_find_by_id',
             return_type: 'Volume',
             exception: Ionoscloud::ApiError.new(code: 404),
           },

data/spec/chef/knife/ionoscloud_volume_list_spec.rb

@@ -41,7 +41,7 @@ describe Chef::Knife::IonoscloudVolumeList do
   end
 
   describe '#run' do
-    it 'should call VolumeApi.datacenters_volumes_get when no server_id is set' do
+    it 'should call VolumesApi.datacenters_volumes_get when no server_id is set' do
       subject_config = {
         ionoscloud_username: 'email',
         ionoscloud_password: 'password',
@@ -58,7 +58,7 @@ describe Chef::Knife::IonoscloudVolumeList do
           {
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/volumes",
-            operation: :'VolumeApi.datacenters_volumes_get',
+            operation: :'VolumesApi.datacenters_volumes_get',
             return_type: 'Volumes',
             result: @volumes,
           },
@@ -68,7 +68,7 @@ describe Chef::Knife::IonoscloudVolumeList do
       expect { subject.run }.not_to raise_error(Exception)
     end
 
-    it 'should call ServerApi.datacenters_servers_volumes_get when server_id is set' do
+    it 'should call ServersApi.datacenters_servers_volumes_get when server_id is set' do
       subject_config = {
         ionoscloud_username: 'email',
         ionoscloud_password: 'password',
@@ -87,7 +87,7 @@ describe Chef::Knife::IonoscloudVolumeList do
           {
             method: 'GET',
             path: "/datacenters/#{subject_config[:datacenter_id]}/servers/#{subject_config[:server_id]}/volumes",
-            operation: :'ServerApi.datacenters_servers_volumes_get',
+            operation: :'ServersApi.datacenters_servers_volumes_get',
             return_type: 'AttachedVolumes',
             result: @volumes,
           },

data/spec/spec_helper.rb

@@ -45,6 +45,14 @@ def contract_mock(opts = {})
   )
 end
 
+def contracts_mock(opts = {})
+  Ionoscloud::IpBlocks.new(
+    id: 'contracts',
+    type: 'collection',
+    items: [contract_mock],
+  )
+end
+
 def ipblock_mock(opts = {})
   Ionoscloud::IpBlock.new(
     id: opts[:id] || SecureRandom.uuid,
@@ -112,6 +120,18 @@ def servers_mock(opts = {})
   )
 end
 
+def token_mock
+  Ionoscloud::Token.new(
+    token: 'test_token'
+  )
+end
+
+def console_mock
+  Ionoscloud::RemoteConsoleUrl.new(
+    url: 'test_url'
+  )
+end
+
 def volume_mock(opts = {})
   Ionoscloud::Volume.new(
     id: opts[:id] || SecureRandom.uuid,
@@ -123,6 +143,8 @@ def volume_mock(opts = {})
       availability_zone: opts[:availability_zone] || 'AUTO',
       licence_type: opts[:licence_type] || 'LINUX',
       image: opts[:image] || SecureRandom.uuid,
+      backupunit_id: opts[:backupunit_id] || SecureRandom.uuid,
+      user_data: opts[:user_data] || 'user_data',
     ),
   )
 end
@@ -148,7 +170,6 @@ end
 def label_resources_mock(opts = {})
   Ionoscloud::LabelResources.new(
     id: 'labelresources',
-    type: 'collection',
     items: [label_resource_mock, label_resource_mock],
   )
 end
@@ -168,7 +189,6 @@ end
 def labels_mock(opts = {})
   Ionoscloud::Labels.new(
     id: 'labels',
-    type: 'collection',
     items: [label_mock, label_mock],
   )
 end
@@ -187,7 +207,6 @@ end
 def backupunits_mock(opts = {})
   Ionoscloud::BackupUnits.new(
     id: 'backupunits',
-    type: 'collection',
     items: [backupunit_mock, backupunit_mock],
   )
 end
@@ -218,11 +237,13 @@ def nic_mock(opts = {})
     properties: Ionoscloud::NicProperties.new(
       name: opts[:name] || 'nic_name',
       ips: opts[:ips] || ['1.1.1.1', '1.1.1.2'],
-      nat: opts[:nat] || true,
       dhcp: opts[:dhcp] || true,
       firewall_active: opts[:firewall_active] || true,
       mac: opts[:mac] || '00:0a:95:9d:68:16',
       lan: opts[:lan] || 1,
+      firewall_type: opts[:firewall_type] || 'INGRESS',
+      device_number: opts[:device_number] || 3,
+      pci_slot: opts[:pci_slot] || 6,
     ),
     entities: Ionoscloud::NicEntities.new(
       firewallrules: opts[:firewallrules] || [],
@@ -251,6 +272,7 @@ def firewall_mock(opts = {})
       port_range_end: opts[:port_range_end] || 22,
       icmp_type: opts[:icmp_type] || 4,
       icmp_code: opts[:icmp_code] || 7,
+      type: opts[:type] || 'INGRESS',
     ),
   )
 end
@@ -311,23 +333,7 @@ def location_mock(opts = {})
     id: opts[:id] || SecureRandom.uuid,
     properties: Ionoscloud::LocationProperties.new(
       name: opts[:name] || 'location_name',
-    ),
-  )
-end
-
-def locations_mock(opts = {})
-  Ionoscloud::Locations.new(
-    id: 'locations',
-    type: 'collection',
-    items: [location_mock],
-  )
-end
-
-def location_mock(opts = {})
-  Ionoscloud::Location.new(
-    id: opts[:id] || SecureRandom.uuid,
-    properties: Ionoscloud::LocationProperties.new(
-      name: opts[:name] || 'location_name',
+      cpu_architecture: opts[:cpu_architecture] || [Ionoscloud::CpuArchitectureProperties.new(cpu_family: 'INTEL_SKYLAKE')],
     ),
   )
 end
@@ -355,12 +361,7 @@ def auto_scaling_mock(opts = {})
 end
 
 def kubeconfig_mock(opts = {})
-  Ionoscloud::KubernetesConfig.new(
-    id: opts[:id] || SecureRandom.uuid,
-    properties: Ionoscloud::KubernetesConfigProperties.new(
-      kubeconfig: opts[:kubeconfig] || 'kubeconfig_file_data',
-    ),
-  )
+  'kubeconfig_file_data'
 end
 
 def k8s_cluster_mock(opts = {})
@@ -390,6 +391,20 @@ def k8s_clusters_mock(opts = {})
   )
 end
 
+
+def nodepool_lan_mock(opts = {})
+  Ionoscloud::KubernetesNodePoolLan.new(
+    id: opts[:id] || 1,
+    dhcp: opts[:dhcp] || false,
+    routes: opts[:routes] || [
+      Ionoscloud::KubernetesNodePoolLanRoutes.new(
+        network: opts[:network] || '1.2.3.4/24',
+        gateway_ip: opts[:gateway_ip] || '10.1.5.16',
+      ),
+    ],
+  )
+end
+
 def k8s_nodepool_mock(opts = {})
   Ionoscloud::KubernetesNodePool.new(
     id: opts[:id] || SecureRandom.uuid,
@@ -406,7 +421,7 @@ def k8s_nodepool_mock(opts = {})
       k8s_version: opts[:k8s_version] || '1.15.4',
       maintenance_window: opts[:maintenance_window] || maintenance_window_mock,
       auto_scaling: opts[:auto_scaling] || auto_scaling_mock,
-      lans: opts[:lans] || [lan_mock, lan_mock],
+      lans: opts[:lans] || [nodepool_lan_mock(id: 12), nodepool_lan_mock(id: 15)],
       labels: opts[:labels] || nil,
       annotations: opts[:annotations] || nil,
       public_ips: opts[:public_ips] || ['81.173.1.2', '82.231.2.5', '92.221.2.4'],
@@ -448,6 +463,15 @@ def k8s_nodes_mock(opts = {})
   )
 end
 
+def cpu_architecture_mock(opts = {})
+  Ionoscloud::CpuArchitectureProperties.new(
+    cpu_family: opts[:cpu_family] || 'INTEL_SKYLAKE',
+    max_cores: opts[:max_cores] || 4,
+    max_ram: opts[:max_ram] || 4096,
+    vendor: opts[:vendor] || 'AuthenticAMD',
+  )
+end
+
 def datacenter_mock(opts = {})
   Ionoscloud::Datacenter.new(
     id: opts[:id] || SecureRandom.uuid,
@@ -455,6 +479,7 @@ def datacenter_mock(opts = {})
       name: opts[:name] || 'datacenter_name',
       description: opts[:description] || 'datacenter_description',
       location: opts[:location] || 'de/fra',
+      cpu_architecture: opts[:cpu_architecture] || [cpu_architecture_mock],
     ),
   )
 end
@@ -589,6 +614,9 @@ def group_mock(opts = {})
       create_k8s_cluster: opts[:create_k8s_cluster] || true,
       create_pcc: opts[:create_pcc] || true,
       create_internet_access: opts[:create_internet_access] || true,
+      create_flow_log: opts[:create_flow_log] || true,
+      access_and_manage_monitoring: opts[:access_and_manage_monitoring] || true,
+      access_and_manage_certificates: opts[:access_and_manage_certificates] || true,
     ),
     entities: Ionoscloud::GroupEntities.new(
       users: group_members_mock,
@@ -672,6 +700,172 @@ def requests_mock(opts = {})
   )
 end
 
+def template_mock(opts = {})
+  Ionoscloud::Template.new(
+    id: opts[:id] || SecureRandom.uuid,
+    properties: Ionoscloud::TemplateProperties.new(
+      name: opts[:name] || 'template_name',
+      cores: opts[:cores] || 2.0,
+      ram: opts[:ram] || 2048.0,
+      storage_size: opts[:storage_size] || 100.0,
+    ),
+  )
+end
+
+def templates_mock(opts = {})
+  Ionoscloud::Templates.new(
+    id: 'templates',
+    type: 'collection',
+    items: [template_mock, template_mock],
+  )
+end
+
+def natgateway_rule_mock(opts = {})
+  Ionoscloud::NatGatewayRule.new(
+    id: opts[:id] || SecureRandom.uuid,
+    properties: Ionoscloud::NatGatewayRuleProperties.new(
+      name: opts[:name] || 'test',
+      type: opts[:type] || 'test',
+      protocol: opts[:protocol] || 'test',
+      public_ip: opts[:public_ip] || '1.1.1.1',
+      source_subnet: opts[:source_subnet] || '1.1.1.1/24',
+      target_subnet: opts[:target_subnet] || '1.1.1.1/24',
+      target_port_range: Ionoscloud::TargetPortRange.new(
+        start: opts[:target_port_range_start] || 10,
+        _end: opts[:target_port_range_end] || 20,
+      ),
+    ),
+  )
+end
+
+def natgateway_rules_mock(opts = {})
+  Ionoscloud::NatGatewayRules.new(
+    id: 'rules',
+    type: 'collection',
+    items: [natgateway_rule_mock, natgateway_rule_mock] || opts[:rules],
+  )
+end
+
+def natgateway_lan_mock(opts = {})
+  Ionoscloud::NatGatewayLanProperties.new(
+    id: opts[:lan_id] || 1,
+    gateway_ips: opts[:gateway_ips] || ['10.8.152.227/24', '10.8.152.227/24'],
+  )
+end
+
+def natgateway_mock(opts = {})
+  Ionoscloud::NatGateway.new(
+    id: opts[:id] || SecureRandom.uuid,
+    properties: Ionoscloud::NatGatewayProperties.new(
+      name: opts[:name] || 'test',
+      public_ips: opts[:ips] || ['1.1.1.1'],
+      lans: opts[:lans] || [natgateway_lan_mock],
+    ),
+    entities: Ionoscloud::NatGatewayEntities.new(
+      rules: natgateway_rules_mock || opts[:rules],
+    ),
+  )
+end
+
+def natgateways_mock(opts = {})
+  Ionoscloud::NatGateways.new(
+    id: 'natgateways',
+    type: 'collection',
+    items: [natgateway_mock, natgateway_mock],
+  )
+end
+
+def flowlog_mock(opts = {})
+  Ionoscloud::FlowLog.new(
+    id: opts[:id] || SecureRandom.uuid,
+    properties: Ionoscloud::FlowLogProperties.new({
+      name: opts[:name] || 'flowlog_name',
+      action: opts[:action] || 'ACCEPTED',
+      direction: opts[:direction] || 'INGRESS',
+      bucket: opts[:bucket] || 'bucket_name',
+    }),
+  )
+end
+
+def flowlogs_mock(opts = {})
+  Ionoscloud::FlowLogs.new(
+    id: 'flowlogs',
+    type: 'collection',
+    items: [flowlog_mock, flowlog_mock],
+  )
+end
+
+def network_loadbalancer_mock(opts = {})
+  Ionoscloud::NetworkLoadBalancer.new(
+    id: opts[:id] || SecureRandom.uuid,
+    properties: Ionoscloud::NetworkLoadBalancerProperties.new({
+      name: opts[:name] || 'network_loadbalancer_name',
+      ips: opts[:ips] || ['123.123.123.123'],
+      listener_lan: opts[:listener_lan] || 1,
+      target_lan: opts[:target_lan] || 2,
+      lb_private_ips: opts[:lb_private_ips] || ['12.12.12.12'],
+    }),
+    entities: Ionoscloud::NetworkLoadBalancerEntities.new({
+      forwardingrules: opts[:rules] || network_loadbalancer_rules_mock,
+      flowlogs: opts[:flowlogs] || Ionoscloud::FlowLogs.new(
+        id: 'flowlogs',
+        type: 'collection',
+        items: [],
+      ),
+    })
+  )
+end
+
+def network_loadbalancers_mock(opts = {})
+  Ionoscloud::Templates.new(
+    id: 'network_loadbalancers',
+    type: 'collection',
+    items: [network_loadbalancer_mock, network_loadbalancer_mock],
+  )
+end
+
+def network_loadbalancer_rule_mock(opts = {})
+  Ionoscloud::NetworkLoadBalancerForwardingRule.new(
+    id: opts[:id] || SecureRandom.uuid,
+    properties: Ionoscloud::NetworkLoadBalancerForwardingRuleProperties.new(
+      name: opts[:name] || 'network_loadbalancer_rule_name',
+      algorithm: opts[:algorithm] || 'ROUND_ROBIN',
+      protocol: opts[:protocol] || 'TCP',
+      listener_ip: opts[:listener_ip] || '123.123.123.123',
+      listener_port: opts[:listener_port] || 123,
+      health_check: Ionoscloud::NetworkLoadBalancerForwardingRuleHealthCheck.new(
+        client_timeout: opts[:client_timeout] || 100,
+        check_timeout: opts[:check_timeout] || 200,
+        connect_timeout: opts[:connect_timeout] || 300,
+        target_timeout: opts[:target_timeout] || 400,
+        retries: opts[:retries] || 3,
+      ),
+      targets: opts[:targets] || [network_loadbalancer_rule_target_mock, network_loadbalancer_rule_target_mock],
+    ),
+  )
+end
+
+def network_loadbalancer_rules_mock(opts = {})
+  Ionoscloud::NetworkLoadBalancerForwardingRules.new(
+    id: 'network_loadbalancers_forwarding_rules',
+    type: 'collection',
+    items: [network_loadbalancer_rule_mock, network_loadbalancer_rule_mock],
+  )
+end
+
+def network_loadbalancer_rule_target_mock(opts = {})
+  Ionoscloud::NetworkLoadBalancerForwardingRuleTarget.new(
+    ip: opts[:ip] || '123.123.123.123',
+    port: opts[:port] || 3,
+    weight: opts[:weight] || 10,
+    health_check: Ionoscloud::NetworkLoadBalancerForwardingRuleTargetHealthCheck.new(
+      check: opts[:check] || true,
+      check_interval: opts[:check_interval] || 100,
+      maintenance: opts[:maintenance] || false,
+    ),
+  )
+end
+
 def arrays_without_one_element(arr)
   result = [{ array: arr[1..], removed: [arr[0]] }]
   (1..arr.length - 1).each { |i| result.append({ array: arr[0..i - 1] + arr[i + 1..], removed: [arr[i]] }) }
@@ -692,7 +886,7 @@ def mock_call_api(subject, rules)
       expect(path).to eq(rule[:path])
       expect(opts[:operation]).to eq(rule[:operation])
       expect(opts[:form_params]).to eq(rule[:form_params] || {})
-      expect(opts[:return_type]).to eq(rule[:return_type] || 'Object')
+      expect(opts[:return_type]).to eq(rule[:return_type] || nil)
       expect(received_body).to eq(rule[:body] || nil)
       expect(opts.slice(*(rule[:options] || {}).keys)).to eql((rule[:options] || {}))