From 6f91392e9c037d542d0150cbf1d12501e9d9ba45 Mon Sep 17 00:00:00 2001
From: pavan018 <pavanbandarupally@gmail.com>
Date: Mon, 13 Jul 2015 18:11:24 +0530
Subject: [PATCH 1/2] Passing firewal service parameter for LB rule creation

---
 test/integration/component/test_project_usage.py | 3 ++-
 test/integration/component/test_usage.py         | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index 98311b832edf..55440bfac076 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -109,6 +109,7 @@ def __init__(self):
                                    "name": "SSH",
                                    "alg": "roundrobin",
                                    # Algorithm used for load balancing
+                                   "openfirewall":"false",
                                    "privateport": 22,
                                    "publicport": 2222,
                                 },
@@ -1171,7 +1172,7 @@ def tearDown(self):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags=["advanced", "eip", "advancedns", "simulator"], required_hardware="false")
+    @attr(tags=["advanced", "eip", "advancedns", "simulator","bpk"], required_hardware="false")
     def test_01_lb_usage(self):
         """Test Create/Delete a LB rule and verify correct usage is recorded
         """
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 8b4fdfc7124e..3a6479a1c6c5 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -104,6 +104,7 @@ def __init__(self):
                 "name": "SSH",
                 "alg": "roundrobin",
                 # Algorithm used for load balancing
+                "openfirewall":"false",
                 "privateport": 22,
                 "publicport": 2222,
             },
@@ -1089,7 +1090,7 @@ def tearDown(self):
             "advanced",
             "eip",
             "advancedns",
-            "simulator"],
+            "simulator","bpk"],
         required_hardware="false")
     def test_01_lb_usage(self):
         """Test Create/Delete a LB rule and verify correct usage is recorded

From df7646af01828cb9ea471e8efcfff9e5d4156437 Mon Sep 17 00:00:00 2001
From: pavan018 <pavanbandarupally@gmail.com>
Date: Tue, 14 Jul 2015 11:44:04 +0530
Subject: [PATCH 2/2] Firewall service parameter addition typos

---
 test/integration/component/test_project_usage.py | 2 +-
 test/integration/component/test_usage.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index 55440bfac076..cb95d89d9968 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -1172,7 +1172,7 @@ def tearDown(self):
             raise Exception("Warning: Exception during cleanup : %s" % e)
         return
 
-    @attr(tags=["advanced", "eip", "advancedns", "simulator","bpk"], required_hardware="false")
+    @attr(tags=["advanced", "eip", "advancedns", "simulator"], required_hardware="false")
     def test_01_lb_usage(self):
         """Test Create/Delete a LB rule and verify correct usage is recorded
         """
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 3a6479a1c6c5..3bbef399a3f6 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -1090,7 +1090,7 @@ def tearDown(self):
             "advanced",
             "eip",
             "advancedns",
-            "simulator","bpk"],
+            "simulator"],
         required_hardware="false")
     def test_01_lb_usage(self):
         """Test Create/Delete a LB rule and verify correct usage is recorded