Skip to content

Commit 0e56264

Browse files
stejskalleosstejskalleos
committed
Fixes #38294 - Remove oVirt
1 parent d2d117b commit 0e56264

File tree

8 files changed

+28
-193
lines changed

8 files changed

+28
-193
lines changed

‎doc/host_create.md

-27
Original file line numberDiff line numberDiff line change
@@ -225,33 +225,6 @@ security_groups
225225
network
226226
```
227227

228-
## oVirt
229-
Available keys for `--compute-attributes`:
230-
```
231-
cluster
232-
template # hardware profile to use
233-
cores # int value, number of cores
234-
sockets # int value, number of sockets
235-
memory # amount of memory, int value in bytes
236-
start # Must be a 1 or 0, whether to start the machine or not
237-
```
238-
239-
Available keys for `--interface`:
240-
```
241-
compute_name # eg. eth0
242-
compute_network # select one of available networks for a cluster
243-
compute_interface # interface type
244-
```
245-
246-
Available keys for `--volume`:
247-
```
248-
size_gb # volume size in GB, integer value
249-
storage_domain # select one of available storage domains
250-
bootable # boolean, only one volume can be bootable
251-
preallocate # boolean, set true to preallocate
252-
wipe_after_delete # boolean, set true to wipe disk after delete
253-
```
254-
255228
## VMware
256229
Available keys for `--compute-attributes`:
257230
```

‎lib/hammer_cli_foreman/compute_resource.rb

-18
Original file line numberDiff line numberDiff line change
@@ -51,21 +51,11 @@ def print_data(data)
5151

5252

5353
class CreateCommand < HammerCLIForeman::CreateCommand
54-
option "--public-key-path", "PUBLIC_KEY_PATH", _("Path to a file that contains oVirt public key (For oVirt only)"),
55-
:format => HammerCLI::Options::Normalizers::File.new
56-
57-
5854
success_message _("Compute resource created.")
5955
failure_message _("Could not create the compute resource")
6056

6157
build_options
6258

63-
def request_params
64-
params = super
65-
params['compute_resource']['public_key'] = option_public_key_path if option_public_key_path
66-
params
67-
end
68-
6959
validate_options do
7060
if option(:option_provider).value.nil? || option(:option_name).value.nil?
7161
all(:option_name, :option_provider).required
@@ -82,17 +72,9 @@ def request_params
8272
end
8373

8474
class UpdateCommand < HammerCLIForeman::UpdateCommand
85-
option "--public-key-path", "PUBLIC_KEY_PATH", _("Path to a file that contains oVirt public key (For oVirt only)"),
86-
:format => HammerCLI::Options::Normalizers::File.new
87-
8875
success_message _("Compute resource updated.")
8976
failure_message _("Could not update the compute resource")
9077

91-
def request_params
92-
params = super
93-
params['compute_resource']['public_key'] = option_public_key_path if option_public_key_path
94-
params
95-
end
9678
build_options :without => :name
9779
end
9880

‎lib/hammer_cli_foreman/compute_resource/ovirt.rb

-70
This file was deleted.

‎lib/hammer_cli_foreman/compute_resource/register_compute_resources.rb

-1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@ def self.register_compute_resource(name, compute_resource)
1212
require 'hammer_cli_foreman/compute_resource/ec2.rb'
1313
require 'hammer_cli_foreman/compute_resource/libvirt.rb'
1414
require 'hammer_cli_foreman/compute_resource/openstack.rb'
15-
require 'hammer_cli_foreman/compute_resource/ovirt.rb'
1615
require 'hammer_cli_foreman/compute_resource/vmware.rb'
1716
end

‎test/functional/compute_attribute_test.rb

+24-24
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"id" => 2,
4949
"compute_resource_id" => 1,
5050
"compute_resource_name" => "bla",
51-
"provider_friendly_name" => "oVirt",
51+
"provider_friendly_name" => "Libvirt",
5252
"compute_profile_id" => 1,
5353
"compute_profile_name" => "profile2",
5454
"vm_attrs" => {}
@@ -59,16 +59,16 @@
5959
"compute_attribute" =>
6060
{
6161
"id" => 2, "compute_resource_id" => 1, "compute_resource_name" => "bla",
62-
"provider_friendly_name" => "oVirt", "compute_profile_id" => 1,
62+
"provider_friendly_name" => "Libvirt", "compute_profile_id" => 1,
6363
"compute_profile_name" => "profile2", "vm_attrs" => {"cores" => "1"}
6464
}
6565
}
6666

6767
@compute_resource = {
6868
"id" => 1,
69-
"name" => "ovirt_compute_resource",
70-
"provider" => "Ovirt",
71-
"provider_friendly_name" => "oVirt",
69+
"name" => "libvirt_compute_resource",
70+
"provider" => "Libvirt",
71+
"provider_friendly_name" => "Libvirt",
7272
}
7373
end
7474

@@ -129,15 +129,15 @@
129129
"id" => 2,
130130
"compute_resource_id" => 1,
131131
"compute_resource_name" => "bla",
132-
"provider_friendly_name" => "oVirt",
132+
"provider_friendly_name" => "Libvirt",
133133
"compute_profile_id" => 1,
134134
"compute_profile_name" => "profile2",
135135
"vm_attrs" => {}
136136
}]
137137
}
138138
@compute_attribute = {
139139
"id" => 2, "compute_resource_id" => 1, "compute_resource_name" => "bla",
140-
"provider_friendly_name" => "oVirt", "compute_profile_id" => 1, "compute_profile_name" => "profile2",
140+
"provider_friendly_name" => "Libvirt", "compute_profile_id" => 1, "compute_profile_name" => "profile2",
141141
"vm_attrs" => {"volumes_attributes" => {"1525004465" => {"size_gb" => "1"}}}
142142
}
143143

@@ -211,7 +211,7 @@
211211
"id" => 2,
212212
"compute_resource_id" => 1,
213213
"compute_resource_name" => "bla",
214-
"provider_friendly_name" => "oVirt",
214+
"provider_friendly_name" => "Libvirt",
215215
"compute_profile_id" => 1,
216216
"compute_profile_name" => "profile2",
217217
"vm_attrs" => {}
@@ -283,15 +283,15 @@
283283
"id" => 2,
284284
"compute_resource_id" => 1,
285285
"compute_resource_name" => "bla",
286-
"provider_friendly_name" => "oVirt",
286+
"provider_friendly_name" => "Libvirt",
287287
"compute_profile_id" => 1,
288288
"compute_profile_name" => "profile2",
289289
"vm_attrs" => {"volumes_attributes" => { "1" => {"size_gb"=>"1"}}}
290290
}]
291291
}
292292
@compute_attribute = {
293293
"id" => 2, "compute_resource_id" => 1, "compute_resource_name" => "bla",
294-
"provider_friendly_name" => "oVirt", "compute_profile_id" => 1,
294+
"provider_friendly_name" => "Libvirt", "compute_profile_id" => 1,
295295
"compute_profile_name" => "profile2", "vm_attrs" => {"volumes_attributes" => {}}
296296
}
297297
end
@@ -362,7 +362,7 @@
362362
"id" => 2,
363363
"compute_resource_id" => 1,
364364
"compute_resource_name" => "bla",
365-
"provider_friendly_name" => "oVirt",
365+
"provider_friendly_name" => "Libvirt",
366366
"compute_profile_id" => 1,
367367
"compute_profile_name" => "profile2",
368368
"vm_attrs" => {}
@@ -376,7 +376,7 @@
376376
"id" => 2,
377377
"compute_resource_id" => 1,
378378
"compute_resource_name" => "bla",
379-
"provider_friendly_name" => "oVirt",
379+
"provider_friendly_name" => "Libvirt",
380380
"compute_profile_id" => 1,
381381
"compute_profile_name" => "profile2",
382382
"vm_attrs" => {}
@@ -385,9 +385,9 @@
385385

386386
@compute_resource = {
387387
"id" => 1,
388-
"name" => "ovirt_compute_resource",
389-
"provider" => "Ovirt",
390-
"provider_friendly_name" => "oVirt",
388+
"name" => "libvirt_compute_resource",
389+
"provider" => "Libvirt",
390+
"provider_friendly_name" => "Libvirt",
391391
}
392392

393393
end
@@ -491,7 +491,7 @@
491491
"id" => 2,
492492
"compute_resource_id" => 1,
493493
"compute_resource_name" => "bla",
494-
"provider_friendly_name" => "oVirt",
494+
"provider_friendly_name" => "Libvirt",
495495
"compute_profile_id" => 1,
496496
"compute_profile_name" => "profile2",
497497
"vm_attrs" => {}
@@ -500,9 +500,9 @@
500500

501501
@compute_resource = {
502502
"id" => 1,
503-
"name" => "ovirt_compute_resource",
504-
"provider" => "Ovirt",
505-
"provider_friendly_name" => "oVirt",
503+
"name" => "libvirt_compute_resource",
504+
"provider" => "Libvirt",
505+
"provider_friendly_name" => "Libvirt",
506506
}
507507
end
508508

@@ -574,23 +574,23 @@
574574
"id" => 2,
575575
"compute_resource_id" => 1,
576576
"compute_resource_name" => "bla",
577-
"provider_friendly_name" => "oVirt",
577+
"provider_friendly_name" => "Libvirt",
578578
"compute_profile_id" => 1,
579579
"compute_profile_name" => "profile2",
580580
"vm_attrs" => {"interfaces_attributes" => { "1" => {"compute_name"=>"eth0"}}}
581581
}]
582582
}
583583
@compute_attribute = {
584584
"id" => 2, "compute_resource_id" => 1, "compute_resource_name" => "bla",
585-
"provider_friendly_name" => "oVirt", "compute_profile_id" => 1,
585+
"provider_friendly_name" => "Libvirt", "compute_profile_id" => 1,
586586
"compute_profile_name" => "profile2", "vm_attrs" => {"interfaces_attributes" => {}}
587587
}
588588

589589
@compute_resource = {
590590
"id" => 1,
591-
"name" => "ovirt_compute_resource",
592-
"provider" => "Ovirt",
593-
"provider_friendly_name" => "oVirt",
591+
"name" => "libvirt_compute_resource",
592+
"provider" => "Libvirt",
593+
"provider_friendly_name" => "Libvirt",
594594
}
595595

596596
end

‎test/functional/compute_profile_test.rb

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
"id": 2,
2727
"compute_resource_id": 3,
2828
"compute_resource_name": "bla",
29-
"provider_friendly_name": "oVirt",
29+
"provider_friendly_name": "Libvirt",
3030
"compute_profile_id": 1,
3131
"compute_profile_name": "profile2",
3232
}]
@@ -64,7 +64,7 @@
6464
"id": 4,
6565
"compute_resource_id": 3,
6666
"compute_resource_name": "bla",
67-
"provider_friendly_name": "oVirt",
67+
"provider_friendly_name": "Libvirt",
6868
"compute_profile_id": 3,
6969
"compute_profile_name": "profile3",
7070
}]

‎test/functional/compute_resource_test.rb

+1-50
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
assert_cmd(expected_result, result)
6262
end
6363
end
64-
64+
6565

6666
it 'should print error for blank --provider option' do
6767
params = %w(--provider= --name=new'')
@@ -109,55 +109,6 @@
109109

110110
assert_cmd(success_result("Compute resource created.\n"), result)
111111
end
112-
113-
it 'should create a compute-resource ovirt' do
114-
params = %w(--name=test-ovirt
115-
--provider=ovirt
116-
--url=https://ovirt.example.com/ovirt-engine/api
117-
--user=foreman
118-
--password=changeme
119-
--datacenter=ovirt.example.com)
120-
121-
api_expects(:compute_resources, :create, 'Create Compute Resource') do |params|
122-
(params['compute_resource']['name'] == 'test-ovirt') &&
123-
(params['compute_resource']['provider'] == 'ovirt') &&
124-
(params['compute_resource']['url'] == 'https://ovirt.example.com/ovirt-engine/api') &&
125-
(params['compute_resource']['user'] == 'foreman') &&
126-
(params['compute_resource']['password'] == 'changeme') &&
127-
(params['compute_resource']['datacenter'] == 'ovirt.example.com')
128-
end
129-
130-
result = run_cmd(@cmd + params)
131-
132-
assert_cmd(success_result("Compute resource created.\n"), result)
133-
end
134-
135-
136-
it 'should create a compute-resource ovirt with custom public key' do
137-
tempfile = Tempfile.new('ca.pem')
138-
tempfile << 'test data'
139-
tempfile.close
140-
params = %W(--name=test-ovirt
141-
--provider=ovirt
142-
--url=https://ovirt.example.com/ovirt-engine/api
143-
--user=foreman
144-
--password=changeme
145-
--datacenter=ovirt.example.com
146-
--public-key-path=#{tempfile.path})
147-
148-
api_expects(:compute_resources, :create, 'Create Compute Resource') do |params|
149-
(params['compute_resource']['name'] =='test-ovirt') &&
150-
(params['compute_resource']['provider'] == 'ovirt') &&
151-
(params['compute_resource']['url'] == 'https://ovirt.example.com/ovirt-engine/api') &&
152-
(params['compute_resource']['user'] == 'foreman') &&
153-
(params['compute_resource']['password'] == 'changeme') &&
154-
(params['compute_resource']['datacenter'] == 'ovirt.example.com' &&
155-
(params['compute_resource']['public_key'] == 'test data'))
156-
end
157-
result = run_cmd(@cmd + params)
158-
159-
assert_cmd(success_result("Compute resource created.\n"), result)
160-
end
161112
end
162113

163114
describe 'clusters' do

0 commit comments

Comments
 (0)