Merge "Update Sequence runner to use ScenarioOutput class"

[yardstick.git] / yardstick / network_services / pipeline.py

diff --git a/yardstick/network_services/pipeline.py b/yardstick/network_services/pipeline.py
index d781ba0..4fbe796 100644 (file)
--- a/yardstick/network_services/pipeline.py
+++ b/yardstick/network_services/pipeline.py
@@ -18,9 +18,11 @@ import itertools
 \r
 from six.moves import zip\r
 \r
+from yardstick.common import utils\r
+\r
 FIREWALL_ADD_DEFAULT = "p {0} firewall add default 1"\r
 FIREWALL_ADD_PRIO = """\\r
-p {0} firewall add priority 1 ipv4  {1} 24 0.0.0.0 0 0 65535 0 65535 6 0xFF port 0"""\r
+p {0} firewall add priority 1 ipv4  {1} 24 0.0.0.0 0 0 65535 0 65535 17 0xFF port 0"""\r
 \r
 FLOW_ADD_QINQ_RULES = """\\r
 p {0} flow add qinq 128 512 port 0 id 1\r
@@ -59,8 +61,7 @@ class PipelineRules(object):
         self.add_rule(FIREWALL_ADD_PRIO, ip)\r
 \r
     def add_firewall_script(self, ip):\r
-        ip_addr = ip.split('.')\r
-        assert len(ip_addr) == 4\r
+        ip_addr = str(utils.make_ipv4_address(ip)).split('.')\r
         ip_addr[-1] = '0'\r
         for i in range(256):\r
             ip_addr[-2] = str(i)\r
@@ -87,8 +88,7 @@ class PipelineRules(object):
         self.add_rule(ROUTE_ADD_ETHER_MPLS, ip, mac_addr, index)\r
 \r
     def add_route_script(self, ip, mac_addr):\r
-        ip_addr = ip.split('.')\r
-        assert len(ip_addr) == 4\r
+        ip_addr = str(utils.make_ipv4_address(ip)).split('.')\r
         ip_addr[-1] = '0'\r
         for index in range(0, 256, 8):\r
             ip_addr[-2] = str(index)\r
@@ -101,8 +101,7 @@ class PipelineRules(object):
         self.add_rule(ROUTE_ADD_ETHER_QINQ, ip, mask, mac_addr, index)\r
 \r
     def add_route_script2(self, ip, mac_addr):\r
-        ip_addr = ip.split('.')\r
-        assert len(ip_addr) == 4\r
+        ip_addr = str(utils.make_ipv4_address(ip)).split('.')\r
         ip_addr[-1] = '0'\r
         mask = 24\r
         for i in range(0, 256):\r