Merge "Follow-up on blocking port deletions"

2 files changed, 8 insertions, 4 deletions

diff --git a/ironic/tests/unit/conductor/test_manager.py b/ironic/tests/unit/conductor/test_manager.py
index 67ee3c570..3556d4df2 100644
--- a/ironic/tests/unit/conductor/test_manager.py
+++ b/ironic/tests/unit/conductor/test_manager.py
@@ -6519,10 +6519,8 @@ class DestroyPortTestCase(mgr_utils.ServiceSetUpMixin, db_base.DbTestCase):
             self.context,
             node_id=node.id,
             internal_info={'tenant_vif_port_id': 'fake-id'})
-        exc = self.assertRaises(messaging.rpc.ExpectedException,
-                                self.service.destroy_port,
-                                self.context, port)
-        self.assertEqual(exception.InvalidState, exc.exc_info[0])
+        self.service.destroy_port(self.context, port)
+        self.assertRaises(exception.PortNotFound, port.refresh)
 
     def test_destroy_port_node_active_and_maintenance_no_vif(self):
         instance_uuid = uuidutils.generate_uuid()
diff --git a/ironic/tests/unit/conductor/test_utils.py b/ironic/tests/unit/conductor/test_utils.py
index 98eb0b9f4..0dea519e2 100644
--- a/ironic/tests/unit/conductor/test_utils.py
+++ b/ironic/tests/unit/conductor/test_utils.py
@@ -2127,3 +2127,9 @@ class GetAttachedVifTestCase(db_base.DbTestCase):
         vif, use = conductor_utils.get_attached_vif(self.port)
         self.assertEqual('1', vif)
         self.assertEqual('rescuing', use)
+
+    def test_get_attached_vif_inspecting(self):
+        self.port.internal_info = {'inspection_vif_port_id': '1'}
+        vif, use = conductor_utils.get_attached_vif(self.port)
+        self.assertEqual('1', vif)
+        self.assertEqual('inspecting', use)