Unknown parameter 'bvi' for vpp 18.10

[Christophe Fontaine]

vpp 18.10 renamed the parameter 'bvi' to 'port_type'.
All methods in the agent have both parameters to support vpp 18.07 and 18.10 but vpp_papi rejects the 'bvi' parameter.

Using vpp-api-python-18.10-6~g06eaab0~b52.x86_64

# vppctl show version
vpp v18.10-6~g06eaab0~b52 built by root on 7f5a83ae071e at Wed Nov 7 13:00:58 UTC 2018

Stack trace below:

2018-11-10 01:35:09.273 24 CRITICAL vpp_agent [-] Unhandled error: ValueError: Invalid argument ['bvi'] to sw_interface_set_l2_bridge
2018-11-10 01:35:09.273 24 ERROR vpp_agent Traceback (most recent call last):
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/bin/vpp-agent", line 11, in <module>
2018-11-10 01:35:09.273 24 ERROR vpp_agent sys.exit(main())
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/server.py", line 4021, in main
2018-11-10 01:35:09.273 24 ERROR vpp_agent ops.process_ops()
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/server.py", line 3407, in process_ops
2018-11-10 01:35:09.273 24 ERROR vpp_agent data=self).watch_forever)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/server.py", line 3445, in __init__
2018-11-10 01:35:09.273 24 ERROR vpp_agent super(PortWatcher, self).__init__(*args, **kwargs)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/etcdutils.py", line 684, in __init__
2018-11-10 01:35:09.273 24 ERROR vpp_agent data, heartbeat)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/etcdutils.py", line 448, in __init__
2018-11-10 01:35:09.273 24 ERROR vpp_agent self.refresh_all_data()
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/etcdutils.py", line 557, in refresh_all_data
2018-11-10 01:35:09.273 24 ERROR vpp_agent self.do_all_work()
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/etcdutils.py", line 708, in do_all_work
2018-11-10 01:35:09.273 24 ERROR vpp_agent self.do_work('add', k, self.etcd_data[k])
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/etcdutils.py", line 721, in do_work
2018-11-10 01:35:09.273 24 ERROR vpp_agent self.key_change(action, key, value)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/etcdutils.py", line 748, in key_change
2018-11-10 01:35:09.273 24 ERROR vpp_agent self.added(short_key, value)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/server.py", line 3531, in added
2018-11-10 01:35:09.273 24 ERROR vpp_agent data # TODO(ijw) convert incoming to security fmt
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/server.py", line 2721, in bind
2018-11-10 01:35:09.273 24 ERROR vpp_agent segmentation_id)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/server.py", line 998, in bind_interface_on_host
2018-11-10 01:35:09.273 24 ERROR vpp_agent net_data = self.ensure_network_on_host(physnet, net_type, seg_id)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/server.py", line 589, in ensure_network_on_host
2018-11-10 01:35:09.273 24 ERROR vpp_agent net = self.ensure_network_in_vpp(physnet, net_type, seg_id)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/server.py", line 637, in ensure_network_in_vpp
2018-11-10 01:35:09.273 24 ERROR vpp_agent self.ensure_interface_in_vpp_bridge(bridge_idx, if_uplink)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/server.py", line 968, in ensure_interface_in_vpp_bridge
2018-11-10 01:35:09.273 24 ERROR vpp_agent self.vpp.add_to_bridge(net_br_idx, iface_idx)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/vpp.py", line 547, in add_to_bridge
2018-11-10 01:35:09.273 24 ERROR vpp_agent enable=True) # enable bridge mode
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/networking_vpp/agent/vpp.py", line 259, in call_vpp
2018-11-10 01:35:09.273 24 ERROR vpp_agent t = func_call(*args, **kwargs)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/vpp_papi/vpp_papi.py", line 63, in __call__
2018-11-10 01:35:09.273 24 ERROR vpp_agent return self._func(**kwargs)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/vpp_papi/vpp_papi.py", line 339, in f
2018-11-10 01:35:09.273 24 ERROR vpp_agent return self._call_vpp(i, msg, multipart, **kwargs)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/vpp_papi/vpp_papi.py", line 511, in _call_vpp
2018-11-10 01:35:09.273 24 ERROR vpp_agent self.validate_args(msg, kwargs)
2018-11-10 01:35:09.273 24 ERROR vpp_agent File "/usr/lib/python2.7/site-packages/vpp_papi/vpp_papi.py", line 481, in validate_args
2018-11-10 01:35:09.273 24 ERROR vpp_agent .format(list(d), msg.name))
2018-11-10 01:35:09.273 24 ERROR vpp_agent ValueError: Invalid argument ['bvi'] to sw_interface_set_l2_bridge

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/617993

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/617704
Committed: https://git.openstack.org/cgit/openstack/networking-vpp/commit/?id=c41239c9ce5355969f5fe70b179a818e77e9c23b
Submitter: Zuul
Branch: master

commit c41239c9ce5355969f5fe70b179a818e77e9c23b
Author: Christophe Fontaine <email address hidden>
Date: Sat Nov 10 22:38:23 2018 +0100

    VPP 18.10 Parameter bvi renamed to port_type

    Running the agent with vpp18.10 generated an unknown parameter error on "bvi"
    Make the library detect and compare the version of VPP to find compatible
    API calls.

    Change-Id: I3f55b69925279e686e80492e88eb0d4737762edd
    Closes-Bug: #1802619
    Co-Authored-By: Ian Wells <email address hidden>

[OpenStack Infra (hudson-openstack)]

Change abandoned by Onong Tayeng (<email address hidden>) on branch: master
Review: https://review.openstack.org/617993
Reason: Here's the backwards compatible fix:
https://review.openstack.org/#/c/617704/