You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/05/08 19:49:39 UTC
[75/90] [abbrv] git commit: updated
refs/heads/ui-cisco-asa1000v-support to c1e9e4d
[MARVIN] Fixing dedicate_guest_vlan_range test
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3a41a83f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3a41a83f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3a41a83f
Branch: refs/heads/ui-cisco-asa1000v-support
Commit: 3a41a83f885cfd05b9fd951738abab30353618df
Parents: 20bc334
Author: Likitha Shetty <li...@citrix.com>
Authored: Wed May 8 11:20:12 2013 +0530
Committer: Likitha Shetty <li...@citrix.com>
Committed: Wed May 8 11:22:16 2013 +0530
----------------------------------------------------------------------
test/integration/smoke/test_guest_vlan_range.py | 17 +++++++----------
tools/marvin/marvin/integration/lib/base.py | 2 +-
2 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a41a83f/test/integration/smoke/test_guest_vlan_range.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_guest_vlan_range.py b/test/integration/smoke/test_guest_vlan_range.py
index 1723477..13cf335 100644
--- a/test/integration/smoke/test_guest_vlan_range.py
+++ b/test/integration/smoke/test_guest_vlan_range.py
@@ -149,15 +149,12 @@ class TestDedicateGuestVlanRange(cloudstackTestCase):
)
self.debug("Releasing guest vlan range");
- dedicated_guest_vlan_response.release(self.apiclient)
- list_dedicated_guest_vlan_range_response = PhysicalNetwork.listDedicated(
- self.apiclient,
- id=dedicate_guest_vlan_range_response.id
- )
- dedicated_guest_vlan_response = list_dedicated_guest_vlan_range_response[0]
+ dedicate_guest_vlan_range_response.release(self.apiclient)
+ list_dedicated_guest_vlan_range_response = PhysicalNetwork.listDedicated(self.apiclient)
self.assertEqual(
- dedicated_guest_vlan_response.account,
- "system",
- "Check account name is system account in listDedicatedGuestVlanRanges"
- )
+ list_dedicated_guest_vlan_range_response,
+ None,
+ "Check vlan range is not available in listDedicatedGuestVlanRanges"
+
+ )
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3a41a83f/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 cdb6a36..92b8a2d 100755
--- a/tools/marvin/marvin/integration/lib/base.py
+++ b/tools/marvin/marvin/integration/lib/base.py
@@ -2202,7 +2202,7 @@ class PhysicalNetwork:
cmd = listDedicatedGuestVlanRanges.listDedicatedGuestVlanRangesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
- return map(lambda pn : PhysicalNetwork(pn.__dict__), apiclient.listDedicatedGuestVlanRanges(cmd))
+ return apiclient.listDedicatedGuestVlanRanges(cmd)
@classmethod
def list(cls, apiclient, **kwargs):