account: Port tests to lmishell base

1 files changed, 28 insertions, 24 deletions

diff --git a/src/account/test/TestMemberOfGroup.py b/src/account/test/TestMemberOfGroup.py
index 211244e..d44ca5a 100644
--- a/src/account/test/TestMemberOfGroup.py
+++ b/src/account/test/TestMemberOfGroup.py
@@ -20,28 +20,34 @@
 
 from common import AccountBase
 from methods import *
-import pywbem
+from lmi.shell import LMIInstance
+from lmi.shell import LMIInstanceName
 
 class TestMemberOfGroup(AccountBase):
     """
     Class for testing LMI_MemberOfGroup class
     """
+
+    def tearDown(self):
+        clean_account(self.user_name)
+        clean_group(self.group_name)
+
     def test_add_user_to_group(self):
         """
         Account: Test to add user to group
         """
         create_account(self.user_name)
         create_group(self.group_name)
-        user = self.wbemconnection.ExecQuery('WQL',
-            'select * from LMI_Account where Name = "%s"' %self.user_name)[0]
-        group = self.wbemconnection.ExecQuery('WQL',
-            'select * from LMI_Group where Name = "%s"' %self.group_name)[0]
-        tocreate = pywbem.CIMInstance('LMI_MemberOfGroup',
-            {'Collection' : group.path,
-            'Member' : user.path})
-        self.wbemconnection.CreateInstance(tocreate)
-        clean_account(self.user_name)
-        clean_group(self.group_name)
+        user = self.ns.LMI_Account.first_instance({"Name": self.user_name})
+        group = self.ns.LMI_Group.first_instance_name({"Name": self.group_name})
+        self.assertIsInstance(user, LMIInstance)
+        self.assertIsInstance(group, LMIInstanceName)
+        identity = user.first_associator_name(ResultClass = 'LMI_Identity')
+        self.assertIsInstance(identity, LMIInstanceName)
+        tocreate = self.ns.LMI_MemberOfGroup.create_instance(
+            { 'Collection' : group,
+              'Member' : identity })
+        self.assertIsInstance(tocreate, LMIInstance)
 
     def test_remove_user_from_group(self):
         """
@@ -49,12 +55,12 @@ class TestMemberOfGroup(AccountBase):
         """
         # make sure the account will exist
         create_account(self.user_name)
-        i = self.wbemconnection.ExecQuery('WQL',
-            'select * from LMI_Account where Name = "%s"' % self.user_name)[0]
-        self.wbemconnection.DeleteInstance(i.path)
+        inst = self.ns.LMI_Account.first_instance({"Name": self.user_name})
+        self.assertIsInstance(inst, LMIInstance)
+        r = inst.delete()
+        self.assertTrue(r)
         # check if it was really deleted
         self.assertFalse(user_exists(self.user_name))
-        clean_account(self.user_name)
 
     def test_user_in_groups(self):
         """
@@ -63,20 +69,18 @@ class TestMemberOfGroup(AccountBase):
         create_account(self.user_name)
         create_group(self.group_name)
         add_user_to_group(self.user_name, self.group_name)
-        user = self.wbemconnection.ExecQuery('WQL',
-            'select * from LMI_Account where Name = "%s"' %self.user_name)[0]
-        ident = self.wbemconnection.ExecQuery('WQL',
-            'select * from LMI_Identity where InstanceID = "LMI:UID:%s"' % user["UserID"])[0]
-        insts = self.wbemconnection.Associators(ident.path, AssocClass = 'LMI_MemberOfGroup')
+        user = self.ns.LMI_Account.first_instance({"Name": self.user_name})
+        self.assertIsInstance(user, LMIInstance)
+        ident = self.ns.LMI_Identity.first_instance({"InstanceID": "LMI:UID:%s" % user.UserID})
+        self.assertIsInstance(ident, LMIInstance)
+        insts = ident.associators(AssocClass = 'LMI_MemberOfGroup')
         self.assertEqual(len(insts), 2)
         found_user = False
         found_group = False
         for inst in insts:
-            if inst["Name"] == self.user_name:
+            if inst.Name == self.user_name:
                 found_user = True
-            elif inst["Name"] == self.group_name:
+            elif inst.Name == self.group_name:
                 found_group = True
         self.assertTrue(found_user)
         self.assertTrue(found_group)
-        clean_account(self.user_name)
-        clean_group(self.group_name)