\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
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
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
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
u'123:4567:89ab:cdef:123:4567:89ab:cdef/129',
]
+ def test_make_ipv4_address(self):
+ for addr in self.GOOD_IP_V4_ADDRESS_STR_LIST:
+ # test with no mask
+ expected = ipaddress.IPv4Address(addr)
+ self.assertEqual(utils.make_ipv4_address(addr), expected, addr)
+
+ def test_make_ipv4_address_error(self):
+ addr_list = self.INVALID_IP_ADDRESS_STR_LIST +\
+ self.GOOD_IP_V6_ADDRESS_STR_LIST
+ for addr in addr_list:
+ self.assertRaises(Exception, utils.make_ipv4_address, addr)
+
+
def test_safe_ip_address(self):
addr_list = self.GOOD_IP_V4_ADDRESS_STR_LIST
for addr in addr_list: