CLOUDSTACK-10014: fix components/test_accounts.py test_user_key_renew_same_account: use new api getUserKeys to get secrett key

Author: borisstoyanov

test/integration/component/test_accounts.py

@@ -20,6 +20,7 @@
 from marvin.cloudstackTestCase import cloudstackTestCase
 from marvin.lib.utils import (random_gen,
                               cleanup_resources)
+from marvin.cloudstackAPI import *
 from marvin.lib.base import (Domain,
                              Account,
                              ServiceOffering,
@@ -43,6 +44,8 @@
 from marvin.cloudstackException import CloudstackAPIException
 import time
 
+from pyVmomi.VmomiSupport import GetVersionFromVersionUri
+
 
 class Services:
 
@@ -1653,6 +1656,11 @@ def test_user_key_renew_same_account(self):
             user.apikey,
             userkeys.apikey,
             "Check User api key")
+        user.secretkey = self.get_secret_key(user.id)
+        self.assertEqual(
+            user.secretkey,
+            userkeys.secretkey,
+            "Check User having secret key")
 
         self.debug("Get test client with user keys")
         cs_api = self.testClient.getUserApiClient(
@@ -1664,6 +1672,17 @@ def test_user_key_renew_same_account(self):
             userkeys.apikey,
             new_keys.apikey,
             "Check API key is different")
+        new_keys.secretkey = self.get_secret_key(user_1.id)
+        self.assertNotEqual(
+            userkeys.secretkey,
+            new_keys.secretkey,
+            "Check secret key is different")
+
+    def get_secret_key(self, id):
+        cmd = getUserKeys.getUserKeysCmd()
+        cmd.id = id
+        keypair = self.apiclient.getUserKeys(cmd)
+        return keypair.secretkey
 
     @attr(tags=[
         "role",
@@ -2062,3 +2081,4 @@ def test_DeleteDomain(self):
         with self.assertRaises(Exception):
             domain.delete(self.apiclient, cleanup=False)
         return
+