Skip to content
This repository was archived by the owner on Apr 7, 2022. It is now read-only.

[1LP][RFR] Update template upload for rhevm, name database disk #8936

Merged
merged 2 commits into from
Jun 25, 2019
Merged

[1LP][RFR] Update template upload for rhevm, name database disk #8936

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f90649b
Update template upload for rhevm, name database disk
mshriver Jun 11, 2019
98bec32
Update wrapanapi to 3.2.1
mshriver Jun 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions cfme/utils/template/rhevm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,10 @@ def add_disk_to_vm(self):
return
rhevm_specs = cfme_data.template_upload.template_upload_rhevm
disk_kwargs = dict(storage_domain=self.provider_data.template_upload.storage_domain,
size=rhevm_specs.disk_size,
interface=rhevm_specs.disk_interface,
format=rhevm_specs.disk_format)
size=rhevm_specs.get('disk_size', 5000000000),
Copy link
Contributor

@kedark3 kedark3 Jun 11, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see we are defaulting to this value, do you think it would benefit us in any way to have that as a parameter on add_disk_to_vm?

Copy link
Member Author

@mshriver mshriver Jun 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not in this case, since this is just a template upload method.

interface=rhevm_specs.get('disk_interface', 'virtio'),
format=rhevm_specs.get('disk_format', 'cow'),
name=rhevm_specs.get('disk_name'))
temp_vm.add_disk(**disk_kwargs)
# check, if there are two disks
if temp_vm.get_disks_count() < 2:
Expand Down
2 changes: 1 addition & 1 deletion requirements/frozen.py2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ Werkzeug==0.15.2
widgetastic.core==0.39
widgetastic.patternfly==0.1.4
widgetsnbextension==3.4.2
wrapanapi==3.2.0
wrapanapi==3.2.1
wrapt==1.11.1
xmltodict==0.12.0
yaycl==0.3.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/frozen.py3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ Werkzeug==0.15.2
widgetastic.core==0.39
widgetastic.patternfly==0.1.4
widgetsnbextension==3.4.2
wrapanapi==3.2.0
wrapanapi==3.2.1
wrapt==1.11.1
xmltodict==0.12.0
yaycl==0.3.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/frozen_docs.py2.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ Werkzeug==0.15.2
widgetastic.core==0.39
widgetastic.patternfly==0.1.4
widgetsnbextension==3.4.2
wrapanapi==3.2.0
wrapanapi==3.2.1
wrapt==1.11.1
xmltodict==0.12.0
yaycl==0.3.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/frozen_docs.py3.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ Werkzeug==0.15.2
widgetastic.core==0.39
widgetastic.patternfly==0.1.4
widgetsnbextension==3.4.2
wrapanapi==3.2.0
wrapanapi==3.2.1
wrapt==1.11.1
xmltodict==0.12.0
yaycl==0.3.0
Expand Down