Remove the old acl_groups_users and acl_groups_hosts many2many pivot
table column name hack.
Renames acl_group_id -> aclgroup_id.
Adds a migration script and updates the one piece of code that actually
depended upon the old name.
This is needed for my upcoming change that ports autotest to Django
1.0.x but seems worth cleaning up as a change of its own.
Signed-off-by: Gregory Smith <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2764 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/cli/host.py b/cli/host.py
index 72f6dfe..59ffcb3 100755
--- a/cli/host.py
+++ b/cli/host.py
@@ -157,11 +157,11 @@
check_results['status__in'] = None
if self.acl:
- filters['acl_group__name'] = self.acl
- check_results['acl_group__name'] = None
+ filters['aclgroup__name'] = self.acl
+ check_results['aclgroup__name'] = None
if self.user:
- filters['acl_group__users__login'] = self.user
- check_results['acl_group__users__login'] = None
+ filters['aclgroup__users__login'] = self.user
+ check_results['aclgroup__users__login'] = None
return super(host_list, self).execute(op='get_hosts',
filters=filters,
check_results=check_results)
diff --git a/cli/user.py b/cli/user.py
index 83e69d0..8257c79 100755
--- a/cli/user.py
+++ b/cli/user.py
@@ -80,8 +80,8 @@
filters = {}
check_results = {}
if self.acl:
- filters['acl_group__name__in'] = [self.acl]
- check_results['acl_group__name__in'] = None
+ filters['aclgroup__name__in'] = [self.acl]
+ check_results['aclgroup__name__in'] = None
if self.access_level:
filters['access_level__in'] = [self.access_level]
diff --git a/cli/user_unittest.py b/cli/user_unittest.py
index 8593f2c..d037a3d 100755
--- a/cli/user_unittest.py
+++ b/cli/user_unittest.py
@@ -88,7 +88,7 @@
def test_execute_list_all_with_acl(self):
self.run_cmd(argv=['atest', 'user', 'list', '--acl', 'acl0'],
- rpcs=[('get_users', {'acl_group__name__in': ['acl0']},
+ rpcs=[('get_users', {'aclgroup__name__in': ['acl0']},
True,
[{u'access_level': 2,
u'login': u'user0',
@@ -140,7 +140,7 @@
def test_execute_list_all_with_acl_verbose(self):
self.run_cmd(argv=['atest', 'user', 'list', '--acl', 'acl0', '-v'],
- rpcs=[('get_users', {'acl_group__name__in': ['acl0']},
+ rpcs=[('get_users', {'aclgroup__name__in': ['acl0']},
True,
[{u'access_level': 2,
u'login': u'user0',
