From 425b6f3817dae97ad1b776ce4a5e70ca10abd33e Mon Sep 17 00:00:00 2001
From: Eduardo Olivares <eolivare@redhat.com>
Date: Tue, 14 Nov 2023 13:16:17 +0100
Subject: [PATCH] New faults test test_restart_neutron

This test has the same structure as other faults tests:
- check cloud is healthy
- perform some disruption
- check cloud is recovered and healthy after the disruption

In this case, the disruption is restarting the neutron server on the
overcloud nodes where it is running

Change-Id: I23de4fd028a88df4edb22826eda4c9e223bb3470
---
 tobiko/openstack/neutron/__init__.py          | 1 +
 tobiko/openstack/neutron/_agent.py            | 1 +
 tobiko/openstack/topology/_topology.py        | 3 ++-
 tobiko/tests/faults/ha/test_cloud_recovery.py | 6 ++++++
 tobiko/tripleo/_topology.py                   | 3 ++-
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/tobiko/openstack/neutron/__init__.py b/tobiko/openstack/neutron/__init__.py
index de790c99c..e6a00f291 100644
--- a/tobiko/openstack/neutron/__init__.py
+++ b/tobiko/openstack/neutron/__init__.py
@@ -37,6 +37,7 @@ OVN_METADATA_AGENT = _agent.OVN_METADATA_AGENT
 NEUTRON_OVN_METADATA_AGENT = _agent.NEUTRON_OVN_METADATA_AGENT
 OVN_BGP_AGENT = _agent.OVN_BGP_AGENT
 FRR = _agent.FRR
+NEUTRON = _agent.NEUTRON
 DEFAULT_SG_NAME = _security_group.DEFAULT_SG_NAME
 STATEFUL_OVN_ACTION = _security_group.STATEFUL_OVN_ACTION
 STATELESS_OVN_ACTION = _security_group.STATELESS_OVN_ACTION
diff --git a/tobiko/openstack/neutron/_agent.py b/tobiko/openstack/neutron/_agent.py
index fe85e9c1d..0b24858ae 100644
--- a/tobiko/openstack/neutron/_agent.py
+++ b/tobiko/openstack/neutron/_agent.py
@@ -40,6 +40,7 @@ OVN_METADATA_AGENT = 'networking-ovn-metadata-agent'
 NEUTRON_OVN_METADATA_AGENT = 'neutron-ovn-metadata-agent'
 OVN_BGP_AGENT = 'ovn-bgp-agent'
 FRR = 'frr'
+NEUTRON = 'neutron'
 
 
 class AgentNotFoundOnHost(tobiko.TobikoException):
diff --git a/tobiko/openstack/topology/_topology.py b/tobiko/openstack/topology/_topology.py
index efd883a52..5b39dc1bc 100644
--- a/tobiko/openstack/topology/_topology.py
+++ b/tobiko/openstack/topology/_topology.py
@@ -304,7 +304,8 @@ class OpenStackTopology(tobiko.SharedFixture):
         neutron.NEUTRON_OVN_METADATA_AGENT: 'devstack@q-ovn-metadata-agent',
         neutron.OVN_CONTROLLER: 'ovn-controller',
         neutron.OVN_BGP_AGENT: 'ovn-bgp-agent',
-        neutron.FRR: 'frr'
+        neutron.FRR: 'frr',
+        neutron.NEUTRON: 'neutron'
     }
     agent_to_container_name_mappings: typing.Dict[str, str] = {}
 
diff --git a/tobiko/tests/faults/ha/test_cloud_recovery.py b/tobiko/tests/faults/ha/test_cloud_recovery.py
index 7284972cd..0db497d52 100644
--- a/tobiko/tests/faults/ha/test_cloud_recovery.py
+++ b/tobiko/tests/faults/ha/test_cloud_recovery.py
@@ -363,6 +363,12 @@ class DisruptTripleoNodesTest(testtools.TestCase):
             topology.get_agent_service_name(neutron.FRR))
         OvercloudHealthCheck.run_after()
 
+    def test_restart_neutron(self):
+        OvercloudHealthCheck.run_before()
+        cloud_disruptions.restart_service_on_all_nodes(
+            topology.get_agent_service_name(neutron.NEUTRON))
+        OvercloudHealthCheck.run_after()
+
 # [..]
 # more tests to follow
 # run health checks
diff --git a/tobiko/tripleo/_topology.py b/tobiko/tripleo/_topology.py
index c6e77b361..e1938b77a 100644
--- a/tobiko/tripleo/_topology.py
+++ b/tobiko/tripleo/_topology.py
@@ -47,7 +47,8 @@ class TripleoTopology(topology.OpenStackTopology):
         neutron.NEUTRON_OVN_METADATA_AGENT: 'tripleo_ovn_metadata_agent',
         neutron.OVN_CONTROLLER: 'tripleo_ovn_controller',
         neutron.OVN_BGP_AGENT: 'tripleo_ovn_bgp_agent',
-        neutron.FRR: 'tripleo_frr'
+        neutron.FRR: 'tripleo_frr',
+        neutron.NEUTRON: 'tripleo_neutron_api'
     }
 
     agent_to_container_name_mappings = {