[roster-dns-management] r1148 committed - Catching error when trying to create duplicate user-group assignments.

[roster-dns...@googlecode.com]

Revision: 1148
Author: J.S.P...@gmail.com
Date: Wed Jul 10 11:46:10 2013
Log: Catching error when trying to create duplicate user-group
assignments.
http://code.google.com/p/roster-dns-management/source/detail?r=1148

Modified:
/trunk/roster-user-tools/scripts/dnsmkusergroup
/trunk/test/dnsmkusergroup_test.py

=======================================
--- /trunk/roster-user-tools/scripts/dnsmkusergroup Mon Jul 30 12:37:34 2012
+++ /trunk/roster-user-tools/scripts/dnsmkusergroup Wed Jul 10 11:46:10 2013
@@ -153,6 +153,15 @@
if( options.new_user not in users ):
cli_common_lib.DnsError('Username does not exist.', 1)

+ user_group_assignments = roster_client_lib.RunFunction(
+ u'ListUserGroupAssignments', options.username,
credfile=options.credfile,
+ credstring=options.credstring, server_name=options.server,
+ args=[options.new_user, options.group])['core_return']
+ if( options.new_user in user_group_assignments and
+ options.group in user_group_assignments[options.new_user] ):
+ cli_common_lib.DnsError('User-Group assignment "%s-%s" already
exists' % (
+ options.new_user, options.group), 1)
+
roster_client_lib.RunFunction(
u'MakeUserGroupAssignment', options.username,
credfile=options.credfile,
credstring=options.credstring, server_name=options.server,
=======================================
--- /trunk/test/dnsmkusergroup_test.py Mon Jul 30 12:37:34 2012
+++ /trunk/test/dnsmkusergroup_test.py Wed Jul 10 11:46:10 2013
@@ -144,6 +144,13 @@
self.assertEqual(output.read(),
'ADDED USER_GROUP_ASSIGNMENT: username: new_user group: cs\n')
output.close()
+ output = os.popen('python %s assignment -n new_user -g cs '
+ '-s %s -u %s -p %s --config-file %s' % (
+ EXEC, self.server_name, USERNAME,
+ PASSWORD, USER_CONFIG))
+ self.assertEqual(output.read(),
+ 'CLIENT ERROR: User-Group assignment "new_user-cs" already
exists\n')
+ output.close()
self.assertEqual(self.core_instance.ListUsers(),
{u'shuey': 64, u'new_user': 128, u'jcollins': 32,
u'tree_export_user': 0, u'sharrell': 128})