ovn: Remove workaround for EOL release (#927)

The workaround was specifically targeting Groovy which is now EOL.

Also remove the `current_release` class variable as it is no
longer needed.

Related-Bug: #1852221

zaza/openstack/charm_tests/ovn/tests.py

@@ -25,7 +25,6 @@ import zaza
 import zaza.model
 import zaza.openstack.charm_tests.test_utils as test_utils
 import zaza.openstack.utilities.generic as generic_utils
-import zaza.openstack.utilities.openstack as openstack_utils
 import zaza.utilities.juju
 
 
@@ -41,9 +40,6 @@ class BaseCharmOperationTest(test_utils.BaseCharmTest):
         super(BaseCharmOperationTest, cls).setUpClass()
         cls.services = ['NotImplemented']  # This must be overridden
         cls.nrpe_checks = ['NotImplemented']  # This must be overridden
-        cls.current_release = openstack_utils.get_os_release(
-            openstack_utils.get_current_os_release_pair(
-                cls.release_application or cls.application_name))
 
     @tenacity.retry(
         retry=tenacity.retry_if_result(lambda ret: ret is not None),
@@ -342,8 +338,6 @@ class OVSOVNMigrationTest(test_utils.BaseCharmTest):
     def setUpClass(cls):
         """Run class setup for OVN migration tests."""
         super(OVSOVNMigrationTest, cls).setUpClass()
-        cls.current_release = openstack_utils.get_os_release(
-            openstack_utils.get_current_os_release_pair())
 
     def setUp(self):
         """Perform migration steps prior to validation."""
@@ -631,20 +625,6 @@ class OVSOVNMigrationTest(test_utils.BaseCharmTest):
         zaza.model.wait_for_agent_status()
         zaza.model.wait_for_application_states(
             states=self.target_deploy_status)
-        # Workaround for our old friend LP: #1852221 which hit us again on
-        # Groovy. We make the os_release check explicit so that we can
-        # re-evaluate the need for the workaround at the next release.
-        if self.current_release == openstack_utils.get_os_release(
-                'groovy_victoria'):
-            try:
-                for application in ('ovn-chassis', 'ovn-dedicated-chassis'):
-                    for unit in zaza.model.get_units(application):
-                        zaza.model.run_on_unit(
-                            unit.entity_id,
-                            'systemctl restart ovs-vswitchd')
-            except KeyError:
-                # One of the applications is not in the model, which is fine
-                pass
 
 
 class OVNChassisDeferredRestartTest(test_utils.BaseDeferredRestartTest):