| @@ -193,12 +193,12 @@ def board_priority(request: Request): | |||||
| scope = request.scope | scope = request.scope | ||||
| return scope['server'] | return scope['server'] | ||||
| @router.get('/board_classes', response_model=Dict[str, BoardClassInfo]) | |||||
| @router.get('/board/classes', response_model=Dict[str, BoardClassInfo]) | |||||
| async def foo(user: str = Depends(lookup_user), | async def foo(user: str = Depends(lookup_user), | ||||
| brdmgr: BoardManager = Depends(get_boardmanager)): | brdmgr: BoardManager = Depends(get_boardmanager)): | ||||
| return brdmgr.classes() | return brdmgr.classes() | ||||
| @router.get('/board_info',response_model=Dict[str, Board]) | |||||
| @router.get('/board/',response_model=Dict[str, Board]) | |||||
| async def foo(user: str = Depends(lookup_user), | async def foo(user: str = Depends(lookup_user), | ||||
| brdmgr: BoardManager = Depends(get_boardmanager)): | brdmgr: BoardManager = Depends(get_boardmanager)): | ||||
| brds = brdmgr.boards | brds = brdmgr.boards | ||||
| @@ -293,19 +293,19 @@ class TestBiteLab(unittest.IsolatedAsyncioTestCase): | |||||
| async def test_notauth(self): | async def test_notauth(self): | ||||
| # test that simple accesses are denied | # test that simple accesses are denied | ||||
| res = await self.client.get('/board_classes') | |||||
| res = await self.client.get('/board/classes') | |||||
| self.assertEqual(res.status_code, HTTP_401_UNAUTHORIZED) | self.assertEqual(res.status_code, HTTP_401_UNAUTHORIZED) | ||||
| res = await self.client.get('/board_info') | |||||
| res = await self.client.get('/board/') | |||||
| self.assertEqual(res.status_code, HTTP_401_UNAUTHORIZED) | self.assertEqual(res.status_code, HTTP_401_UNAUTHORIZED) | ||||
| # test that invalid api keys are denied | # test that invalid api keys are denied | ||||
| res = await self.client.get('/board_classes', | |||||
| res = await self.client.get('/board/classes', | |||||
| auth=BiteAuth('badapikey')) | auth=BiteAuth('badapikey')) | ||||
| self.assertEqual(res.status_code, HTTP_401_UNAUTHORIZED) | self.assertEqual(res.status_code, HTTP_401_UNAUTHORIZED) | ||||
| async def test_classes(self): | async def test_classes(self): | ||||
| res = await self.client.get('/board_classes', | |||||
| res = await self.client.get('/board/classes', | |||||
| auth=BiteAuth('thisisanapikey')) | auth=BiteAuth('thisisanapikey')) | ||||
| self.assertEqual(res.status_code, HTTP_200_OK) | self.assertEqual(res.status_code, HTTP_200_OK) | ||||
| self.assertEqual(res.json(), { 'cora-z7s': BoardClassInfo(**{ | self.assertEqual(res.json(), { 'cora-z7s': BoardClassInfo(**{ | ||||
| @@ -335,7 +335,7 @@ class TestBiteLab(unittest.IsolatedAsyncioTestCase): | |||||
| sg.return_value = False | sg.return_value = False | ||||
| # that getting the board info | # that getting the board info | ||||
| res = await self.client.get('/board_info', | |||||
| res = await self.client.get('/board/', | |||||
| auth=BiteAuth('thisisanapikey')) | auth=BiteAuth('thisisanapikey')) | ||||
| # calls snmpget w/ the correct args | # calls snmpget w/ the correct args | ||||