diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-09-25 13:50:49 +0200 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-09-25 13:50:49 +0200 |
| commit | a1589e75358558eada7ffc2efc7e3fa7160d233e (patch) | |
| tree | 7889a2364292cd8b90fe996da7907bebf200d3dc /opendc/api/v1/tiles/tileId/rack/machines | |
| parent | 1f34466d41ba01a3dd36b0866696367d397daf7e (diff) | |
Reformat codebase and fix spelling errors
Diffstat (limited to 'opendc/api/v1/tiles/tileId/rack/machines')
| -rw-r--r-- | opendc/api/v1/tiles/tileId/rack/machines/endpoint.py | 16 | ||||
| -rw-r--r-- | opendc/api/v1/tiles/tileId/rack/machines/position/endpoint.py | 17 |
2 files changed, 19 insertions, 14 deletions
diff --git a/opendc/api/v1/tiles/tileId/rack/machines/endpoint.py b/opendc/api/v1/tiles/tileId/rack/machines/endpoint.py index 2d160713..5272c117 100644 --- a/opendc/api/v1/tiles/tileId/rack/machines/endpoint.py +++ b/opendc/api/v1/tiles/tileId/rack/machines/endpoint.py @@ -1,8 +1,9 @@ from opendc.models.machine import Machine from opendc.models.rack import Rack -from opendc.util import database, exceptions +from opendc.util import exceptions from opendc.util.rest import Response + def GET(request): """Get this Rack's Machines.""" @@ -10,7 +11,7 @@ def GET(request): try: request.check_required_parameters( - path = { + path={ 'tileId': 'int' } ) @@ -45,6 +46,7 @@ def GET(request): [x.to_JSON() for x in machines] ) + def POST(request): """Add a Machine to this rack.""" @@ -52,10 +54,10 @@ def POST(request): try: request.check_required_parameters( - path = { + path={ 'tileId': 'int' }, - body = { + body={ 'machine': { 'rackId': 'int', 'position': 'int', @@ -91,14 +93,14 @@ def POST(request): return Response(403, 'Forbidden from viewing {}.'.format(rack)) # Instantiate a Machine - + machine = Machine.from_JSON(request.params_body['machine']) - + # Try to insert this Machine try: machine.insert() - + except exceptions.ForeignKeyError: return Response(409, 'Rack position occupied.') diff --git a/opendc/api/v1/tiles/tileId/rack/machines/position/endpoint.py b/opendc/api/v1/tiles/tileId/rack/machines/position/endpoint.py index 15e6cf96..99011fa4 100644 --- a/opendc/api/v1/tiles/tileId/rack/machines/position/endpoint.py +++ b/opendc/api/v1/tiles/tileId/rack/machines/position/endpoint.py @@ -1,8 +1,9 @@ from opendc.models.machine import Machine from opendc.models.rack import Rack -from opendc.util import database, exceptions +from opendc.util import exceptions from opendc.util.rest import Response + def GET(request): """Get the Machine at this location in this Rack.""" @@ -10,7 +11,7 @@ def GET(request): try: request.check_required_parameters( - path = { + path={ 'tileId': 'int', 'position': 'int' } @@ -43,16 +44,17 @@ def GET(request): machine.to_JSON() ) + def PUT(request): """Update the Machine at this location in this Rack.""" try: request.check_required_parameters( - path = { + path={ 'tileId': 'int', 'position': 'int' }, - body = { + body={ 'machine': { 'rackId': 'int', 'position': 'int', @@ -91,7 +93,7 @@ def PUT(request): # Update this Machine - machine.positoin = request.params_body['machine']['position'] + machine.position = request.params_body['machine']['position'] machine.tags = request.params_body['machine']['tags'] machine.cpu_ids = request.params_body['machine']['cpuIds'] machine.gpu_ids = request.params_body['machine']['gpuIds'] @@ -100,7 +102,7 @@ def PUT(request): try: machine.update() - + except exceptions.ForeignKeyError: return Response(409, 'Rack position occupied.') @@ -118,6 +120,7 @@ def PUT(request): machine.to_JSON() ) + def DELETE(request): """Delete the Machine at this location in this Rack.""" @@ -125,7 +128,7 @@ def DELETE(request): try: request.check_required_parameters( - path = { + path={ 'tileId': 'int', 'position': 'int' } |
