from ..controllers.rgw import Rgw, RgwDaemon, RgwUser
from ..rest_client import RequestException
from ..services.rgw_client import RgwClient
-from . import ControllerTestCase, RgwStub # pylint: disable=no-name-in-module
+from ..tests import ControllerTestCase, RgwStub
class RgwControllerTestCase(ControllerTestCase):
@classmethod
def setup_server(cls):
- Rgw._cp_config['tools.authenticate.on'] = False # pylint: disable=protected-access
cls.setup_controllers([Rgw], '/test')
def setUp(self) -> None:
@patch.object(RgwClient, 'is_service_online', Mock(return_value=True))
@patch.object(RgwClient, '_is_system_user', Mock(return_value=True))
def test_status_available(self):
- self._get('/test/api/rgw/status')
+ self._get('/test/ui-api/rgw/status')
self.assertStatus(200)
self.assertJsonBody({'available': True, 'message': None})
@patch.object(RgwClient, 'is_service_online', Mock(
side_effect=RequestException('My test error')))
def test_status_online_check_error(self):
- self._get('/test/api/rgw/status')
+ self._get('/test/ui-api/rgw/status')
self.assertStatus(200)
self.assertJsonBody({'available': False,
'message': 'My test error'})
@patch.object(RgwClient, '_get_user_id', Mock(return_value='fake-user'))
@patch.object(RgwClient, 'is_service_online', Mock(return_value=False))
def test_status_not_online(self):
- self._get('/test/api/rgw/status')
+ self._get('/test/ui-api/rgw/status')
self.assertStatus(200)
self.assertJsonBody({'available': False,
'message': "Failed to connect to the Object Gateway's Admin Ops API."})
@patch.object(RgwClient, 'is_service_online', Mock(return_value=True))
@patch.object(RgwClient, '_is_system_user', Mock(return_value=False))
def test_status_not_system_user(self):
- self._get('/test/api/rgw/status')
+ self._get('/test/ui-api/rgw/status')
self.assertStatus(200)
self.assertJsonBody({'available': False,
'message': 'The system flag is not set for user "fake-user".'})
def test_status_no_service(self):
RgwStub.get_mgr_no_services()
- self._get('/test/api/rgw/status')
+ self._get('/test/ui-api/rgw/status')
self.assertStatus(200)
self.assertJsonBody({'available': False, 'message': 'No RGW service is running.'})
class RgwDaemonControllerTestCase(ControllerTestCase):
@classmethod
def setup_server(cls):
- RgwDaemon._cp_config['tools.authenticate.on'] = False # pylint: disable=protected-access
cls.setup_controllers([RgwDaemon], '/test')
@patch('dashboard.services.rgw_client.RgwClient._get_user_id', Mock(
{
'ceph_version': 'ceph version master (dev)',
'id': 'daemon1',
+ 'realm_name': 'realm1',
'zonegroup_name': 'zg1',
'zone_name': 'zone1'
},
{
'ceph_version': 'ceph version master (dev)',
'id': 'daemon2',
+ 'realm_name': 'realm2',
'zonegroup_name': 'zg2',
'zone_name': 'zone2'
}]
'service_map_id': '4832',
'version': 'ceph version master (dev)',
'server_hostname': 'host1',
+ 'realm_name': 'realm1',
'zonegroup_name': 'zg1',
'zone_name': 'zone1', 'default': True
},
'service_map_id': '5356',
'version': 'ceph version master (dev)',
'server_hostname': 'host1',
+ 'realm_name': 'realm2',
'zonegroup_name': 'zg2',
'zone_name': 'zone2',
'default': False
class RgwUserControllerTestCase(ControllerTestCase):
@classmethod
def setup_server(cls):
- RgwUser._cp_config['tools.authenticate.on'] = False # pylint: disable=protected-access
cls.setup_controllers([RgwUser], '/test')
@patch('dashboard.controllers.rgw.RgwRESTController.proxy')