File 0001-OVS-Survive-errors-from-check-ovs-status.p... of Package openstack-neutron-doc

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-OVS-Survive-errors-from-check-ovs-status.patch of Package openstack-neutron-doc

diff -crB --new-file neutron-9.4.2.dev21-backup/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py neutron-9.4.2.dev21/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py
*** neutron-9.4.2.dev21-backup/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py	2019-03-21 15:08:29.280651265 -0700
--- neutron-9.4.2.dev21/neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py	2019-03-22 14:58:02.532832519 -0700
***************
*** 1798,1805 ****
                  port_info.get('updated'))
  
      def check_ovs_status(self):
!         # Check for the canary flow
!         status = self.int_br.check_canary_table()
          if status == constants.OVS_RESTARTED:
              LOG.warning(_LW("OVS is restarted. OVSNeutronAgent will reset "
                              "bridges and recover ports."))
--- 1798,1809 ----
                  port_info.get('updated'))
  
      def check_ovs_status(self):
!         try:
!             # Check for the canary flow
!             status = self.int_br.check_canary_table()        
!         except Exception:
!             LOG.exception(_LE("Failure while checking for the canary flow"))
!             status = constants.OVS_DEAD
          if status == constants.OVS_RESTARTED:
              LOG.warning(_LW("OVS is restarted. OVSNeutronAgent will reset "
                              "bridges and recover ports."))
diff -crB --new-file neutron-9.4.2.dev21-backup/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py neutron-9.4.2.dev21/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py
*** neutron-9.4.2.dev21-backup/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py	2019-03-21 15:08:29.284651236 -0700
--- neutron-9.4.2.dev21/neutron/tests/unit/plugins/ml2/drivers/openvswitch/agent/test_ovs_neutron_agent.py	2019-03-21 16:47:32.293184385 -0700
***************
*** 3214,3219 ****
--- 3214,3227 ----
                  pass
          self.assertTrue(all([x.called for x in reset_mocks]))
  
+     def test_rpc_loop_survives_error_in_check_canary_table(self):
+         with mock.patch.object(self.agent.int_br,
+                                'check_canary_table',
+                                side_effect=TypeError('borked')),\
+                 mock.patch.object(self.agent, '_check_and_handle_signal',
+                                   side_effect=[True, False]):
+             self.agent.rpc_loop(polling_manager=mock.Mock())
+ 
      def _test_scan_ports_failure(self, scan_method_name):
          with mock.patch.object(self.agent,
                                 'check_ovs_status',

Places

File 0001-OVS-Survive-errors-from-check-ovs-status.patch of Package openstack-neutron-doc

Places