Fix for werkzeug 2.2 routing change

Version 2.2.0 of Werkzeug brings a fix for an issue [1] related to discarding trailing slash that modifies redirect behavior for branches, effectively applying strict_slashes rule. [1] pallets/werkzeug#1074 Change-Id: Id08668d943be0ff94a191a1f06ba93eecbf74eb5
openstack · Jul 27, 2022 · 58d7f8d · 58d7f8d
1 parent 56e7ace
commit 58d7f8d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/sushy_tools/emulator/controllers/certificate_service.py b/sushy_tools/emulator/controllers/certificate_service.py
@@ -28,7 +28,7 @@
 )
 
 
-@certificate_service.route('/', methods=['GET'])
+@certificate_service.route('', methods=['GET'])
 @api_utils.returns_json
 def certificate_service_resource():
     api_utils.debug('Serving certificate service')

diff --git a/sushy_tools/emulator/controllers/virtual_media.py b/sushy_tools/emulator/controllers/virtual_media.py
@@ -21,7 +21,7 @@
     url_prefix='/redfish/v1/Managers/<identity>/VirtualMedia')
 
 
-@virtual_media.route('/', methods=['GET'])
+@virtual_media.route('', methods=['GET'])
 @api_utils.returns_json
 def virtual_media_collection_resource(identity):
     api_utils.debug('Serving virtual media resources for manager "%s"',

diff --git a/sushy_tools/tests/unit/emulator/controllers/test_certificate_service.py b/sushy_tools/tests/unit/emulator/controllers/test_certificate_service.py
@@ -20,7 +20,7 @@
 class CertificateServiceTestCase(test_main.EmulatorTestCase):
 
     def test_root(self, managers_mock, vmedia_mock):
-        response = self.app.get('redfish/v1/CertificateService/')
+        response = self.app.get('redfish/v1/CertificateService')
 
         self.assertEqual(200, response.status_code)
         self.assertIn('#CertificateService.ReplaceCertificate',

diff --git a/sushy_tools/tests/unit/emulator/controllers/test_virtual_media.py b/sushy_tools/tests/unit/emulator/controllers/test_virtual_media.py
@@ -26,7 +26,7 @@ def test_virtual_media_collection(self, managers_mock, vmedia_mock):
         vmedia_mock.return_value.devices = ['CD', 'Floppy']
 
         response = self.app.get(
-            '/redfish/v1/Managers/%s/VirtualMedia/' % self.uuid)
+            '/redfish/v1/Managers/%s/VirtualMedia' % self.uuid)
 
         self.assertEqual(200, response.status_code)
         self.assertEqual('Virtual Media Services', response.json['Name'])
@@ -40,7 +40,7 @@ def test_virtual_media_collection_empty(self, managers_mock, vmedia_mock):
         vmedia_mock.return_value.get_devices.return_value = []
 
         response = self.app.get(
-            'redfish/v1/Managers/' + self.uuid + '/VirtualMedia/')
+            'redfish/v1/Managers/' + self.uuid + '/VirtualMedia')
 
         self.assertEqual(200, response.status_code)
         self.assertEqual('Virtual Media Services', response.json['Name'])