From 874445dae3408b551147871c1ca7ca8a1bebabed Mon Sep 17 00:00:00 2001
From: pavan018 <pavanbandarupally@gmail.com>
Date: Wed, 8 Jul 2015 11:05:03 +0530
Subject: [PATCH] Changes for Regression failures

---
 .../integration/component/test_blocker_bugs.py | 18 ++++++++++++++++--
 .../component/test_project_limits.py           |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py
index f6a032e4920..c229d38f456 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -663,7 +663,14 @@ class TestRouterRestart(cloudstackTestCase):
         #    all it's services should resume
 
         # Find router associated with user account
-        list_router_response = list_routers(
+        if (self.services['mode'] == "Basic"):
+            list_router_response = list_routers(
+                                    self.apiclient,
+                                    zoneid=self.zone.id,
+                                    listall=True
+                                    )
+        else:
+            list_router_response = list_routers(
                                     self.apiclient,
                                     account=self.account.name,
                                     domainid=self.account.domainid
@@ -702,7 +709,14 @@ class TestRouterRestart(cloudstackTestCase):
         self.apiclient.restartNetwork(cmd)
 
         # Get router details after restart
-        list_router_response = list_routers(
+        if (self.services['mode'] == "Basic"):
+            list_router_response = list_routers(
+                                    self.apiclient,
+                                    zoneid=self.zone.id,
+                                    listall=True
+                                    )
+        else:
+            list_router_response = list_routers(
                                     self.apiclient,
                                     account=self.account.name,
                                     domainid=self.account.domainid
diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py
index 848a8965d4c..ad4e75de025 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -1052,7 +1052,7 @@ class TestMaxProjectNetworks(cloudstackTestCase):
         return
 
     @attr(tags=["advanced", "advancedns", "simulator",
-                "api", "eip"])
+                "api"])
     def test_maxAccountNetworks(self):
         """Test Limit number of guest account specific networks
         """