group add -> group create, to be consistent with user create/delete

This commit is contained in:
Alexandre Aubin 2019-09-11 00:57:32 +02:00
parent 0f688caccd
commit 34df84e222
5 changed files with 13 additions and 13 deletions

View file

@ -212,8 +212,8 @@ user:
help: fields to fetch
nargs: "+"
### user_group_add()
add:
### user_group_create()
create:
action_help: Create group
api: POST /users/groups
arguments:

View file

@ -288,7 +288,7 @@
"log_regen_conf": "Regenerate system configurations '{}'",
"log_user_create": "Add '{}' user",
"log_user_delete": "Delete '{}' user",
"log_user_group_add": "Add '{}' group",
"log_user_group_create": "Create '{}' group",
"log_user_group_delete": "Delete '{}' group",
"log_user_group_update": "Update '{}' group",
"log_user_update": "Update information of '{}' user",

View file

@ -7,7 +7,7 @@ from yunohost.utils.error import YunohostError
from moulinette.utils.log import getActionLogger
from yunohost.tools import Migration
from yunohost.user import user_group_add, user_group_update
from yunohost.user import user_group_create, user_group_update
from yunohost.app import app_setting, app_list
from yunohost.regenconf import regen_conf
from yunohost.permission import permission_add, permission_sync_to_user
@ -65,7 +65,7 @@ class MyMigration(Migration):
username = user_info['uid'][0]
ldap.update('uid=%s,ou=users' % username,
{'objectClass': ['mailAccount', 'inetOrgPerson', 'posixAccount', 'userPermissionYnh']})
user_group_add(username, gid=user_info['uidNumber'][0], sync_perm=False)
user_group_create(username, gid=user_info['uidNumber'][0], sync_perm=False)
user_group_update(groupname=username, add_user=username, force=True, sync_perm=False)
user_group_update(groupname='all_users', add_user=username, force=True, sync_perm=False)

View file

@ -1,7 +1,7 @@
import pytest
from moulinette.core import MoulinetteError
from yunohost.user import user_list, user_info, user_group_list, user_create, user_delete, user_update, user_group_add, user_group_delete, user_group_update, user_group_info
from yunohost.user import user_list, user_info, user_group_list, user_create, user_delete, user_update, user_group_create, user_group_delete, user_group_update, user_group_info
from yunohost.domain import _get_maindomain
from yunohost.utils.error import YunohostError
from yunohost.tests.test_permission import check_LDAP_db_integrity
@ -24,8 +24,8 @@ def setup_function(function):
user_create("bob", "Bob", "Snow", "bob@" + maindomain, "test123Ynh")
user_create("jack", "Jack", "Black", "jack@" + maindomain, "test123Ynh")
user_group_add("dev")
user_group_add("apps")
user_group_create("dev")
user_group_create("apps")
user_group_update("dev", add_user=["alice"])
user_group_update("apps", add_user=["bob"])
@ -83,7 +83,7 @@ def test_del_user():
assert "alice" not in group_res['all_users']['members']
def test_add_group():
user_group_add("adminsys")
user_group_create("adminsys")
group_res = user_group_list()['groups']
assert "adminsys" in group_res
@ -122,12 +122,12 @@ def test_del_bad_user_1():
def test_add_bad_group_1():
# Check groups already exist with special group "all_users"
with pytest.raises(YunohostError):
user_group_add("all_users")
user_group_create("all_users")
def test_add_bad_group_2():
# Check groups already exist (for standard groups)
with pytest.raises(MoulinetteError):
user_group_add("dev")
user_group_create("dev")
def test_del_bad_group_1():
# Check not allowed to remove this groups

View file

@ -218,7 +218,7 @@ def user_create(operation_logger, username, firstname, lastname, mail, password,
exc_info=1)
# Create group for user and add to group 'all_users'
user_group_add(groupname=username, gid=uid, sync_perm=False)
user_group_create(groupname=username, gid=uid, sync_perm=False)
user_group_update(groupname=username, add_user=username, force=True, sync_perm=False)
user_group_update(groupname='all_users', add_user=username, force=True, sync_perm=True)
@ -554,7 +554,7 @@ def user_group_list(fields=None):
@is_unit_operation([('groupname', 'user')])
def user_group_add(operation_logger, groupname, gid=None, sync_perm=True):
def user_group_create(operation_logger, groupname, gid=None, sync_perm=True):
"""
Create group