neutron-ovn-db-sync-util fails with KeyError: 'port_security_enabled' when port security not enabled

[Frode Nordahl]

neutron-ovn-db-sync-util --config-file /etc/neutron/neutron.conf --config-file /etc/neutron/plugins/ml2/ml2_conf.ini --ovn-neutron_sync_mode repair

[ ... ]

2020-06-04 08:43:20.044 943695 CRITICAL neutron [req-fe91c1b7-7c75-401a-b755-7c24e34b407a - - - - -] Unhandled error: KeyError: 'port_security_enabled'
2020-06-04 08:43:20.044 943695 ERROR neutron Traceback (most recent call last):
2020-06-04 08:43:20.044 943695 ERROR neutron File "/usr/bin/neutron-ovn-db-sync-util", line 10, in <module>
2020-06-04 08:43:20.044 943695 ERROR neutron sys.exit(main())
2020-06-04 08:43:20.044 943695 ERROR neutron File "/usr/lib/python3/dist-packages/neutron/cmd/ovn/neutron_ovn_db_sync_util.py", line 216, in main
2020-06-04 08:43:20.044 943695 ERROR neutron synchronizer.do_sync()
2020-06-04 08:43:20.044 943695 ERROR neutron File "/usr/lib/python3/dist-packages/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_db_sync.py", line 92, in do_sync
2020-06-04 08:43:20.044 943695 ERROR neutron self.sync_port_groups(ctx)
2020-06-04 08:43:20.044 943695 ERROR neutron File "/usr/lib/python3/dist-packages/neutron/plugins/ml2/drivers/ovn/mech_driver/ovsdb/ovn_db_sync.py", line 218, in sync_port_groups
2020-06-04 08:43:20.044 943695 ERROR neutron n_port['port_security_enabled']) and
2020-06-04 08:43:20.044 943695 ERROR neutron KeyError: 'port_security_enabled'
2020-06-04 08:43:20.044 943695 ERROR neutron

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.opendev.org/733512

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/733512
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=58d1d0dbddd3299537f67b0fdee906918fd4bb6f
Submitter: Zuul
Branch: master

commit 58d1d0dbddd3299537f67b0fdee906918fd4bb6f
Author: Frode Nordahl <email address hidden>
Date: Thu Jun 4 11:40:16 2020 +0200

    [OVN] Fix db-sync-util Traceback when port security not enabled

    Change-Id: Id1ed2922a908148b2b271bd28cc974ef424530d5
    Closes-Bug: #1882061

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ussuri
Review: https://review.opendev.org/738769

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.opendev.org/738769
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=34c93c6c77d131861ec9bd282fa153477f893f48
Submitter: Zuul
Branch: stable/ussuri

commit 34c93c6c77d131861ec9bd282fa153477f893f48
Author: Frode Nordahl <email address hidden>
Date: Thu Jun 4 11:40:16 2020 +0200

    [OVN] Fix db-sync-util Traceback when port security not enabled

    Change-Id: Id1ed2922a908148b2b271bd28cc974ef424530d5
    Closes-Bug: #1882061
    (cherry picked from commit 58d1d0dbddd3299537f67b0fdee906918fd4bb6f)
    (add newline in neutron/tests/unit/common/ovn/test_utils.py to resolve merge
     conflict with https://review.opendev.org/#/c/738214/)