From 0c40adfc4a9620ed29604f7aedbde0e1a077a68f Mon Sep 17 00:00:00 2001
From: Girish Shilamkar <girish@clogeny.com>
Date: Fri, 9 May 2014 22:26:51 +0530
Subject: [PATCH] While listing Public IP listall should always be true

---
 tools/marvin/marvin/lib/base.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index cd113f86081..03b03b61e39 100644
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -1397,8 +1397,7 @@ class PublicIPAddress:
 
         cmd = listPublicIpAddresses.listPublicIpAddressesCmd()
         [setattr(cmd, k, v) for k, v in kwargs.items()]
-        if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
-            cmd.listall=True
+        cmd.listall=True
         return(apiclient.listPublicIpAddresses(cmd))