You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2017/07/26 09:12:58 UTC

[cloudstack] branch master updated (990e4a6 -> 899c5c7)

This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 990e4a6  ipv6: Allow all ICMPv6 traffic if -1 is provided as a ICMP type
     new 055ae07  CLOUDSTACK-10014: fix components/test_accounts.py test_user_key_renew_same_account: remove secret key checks since it was removed from the API response
     new 899c5c7  CLOUDSTACK-10014: fix components/test_accounts.py test_user_key_renew_same_account: use new api getUserKeys to get secrett key

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 test/integration/component/test_accounts.py | 12 ++++++++++++
 1 file changed, 12 insertions(+)

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>'].

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

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 899c5c784dfdfc7ba7245aa729c644b905e729ba
Author: Boris <bs...@gmail.com>
AuthorDate: Mon Jul 24 17:54:41 2017 +0300

    CLOUDSTACK-10014: fix components/test_accounts.py test_user_key_renew_same_account: use new api getUserKeys to get secrett key
---
 test/integration/component/test_accounts.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index 714680b..a64d922 100644
--- a/test/integration/component/test_accounts.py
+++ b/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 nose.plugins.attrib import attr
 from marvin.cloudstackException import CloudstackAPIException
 import time
 
+from pyVmomi.VmomiSupport import GetVersionFromVersionUri
+
 
 class Services:
 
@@ -1653,6 +1656,11 @@ class TestUserAPIKeys(cloudstackTestCase):
             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 @@ class TestUserAPIKeys(cloudstackTestCase):
             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 @@ class TestDomainForceRemove(cloudstackTestCase):
         with self.assertRaises(Exception):
             domain.delete(self.apiclient, cleanup=False)
         return
+

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.

[cloudstack] 01/02: CLOUDSTACK-10014: fix components/test_accounts.py test_user_key_renew_same_account: remove secret key checks since it was removed from the API response

Posted by bh...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git

commit 055ae078ec02b1f1b9afeba5d69494464fce4d32
Author: Boris <bs...@gmail.com>
AuthorDate: Mon Jul 24 16:56:07 2017 +0300

    CLOUDSTACK-10014: fix components/test_accounts.py test_user_key_renew_same_account: remove secret key checks since it was removed from the API response
---
 test/integration/component/test_accounts.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index 56494e2..714680b 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -1653,10 +1653,6 @@ class TestUserAPIKeys(cloudstackTestCase):
             user.apikey,
             userkeys.apikey,
             "Check User api key")
-        self.assertEqual(
-            user.secretkey,
-            userkeys.secretkey,
-            "Check User having secret key")
 
         self.debug("Get test client with user keys")
         cs_api = self.testClient.getUserApiClient(
@@ -1668,10 +1664,6 @@ class TestUserAPIKeys(cloudstackTestCase):
             userkeys.apikey,
             new_keys.apikey,
             "Check API key is different")
-        self.assertNotEqual(
-            userkeys.secretkey,
-            new_keys.secretkey,
-            "Check secret key is different")
 
     @attr(tags=[
         "role",

-- 
To stop receiving notification emails like this one, please contact
"commits@cloudstack.apache.org" <co...@cloudstack.apache.org>.