![Hervé Beraud](/assets/img/avatar_default.png)
The __future__ module [1] was used in this context to ensure compatibility between python 2 and python 3. We previously dropped the support of python 2.7 [2] and now we only support python 3 so we don't need to continue to use this module and the imports listed below. Imports commonly used and their related PEPs: - `division` is related to PEP 238 [3] - `print_function` is related to PEP 3105 [4] - `unicode_literals` is related to PEP 3112 [5] - `with_statement` is related to PEP 343 [6] - `absolute_import` is related to PEP 328 [7] [1] https://docs.python.org/3/library/__future__.html [2] https://governance.openstack.org/tc/goals/selected/ussuri/drop-py27.html [3] https://www.python.org/dev/peps/pep-0238 [4] https://www.python.org/dev/peps/pep-3105 [5] https://www.python.org/dev/peps/pep-3112 [6] https://www.python.org/dev/peps/pep-0343 [7] https://www.python.org/dev/peps/pep-0328 Change-Id: Ieccdcdcec557efe480dcf3546299718b0baa37a4
160 lines
4.9 KiB
Python
160 lines
4.9 KiB
Python
# Copyright (C) 2013 Nippon Telegraph and Telephone Corporation.
|
|
# Copyright (C) 2013 YAMAMOTO Takashi <yamamoto at valinux co jp>
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
# implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import six
|
|
import sys
|
|
import unittest
|
|
from nose.tools import eq_
|
|
from nose.tools import ok_
|
|
|
|
from os_ken.ofproto import ofproto_v1_2
|
|
from os_ken.ofproto import ofproto_v1_3
|
|
from os_ken.ofproto import ofproto_v1_2_parser
|
|
from os_ken.ofproto import ofproto_v1_3_parser
|
|
|
|
from os_ken.lib import addrconv
|
|
from os_ken.tests import test_lib
|
|
from struct import unpack
|
|
|
|
|
|
class Test_Parser_Compat(unittest.TestCase):
|
|
def __init__(self, methodName):
|
|
print('init %s' % methodName)
|
|
super(Test_Parser_Compat, self).__init__(methodName)
|
|
|
|
def setUp(self):
|
|
pass
|
|
|
|
def tearDown(self):
|
|
pass
|
|
|
|
def _test(self, name, ofpp):
|
|
ofp = {
|
|
ofproto_v1_2_parser: ofproto_v1_2,
|
|
ofproto_v1_3_parser: ofproto_v1_3,
|
|
}[ofpp]
|
|
|
|
in_port = 987654321
|
|
eth_src = 'aa:bb:cc:dd:ee:ff'
|
|
ipv4_src = '192.0.2.9'
|
|
ipv6_src = 'fe80::f00b:a4ff:feef:5d8f'
|
|
|
|
old_in_port = in_port
|
|
old_eth_src = addrconv.mac.text_to_bin(eth_src)
|
|
old_ipv4_src = unpack('!I', addrconv.ipv4.text_to_bin(ipv4_src))[0]
|
|
old_ipv6_src = list(unpack('!8H',
|
|
addrconv.ipv6.text_to_bin(ipv6_src)))
|
|
|
|
def check(o):
|
|
check_old(o)
|
|
check_new(o)
|
|
|
|
def check_old(o):
|
|
# old api
|
|
def get_field(m, t):
|
|
for f in m.fields:
|
|
if isinstance(f, t):
|
|
return f
|
|
get_value = lambda m, t: get_field(m, t).value
|
|
|
|
eq_(get_value(o, ofpp.MTInPort), old_in_port)
|
|
eq_(get_value(o, ofpp.MTEthSrc), old_eth_src)
|
|
eq_(get_value(o, ofpp.MTIPV4Src), old_ipv4_src)
|
|
eq_(get_value(o, ofpp.MTIPv6Src), old_ipv6_src)
|
|
|
|
def check_new(o):
|
|
# new api
|
|
eq_(o['in_port'], in_port)
|
|
eq_(o['eth_src'], eth_src)
|
|
eq_(o['ipv4_src'], ipv4_src)
|
|
eq_(o['ipv6_src'], ipv6_src)
|
|
|
|
# ensure that old and new api produces the same thing
|
|
|
|
# old api
|
|
old = ofpp.OFPMatch()
|
|
old.set_in_port(old_in_port)
|
|
old.set_dl_src(old_eth_src)
|
|
old.set_ipv4_src(old_ipv4_src)
|
|
old.set_ipv6_src(old_ipv6_src)
|
|
|
|
old_buf = bytearray()
|
|
old.serialize(old_buf, 0)
|
|
|
|
# note: you can't inspect an object composed with the old set_XXX api
|
|
# before serialize().
|
|
check_old(old)
|
|
|
|
# another variant of old api; originally it was intended to be
|
|
# internal but actually used in the field. eg. LINC l2_switch_v1_3.py
|
|
old2 = ofpp.OFPMatch()
|
|
old2.append_field(ofp.OXM_OF_IN_PORT, old_in_port)
|
|
old2.append_field(ofp.OXM_OF_ETH_SRC, old_eth_src)
|
|
old2.append_field(ofp.OXM_OF_IPV4_SRC, old_ipv4_src)
|
|
old2.append_field(ofp.OXM_OF_IPV6_SRC, old_ipv6_src)
|
|
check_old(old2)
|
|
|
|
old2_buf = bytearray()
|
|
old2.serialize(old2_buf, 0)
|
|
|
|
# new api
|
|
new = ofpp.OFPMatch(in_port=in_port, eth_src=eth_src,
|
|
ipv4_src=ipv4_src, ipv6_src=ipv6_src)
|
|
check_new(new)
|
|
|
|
new_buf = bytearray()
|
|
new.serialize(new_buf, 0)
|
|
eq_(new_buf, old_buf)
|
|
eq_(new_buf, old2_buf)
|
|
|
|
old_jsondict = old.to_jsondict()
|
|
old2_jsondict = old2.to_jsondict()
|
|
new_jsondict = new.to_jsondict()
|
|
eq_(new_jsondict, old_jsondict)
|
|
eq_(new_jsondict, old2_jsondict)
|
|
|
|
eq_(str(new), str(old))
|
|
eq_(str(new), str(old2))
|
|
|
|
# a parsed object can be inspected by old and new api
|
|
|
|
check(ofpp.OFPMatch.parser(six.binary_type(new_buf), 0))
|
|
check(ofpp.OFPMatch.from_jsondict(list(new_jsondict.values())[0]))
|
|
|
|
|
|
def _add_tests():
|
|
import functools
|
|
import itertools
|
|
|
|
ofpps = [ofproto_v1_2_parser, ofproto_v1_3_parser]
|
|
for ofpp in ofpps:
|
|
mod = ofpp.__name__.split('.')[-1]
|
|
method_name = 'test_' + mod + '_ofpmatch_compat'
|
|
|
|
def _run(self, name, ofpp):
|
|
print('processing %s ...' % name)
|
|
if six.PY3:
|
|
self._test(self, name, ofpp)
|
|
else:
|
|
self._test(name, ofpp)
|
|
print('adding %s ...' % method_name)
|
|
f = functools.partial(_run, name=method_name,
|
|
ofpp=ofpp)
|
|
test_lib.add_method(Test_Parser_Compat, method_name, f)
|
|
|
|
|
|
_add_tests()
|