btrfs: add all subvolume commands #50541

aplanas · 2018-11-16T14:15:32Z

What does this PR do?

Add all subvolume commands to the btrfs module

Tests written?

Yes

isbm

Please take a look at these points and please use pytest's ecosystem instead.

salt/modules/btrfs.py

tests/unit/modules/test_btrfs.py

salt/modules/btrfs.py

aplanas · 2018-11-20T12:53:18Z

I changed the code a bit. I added one new function, subvolume_exists, and I changed create and delete to first check if the volume is there or is missing.

I updated the tests and added more scenarios to cover the new features.

salt/modules/btrfs.py

aplanas · 2018-11-22T13:25:02Z

@cachedout @terminalmage I changed the last commit a bit. I hope that is more aligned with the rest of the modules for noops.

aplanas · 2018-11-22T15:09:00Z

I changed the subvolume_exists function to avoid logging ERROR in case that a subvolume do not exits, but functionally is equivalent. Also I added the documentation required.

If the create and delete actions are not needed, the function will return False. This indicate that the submodule was already there, or was missing on the first place.

cachedout · 2018-11-26T16:41:25Z

Merged! Thanks, @aplanas

saltstack/salt#49668 saltstack/salt#49669 saltstack/salt#49670 saltstack/salt#49803 saltstack/salt#49804 saltstack/salt#50126 saltstack/salt#50175 saltstack/salt#50302 saltstack/salt#50380 saltstack/salt#50396 saltstack/salt#50418 saltstack/salt#50452 saltstack/salt#50473 saltstack/salt#50541 saltstack/salt#50607 saltstack/salt#50635 saltstack/salt#50671 saltstack/salt#50706 saltstack/salt#50725 saltstack/salt#50801 saltstack/salt#50834 saltstack/salt#51074 saltstack/salt#51094 saltstack/salt#51135

* blockdev: fix url from comment saltstack/salt#49668 * Documentation: fix typo in "equivalent" saltstack/salt#49669 * states_pt3: fix rST link format saltstack/salt#49670 * parted: fix _validate_partition_boundary saltstack/salt#49803 * parted: fix the ordering of list command saltstack/salt#49804 * Fix lowpkg.diff documentation and parameter name saltstack/salt#50126 * Add root parameter to useradd, shadow and groupadd saltstack/salt#50175 * cmd: Add root parameter for wait and run states saltstack/salt#50302 * systemd: add optional root parameter saltstack/salt#50380 * service: SUSE is not based on sysvinit anymore saltstack/salt#50396 * Add new chroot module saltstack/salt#50418 * Add new module freezer saltstack/salt#50452 * parted: support variable length output for print saltstack/salt#50473 * btrfs: add all subvolume commands saltstack/salt#50541 * file: update attributes for lsattr and chattr saltstack/salt#50607 * btrfs: add new btrfs state saltstack/salt#50635 * zypper: demote log from error to warning saltstack/salt#50671 * blkid: add search by token saltstack/salt#50706 * mount: add fstab_{present,absent} states saltstack/salt#50725 * btrfs: add option to not set subvolumes as default saltstack/salt#50801 * Add disk_set and disk_toggle functions, and update valid partition flags saltstack/salt#50834 * disk: support setting FAT size for format_ saltstack/salt#51074 * cmdmod: add sysfs into the chroot saltstack/salt#51094 * mount: cache blkid information saltstack/salt#51135

* Add root and no_recommends parameters in the public interface for Zypper and RPM (lowpkg) saltstack/salt#50125 * Add root parameter to useradd, shadow and groupadd saltstack/salt#50175 * cmd: Add root parameter for wait and run states saltstack/salt#50302 * systemd: add optional root parameter saltstack/salt#50380 * Add new chroot module https://github.com/openSUSE/salt/pull/50418 * Add new module freezer saltstack/salt#50452 * btrfs: add all subvolume commands saltstack/salt#50541 * btrfs: add new btrfs state saltstack/salt#50635 * zypper: demote log from error to warning saltstack/salt#50671 * blkid: add search by token saltstack/salt#50706 * mount: add fstab_{present,absent} states saltstack/salt#50725 * btrfs: add option to not set subvolumes as default https://github.com/openSUSE/salt/pull/50801 * Add disk_set and disk_toggle functions, and update valid partition flags https://github.com/openSUSE/salt/pull/50834 * disk: support setting FAT size for format_ https://github.com/openSUSE/salt/pull/51074 * parted: fix set_ valid flags comment. https://github.com/openSUSE/salt/pull/51704 * grains/core: ignore HOST_NOT_FOUND errno in fqdns() https://github.com/openSUSE/salt/pull/51706 * cmdmod: add 'binds' parameter in run_chroot https://github.com/openSUSE/salt/pull/51871 * mount: fix extra -t parameter https://github.com/openSUSE/salt/pull/51905 * lvm: be quiet when a pv, lv or vg is not expected https://github.com/openSUSE/salt/pull/51929 * linux_lvm: clean error in pvcreate and pvremove https://github.com/openSUSE/salt/pull/51954 * blockdev: hide blkid errors when are expected https://github.com/openSUSE/salt/pull/51956 * partially unify public functions signature for pkg and lowpkg https://github.com/openSUSE/salt/pull/51973 * extmods: add utils directories in sys.path https://github.com/openSUSE/salt/pull/52001

* Add root and no_recommends parameters in the public interface for Zypper and RPM (lowpkg) saltstack/salt#50125 * Add root parameter to useradd, shadow and groupadd saltstack/salt#50175 * cmd: Add root parameter for wait and run states saltstack/salt#50302 * systemd: add optional root parameter saltstack/salt#50380 * Add new chroot module https://github.com/openSUSE/salt/pull/50418 * Add new module freezer saltstack/salt#50452 * btrfs: add all subvolume commands saltstack/salt#50541 * btrfs: add new btrfs state saltstack/salt#50635 * zypper: demote log from error to warning saltstack/salt#50671 * blkid: add search by token saltstack/salt#50706 * mount: add fstab_{present,absent} states saltstack/salt#50725 * btrfs: add option to not set subvolumes as default saltstack/salt#50801 * Add disk_set and disk_toggle functions, and update valid partition flags saltstack/salt#50834 * disk: support setting FAT size for format_ saltstack/salt#51074 * parted: fix set_ valid flags comment. saltstack/salt#51704 * grains/core: ignore HOST_NOT_FOUND errno in fqdns() saltstack/salt#51706 * cmdmod: add 'binds' parameter in run_chroot saltstack/salt#51871 * mount: fix extra -t parameter saltstack/salt#51905 * lvm: be quiet when a pv, lv or vg is not expected saltstack/salt#51929 * linux_lvm: clean error in pvcreate and pvremove saltstack/salt#51954 * blockdev: hide blkid errors when are expected saltstack/salt#51956 * partially unify public functions signature for pkg and lowpkg saltstack/salt#51973 * extmods: add utils directories in sys.path saltstack/salt#52001

ghost self-requested a review November 16, 2018 14:15

aplanas force-pushed the fix_btrfs branch from 0c2c141 to 30df532 Compare November 16, 2018 14:20

isbm suggested changes Nov 16, 2018

View reviewed changes

salt/modules/btrfs.py Outdated Show resolved Hide resolved

tests/unit/modules/test_btrfs.py Outdated Show resolved Hide resolved

tests/unit/modules/test_btrfs.py Outdated Show resolved Hide resolved

tests/unit/modules/test_btrfs.py Outdated Show resolved Hide resolved

aplanas force-pushed the fix_btrfs branch from 30df532 to cced6c1 Compare November 16, 2018 15:08

isbm suggested changes Nov 17, 2018

View reviewed changes

salt/modules/btrfs.py Outdated Show resolved Hide resolved

salt/modules/btrfs.py Outdated Show resolved Hide resolved

salt/modules/btrfs.py Show resolved Hide resolved

aplanas force-pushed the fix_btrfs branch 2 times, most recently from 2df7544 to 75ecbae Compare November 20, 2018 12:51

isbm suggested changes Nov 22, 2018

View reviewed changes

salt/modules/btrfs.py Show resolved Hide resolved

salt/modules/btrfs.py Show resolved Hide resolved

aplanas force-pushed the fix_btrfs branch from 1400402 to d6789c8 Compare November 22, 2018 13:23

aplanas force-pushed the fix_btrfs branch from d6789c8 to 00aabf0 Compare November 22, 2018 14:56

isbm approved these changes Nov 22, 2018

View reviewed changes

aplanas force-pushed the fix_btrfs branch from 00aabf0 to 99750e8 Compare November 22, 2018 16:02

aplanas added 3 commits November 26, 2018 10:36

btrfs: add all subvolume commands

c476a21

btrfs: add subvolume_exists

5de7ce4

btrfs: create and delete return False if noop

5feae48

If the create and delete actions are not needed, the function will return False. This indicate that the submodule was already there, or was missing on the first place.

aplanas force-pushed the fix_btrfs branch from 99750e8 to 5feae48 Compare November 26, 2018 09:36

aplanas mentioned this pull request Nov 26, 2018

btrfs: add new btrfs state #50635

Merged

cachedout merged commit d457ac2 into saltstack:develop Nov 26, 2018

aplanas deleted the fix_btrfs branch November 27, 2018 09:57

aplanas mentioned this pull request Jan 30, 2019

btrfs: add all subvolume commands #51418

Closed

aplanas mentioned this pull request Jan 30, 2019

Backport from develop features required by yomi openSUSE/salt#120

Closed

aplanas mentioned this pull request Oct 11, 2019

(Backport 50541) btrfs: add all subvolume commands #54961

Merged

waynew added this to PR needs port to master in PRs to port to master Oct 24, 2019

garethgreenaway moved this from PR needs port to master to PR has port to master in PRs to port to master Mar 24, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

btrfs: add all subvolume commands #50541

btrfs: add all subvolume commands #50541

aplanas commented Nov 16, 2018

isbm left a comment

aplanas commented Nov 20, 2018

aplanas commented Nov 22, 2018

aplanas commented Nov 22, 2018

cachedout commented Nov 26, 2018

btrfs: add all subvolume commands #50541

btrfs: add all subvolume commands #50541

Conversation

aplanas commented Nov 16, 2018

What does this PR do?

Tests written?

isbm left a comment

Choose a reason for hiding this comment

aplanas commented Nov 20, 2018

aplanas commented Nov 22, 2018

aplanas commented Nov 22, 2018

cachedout commented Nov 26, 2018