You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ts...@apache.org on 2013/07/20 08:51:19 UTC
git commit: updated refs/heads/4.2 to 5eaec0a
Updated Branches:
refs/heads/4.2 182de5674 -> 5eaec0a5e
CLOUDSTACK-3620: [Automation] API removevpnuser failed, in test case test_project_usage.TestVpnUsage.test_01_vpn_usage.
Signed-off-by: Prasanna Santhanam <ts...@apache.org>
(cherry picked from commit ecfeaa1037b18920ce3c734fa67f0ab309d46956)
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5eaec0a5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5eaec0a5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5eaec0a5
Branch: refs/heads/4.2
Commit: 5eaec0a5e0611f75a362e58cbb325eb2067ae94e
Parents: 182de56
Author: Sanjay Tripathi <sa...@citrix.com>
Authored: Fri Jul 19 20:39:02 2013 +0530
Committer: Prasanna Santhanam <ts...@apache.org>
Committed: Sat Jul 20 12:21:07 2013 +0530
----------------------------------------------------------------------
test/integration/component/test_project_usage.py | 5 ++++-
tools/marvin/marvin/integration/lib/base.py | 9 ++++++---
2 files changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5eaec0a5/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index bb253e1..1422feb 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -1659,7 +1659,10 @@ class TestVpnUsage(cloudstackTestCase):
# Remove VPN user
self.debug("Deleting VPN user: %s" % vpnuser.id)
- vpnuser.delete(self.apiclient)
+ vpnuser.delete(
+ self.apiclient,
+ projectid=self.project.id
+ )
# Delete VPN access
self.debug("Deleting VPN: %s" % vpn.publicipid)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5eaec0a5/tools/marvin/marvin/integration/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py
index 13507bc..03c0707 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -2100,13 +2100,16 @@ class VpnUser:
cmd.projectid = projectid
return VpnUser(apiclient.addVpnUser(cmd).__dict__)
- def delete(self, apiclient):
+ def delete(self, apiclient, projectid=None):
"""Remove VPN user"""
cmd = removeVpnUser.removeVpnUserCmd()
cmd.username = self.username
- cmd.account = self.account
- cmd.domainid = self.domainid
+ if projectid:
+ cmd.projectid = projectid
+ else:
+ cmd.account = self.account
+ cmd.domainid = self.domainid
apiclient.removeVpnUser(cmd)
@classmethod