opencontrail-vrouter-netns cannot delete namespace on recent kernel/iproute2

[Édouard Thuleau]

Traceback (most recent call last):
  File "/usr/bin/opencontrail-vrouter-netns", line 9, in <module>
    load_entry_point('opencontrail-vrouter-netns==0.1', 'console_scripts', 'opencontrail-vrouter-netns')()
  File "/usr/lib/python2.7/dist-packages/opencontrail_vrouter_netns/vrouter_netns.py", line 462, in main
    vrouter_netns.args.func()
  File "/usr/lib/python2.7/dist-packages/opencontrail_vrouter_netns/vrouter_netns.py", line 412, in create
    netns_mgr.destroy()
  File "/usr/lib/python2.7/dist-packages/opencontrail_vrouter_netns/vrouter_netns.py", line 166, in destroy
    self.namespace).link.delete()
  File "/usr/lib/python2.7/dist-packages/opencontrail_vrouter_netns/linux/ip_lib.py", line 243, in delete
    self._as_root('delete', self.name)
  File "/usr/lib/python2.7/dist-packages/opencontrail_vrouter_netns/linux/ip_lib.py", line 207, in _as_root
    kwargs.get('use_root_namespace', False))
  File "/usr/lib/python2.7/dist-packages/opencontrail_vrouter_netns/linux/ip_lib.py", line 58, in _as_root
    namespace)
  File "/usr/lib/python2.7/dist-packages/opencontrail_vrouter_netns/linux/ip_lib.py", line 69, in _execute
    root_helper=root_helper)
  File "/usr/lib/python2.7/dist-packages/opencontrail_vrouter_netns/linux/utils.py", line 86, in execute
    raise RuntimeError(m)
RuntimeError:
Command: ['sudo', 'ip', 'netns', 'exec', 'vrouter-e0389550-11dd-4d28-8721-b71e3386d723', 'ip', 'link', 'delete', 'int-aa0b412c-6@if9']
Exit code: 1
Stdout: ''
Stderr: 'Cannot find device "int-aa0b412c-6@if9"\n'

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/18735
Submitter: Édouard Thuleau (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/18735
Committed: http://github.org/Juniper/contrail-controller/commit/55bc7c3124af4b3d2764ed6e28a0363e400cfb9d
Submitter: Zuul
Branch: master

commit 55bc7c3124af4b3d2764ed6e28a0363e400cfb9d
Author: Édouard Thuleau <email address hidden>
Date: Thu Mar 24 15:46:49 2016 +0100

Ignore possible suffix in iproute commands.

Fix copied from
https://github.com/openstack/neutron/commit/8ddeb4be9e32e5cefab8324d0cbf9cecead1f808

Change-Id: Ie66d291707ec4bf16c0ddefd89c1a3a5faac0299
Closes-Bug: #1561568

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/27937
Submitter: Senthilnathan Murugappan (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/27937
Committed: http://github.org/Juniper/contrail-controller/commit/b38450d7a7c0a3dac0d7053b0adfb3268e5ca31d
Submitter: Zuul (<email address hidden>)
Branch: R2.21.x

commit b38450d7a7c0a3dac0d7053b0adfb3268e5ca31d
Author: Édouard Thuleau <email address hidden>
Date: Thu Mar 24 15:46:49 2016 +0100

Ignore possible suffix in iproute commands.

Fix copied from
https://github.com/openstack/neutron/commit/8ddeb4be9e32e5cefab8324d0cbf9cecead1f808

Change-Id: Ie66d291707ec4bf16c0ddefd89c1a3a5faac0299
Closes-Bug: #1561568
(cherry picked from commit 55bc7c3124af4b3d2764ed6e28a0363e400cfb9d)