ovsvapp agent crashes when no patch port in br-sec

[Stephen Ma]

The neutron-ovsvapp-agent will crash with this traceback:

2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service Traceback (most recent call last):
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service File "/opt/stack/venv/neutron-20180718T154642Z/lib/python2.7/site-packages/networking_vsphere/service.py", line 43, in run
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service agent.Agent)
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service File "/opt/stack/venv/neutron-20180718T154642Z/lib/python2.7/site-packages/networking_vsphere/common/utils.py", line 42, in load_object
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service driver_obj = import_class(driver)(*args, **kwargs)
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service File "/opt/stack/venv/neutron-20180718T154642Z/lib/python2.7/site-packages/networking_vsphere/agent/ovsvapp_agent.py", line 177, in __init__
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service self.recover_security_br()
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service File "/opt/stack/venv/neutron-20180718T154642Z/lib/python2.7/site-packages/networking_vsphere/agent/ovsvapp_agent.py", line 396, in recover_security_br
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service if int(patch_sec_int_ofport) < 0 or int(self.patch_sec_ofport) < 0:
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service TypeError: int() argument must be a string or a number, not 'NoneType'
2018-08-07 21:34:54.385 23572 ERROR networking_vsphere.service
2018-08-07 21:34:54.427 23572 INFO oslo_rootwrap.client [-] Stopping rootwrap daemon process with pid=23583

The condition to cause this condition is:
   1. The ovsvapp agent has ran before so the integration bridge br-int is present.
   2. The br-sec is present, but the patch ports between br-sec and br-int is missing on br-int.

The bridge on the node looks like:

9988fe4-68d7-4ff5-9fee-fddb805a5d40
    Bridge "br-eth3"
        Port "eth3"
            Interface "eth3"
        Port "br-eth3"
            Interface "br-eth3"
                type: internal
    Bridge br-int
        fail_mode: secure
        Port patch-security
            Interface patch-security
                type: patch
                options: {peer=patch-integration}
        Port "int-br-eth2"
            Interface "int-br-eth2"
                type: patch
                options: {peer="phy-br-eth2"}
        Port br-int
            Interface br-int
                type: internal
    ovs_version: "2.7.0"

"br-eth3" is the security bridge.

[Stephen Ma (stephen-ma)]

If the ovsvapp-agent is stopped and then integration bridge br-int removed, the ovsvapp-agent will start successfully again.

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/pike
Review: https://review.openstack.org/589968

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/589695
Committed: https://git.openstack.org/cgit/openstack/networking-vsphere/commit/?id=ea8355284e8193958d6032cdba59e077599edd43
Submitter: Zuul
Branch: master

commit ea8355284e8193958d6032cdba59e077599edd43
Author: stephen-ma <email address hidden>
Date: Tue Aug 7 20:39:21 2018 -0700

    Restore br-sec when its patch port in br-int absent

    Rebuild the security bridge when the patch ports between
    br-int and br-sec are missing.

    Closes-Bug: #1785904
    Change-Id: I487f437401a5a420d7f2c33f0c4e1fe79e5228c9

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/589968
Committed: https://git.openstack.org/cgit/openstack/networking-vsphere/commit/?id=162f77bc217d085420bcf274e602cd57a273f322
Submitter: Zuul
Branch: stable/pike

commit 162f77bc217d085420bcf274e602cd57a273f322
Author: stephen-ma <email address hidden>
Date: Tue Aug 7 20:39:21 2018 -0700

    Restore br-sec when its patch port in br-int absent

    Rebuild the security bridge when the patch ports between
    br-int and br-sec are missing.

    Closes-Bug: #1785904
    Change-Id: I487f437401a5a420d7f2c33f0c4e1fe79e5228c9
    (cherry picked from commit ea8355284e8193958d6032cdba59e077599edd43)

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/queens
Review: https://review.openstack.org/593733

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/593733
Committed: https://git.openstack.org/cgit/openstack/networking-vsphere/commit/?id=7408e1c79d3b6c1e78f1f33ac969f72b3edabfcb
Submitter: Zuul
Branch: stable/queens

commit 7408e1c79d3b6c1e78f1f33ac969f72b3edabfcb
Author: stephen-ma <email address hidden>
Date: Tue Aug 7 20:39:21 2018 -0700

    Restore br-sec when its patch port in br-int absent

    Rebuild the security bridge when the patch ports between
    br-int and br-sec are missing.

    Closes-Bug: #1785904
    Change-Id: I487f437401a5a420d7f2c33f0c4e1fe79e5228c9
    (cherry picked from commit ea8355284e8193958d6032cdba59e077599edd43)