diff options
| author | Georgios Andreadis <info@gandreadis.com> | 2020-06-26 14:24:59 +0200 |
|---|---|---|
| committer | Georgios Andreadis <info@gandreadis.com> | 2020-06-26 14:24:59 +0200 |
| commit | cd5f7bf3a72913e1602cb4c575e61ac7d5519be0 (patch) | |
| tree | b2f5c85a9ff0c24f1af04cadb13f307ac49044d9 /opendc | |
| parent | 40185f6ddc9c4620c62273366a0fb491ecf2cad3 (diff) | |
Remove more old endpoints
Diffstat (limited to 'opendc')
| -rw-r--r-- | opendc/api/v2/rooms/__init__.py | 0 | ||||
| -rw-r--r-- | opendc/api/v2/rooms/roomId/__init__.py | 0 | ||||
| -rw-r--r-- | opendc/api/v2/rooms/roomId/endpoint.py | 111 | ||||
| -rw-r--r-- | opendc/api/v2/rooms/roomId/tiles/__init__.py | 0 | ||||
| -rw-r--r-- | opendc/api/v2/rooms/roomId/tiles/endpoint.py | 103 | ||||
| -rw-r--r-- | opendc/api/v2/tiles/__init__.py | 0 | ||||
| -rw-r--r-- | opendc/api/v2/tiles/tileId/__init__.py | 0 | ||||
| -rw-r--r-- | opendc/api/v2/tiles/tileId/endpoint.py | 69 | ||||
| -rw-r--r-- | opendc/api/v2/tiles/tileId/rack/__init__.py | 0 | ||||
| -rw-r--r-- | opendc/api/v2/tiles/tileId/rack/endpoint.py | 201 | ||||
| -rw-r--r-- | opendc/api/v2/tiles/tileId/rack/machines/__init__.py | 0 | ||||
| -rw-r--r-- | opendc/api/v2/tiles/tileId/rack/machines/endpoint.py | 102 | ||||
| -rw-r--r-- | opendc/api/v2/tiles/tileId/rack/machines/position/__init__.py | 0 | ||||
| -rw-r--r-- | opendc/api/v2/tiles/tileId/rack/machines/position/endpoint.py | 140 |
14 files changed, 0 insertions, 726 deletions
diff --git a/opendc/api/v2/rooms/__init__.py b/opendc/api/v2/rooms/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/opendc/api/v2/rooms/__init__.py +++ /dev/null diff --git a/opendc/api/v2/rooms/roomId/__init__.py b/opendc/api/v2/rooms/roomId/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/opendc/api/v2/rooms/roomId/__init__.py +++ /dev/null diff --git a/opendc/api/v2/rooms/roomId/endpoint.py b/opendc/api/v2/rooms/roomId/endpoint.py deleted file mode 100644 index 663760aa..00000000 --- a/opendc/api/v2/rooms/roomId/endpoint.py +++ /dev/null @@ -1,111 +0,0 @@ -from opendc.models_old.room import Room -from opendc.util import exceptions -from opendc.util.rest import Response - - -def GET(request): - """Get this Room.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'roomId': 'int'}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Room from the database - - room = Room.from_primary_key((request.params_path['roomId'], )) - - # Make sure this Room exists - - if not room.exists(): - return Response(404, '{} not found.'.format(room)) - - # Make sure this user is authorized to view this Room - - if not room.google_id_has_at_least(request.google_id, 'VIEW'): - return Response(403, 'Forbidden from retrieving {}.'.format(room)) - - # Return this Room - - room.read() - - return Response(200, 'Successfully retrieved {}.'.format(room), room.to_JSON()) - - -def PUT(request): - """Update this Room's name and type.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'roomId': 'int'}, - body={'room': { - 'name': 'string', - 'roomType': 'string' - }}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Room from the database - - room = Room.from_primary_key((request.params_path['roomId'], )) - - # Make sure this Room exists - - if not room.exists(): - return Response(404, '{} not found.'.format(room)) - - # Make sure this user is authorized to edit this Room - - if not room.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from updating {}.'.format(room)) - - # Update this Room - - room.name = request.params_body['room']['name'] - room.type = request.params_body['room']['roomType'] - - try: - room.update() - except exceptions.ForeignKeyError: - return Response(400, 'Invalid `roomType` or existing `name`.') - - # Return this Room - - return Response(200, 'Successfully updated {}.'.format(room), room.to_JSON()) - - -def DELETE(request): - """Delete this Room.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'roomId': 'int'}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Room and make sure it exists - - room = Room.from_primary_key((request.params_path['roomId'], )) - - if not room.exists(): - return Response(404, '{} not found.'.format(room)) - - # Make sure this user is authorized to delete this Room - - if not room.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from deleting {}.'.format(room)) - - # Delete this Room - - room.delete() - - # Return this Room - - return Response(200, 'Successfully deleted {}.'.format(room), room.to_JSON()) diff --git a/opendc/api/v2/rooms/roomId/tiles/__init__.py b/opendc/api/v2/rooms/roomId/tiles/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/opendc/api/v2/rooms/roomId/tiles/__init__.py +++ /dev/null diff --git a/opendc/api/v2/rooms/roomId/tiles/endpoint.py b/opendc/api/v2/rooms/roomId/tiles/endpoint.py deleted file mode 100644 index 3385dd36..00000000 --- a/opendc/api/v2/rooms/roomId/tiles/endpoint.py +++ /dev/null @@ -1,103 +0,0 @@ -from opendc.models_old.room import Room -from opendc.models_old.tile import Tile -from opendc.util import exceptions -from opendc.util.rest import Response - - -def GET(request): - """Get this Room's Tiles.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'roomId': 'int'}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Room from the database - - room = Room.from_primary_key((request.params_path['roomId'], )) - - # Make sure this Room exists - - if not room.exists(): - return Response(404, '{} not found.'.format(room)) - - # Make sure this user is authorized to view this Room's Tiles - - if not room.google_id_has_at_least(request.google_id, 'VIEW'): - return Response(403, 'Forbidden from viewing Tiles for {}.'.format(room)) - - # Get and return the Tiles - - tiles = Tile.query('room_id', room.id) - - for tile in tiles: - tile.read() - - return Response(200, 'Successfully retrieved Tiles for {}.'.format(room), [x.to_JSON() for x in tiles]) - - -def POST(request): - """Add a Tile.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'roomId': 'int'}, - body={'tile': { - 'roomId': 'int', - 'positionX': 'int', - 'positionY': 'int' - }}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - if request.params_path['roomId'] != request.params_body['tile']['roomId']: - return Response(400, 'ID mismatch') - - # Instantiate a Room from the database - - room = Room.from_primary_key((request.params_path['roomId'], )) - - # Make sure this Room exists - - if not room.exists(): - return Response(404, '{} not found.'.format(room)) - - # Make sure this user is authorized to edit this Room's Tiles - - if not room.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from adding Tiles to {}.'.format(room)) - - # Clean the tile JSON - - tile_json = request.params_body['tile'] - - tile_json['objectId'] = None - tile_json['objectType'] = None - - # Instantiate a Tile - - tile = Tile.from_JSON(tile_json) - - # Try to insert this Tile - - try: - tile.insert() - - except exceptions.ForeignKeyError as e: - - if e.message == 'OccupiedTilePosition': - return Response(409, 'Tile position occupied.') - - elif e.message == 'InvalidTilePosition': - return Response(400, 'Invalid Tile position (new Tiles must neighbor existing Tiles).') - - # Return this Tile - - tile.read() - - return Response(200, 'Successfully added {}.'.format(tile), tile.to_JSON()) diff --git a/opendc/api/v2/tiles/__init__.py b/opendc/api/v2/tiles/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/opendc/api/v2/tiles/__init__.py +++ /dev/null diff --git a/opendc/api/v2/tiles/tileId/__init__.py b/opendc/api/v2/tiles/tileId/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/opendc/api/v2/tiles/tileId/__init__.py +++ /dev/null diff --git a/opendc/api/v2/tiles/tileId/endpoint.py b/opendc/api/v2/tiles/tileId/endpoint.py deleted file mode 100644 index e1efda77..00000000 --- a/opendc/api/v2/tiles/tileId/endpoint.py +++ /dev/null @@ -1,69 +0,0 @@ -from opendc.models_old.tile import Tile -from opendc.util import exceptions -from opendc.util.rest import Response - - -def GET(request): - """Get this Tile.""" - - # Make sure request parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int'}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Tile from the database - - tile = Tile.from_primary_key((request.params_path['tileId'], )) - - # Make sure this Tile exists - - if not tile.exists(): - return Response(404, '{} not found.'.format(tile)) - - # Make sure this user is authorized to view this Tile - - if not tile.google_id_has_at_least(request.google_id, 'VIEW'): - return Response(403, 'Forbidden from retrieving {}.'.format(tile)) - - # Return this Tile - - tile.read() - - return Response(200, 'Successfully retrieved {}.'.format(tile), tile.to_JSON()) - - -def DELETE(request): - """Delete this Tile.""" - - # Make sure request parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int'}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Tile from the database - - tile = Tile.from_primary_key((request.params_path['tileId'], )) - - # Make sure this Tile exists - - if not tile.exists(): - return Response(404, '{} not found.'.format(tile)) - - # Make sure this user is authorized to edit this Tile - - if not tile.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from deleting {}.'.format(tile)) - - # Delete this Tile - - tile.delete() - - # Return this Tile - - return Response(200, 'Successfully deleted {}.'.format(tile), tile.to_JSON()) diff --git a/opendc/api/v2/tiles/tileId/rack/__init__.py b/opendc/api/v2/tiles/tileId/rack/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/opendc/api/v2/tiles/tileId/rack/__init__.py +++ /dev/null diff --git a/opendc/api/v2/tiles/tileId/rack/endpoint.py b/opendc/api/v2/tiles/tileId/rack/endpoint.py deleted file mode 100644 index b5c7fde6..00000000 --- a/opendc/api/v2/tiles/tileId/rack/endpoint.py +++ /dev/null @@ -1,201 +0,0 @@ -from opendc.models_old.rack import Rack -from opendc.models_old.tile import Tile -from opendc.util import exceptions -from opendc.util.rest import Response - - -def GET(request): - """Get this Tile's Rack.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int'}, ) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Tile from the database - - tile = Tile.from_primary_key((request.params_path['tileId'], )) - - # Make sure this Tile exists - - if not tile.exists(): - return Response(404, '{} not found.'.format(tile)) - - # Make sure this user is authorized to view this Tile - - if not tile.google_id_has_at_least(request.google_id, 'VIEW'): - return Response(403, 'Forbidden from editing {}'.format(tile)) - - # Instantiate a Rack from the database - - rack = Rack.from_primary_key((tile.object_id, )) - - # Make sure this Rack exists - - if not rack.exists(): - return Response(404, '{} not found'.format(rack)) - - # Return the Rack - - rack.read() - - return Response(200, 'Successfully retrieved {}.'.format(rack), rack.to_JSON()) - - -def POST(request): - """Add a Rack to this Tile if it is empty.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int'}, - body={'rack': { - 'name': 'string', - 'capacity': 'int', - 'powerCapacityW': 'int' - }}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Tile from the database - - tile = Tile.from_primary_key((request.params_path['tileId'], )) - - # Make sure this Tile exists - - if not tile.exists(): - return Response(404, '{} not found.'.format(tile)) - - # Make sure this user is authorized to edit this Tile - - if not tile.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from editing {}'.format(tile)) - - # Make sure this Tile isn't occupied - - if tile.object_id is not None: - return Response(409, '{} occupied.'.format(tile)) - - # Instantiate a Rack and insert it into the database - - rack = Rack.from_JSON(request.params_body['rack']) - rack.insert() - - # Try to add this Rack to this Tile - - tile.object_id = rack.id - tile.object_type = 'RACK' - tile.update() - - # Return this Rack - - rack.read() - - return Response(200, 'Successfully added {}.'.format(rack), rack.to_JSON()) - - -def PUT(request): - """Update the Rack on this Tile.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int'}, - body={'rack': { - 'name': 'string', - 'capacity': 'int', - 'powerCapacityW': 'int' - }}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Tile from the database - - tile = Tile.from_primary_key((request.params_path['tileId'], )) - - # Make sure this Tile exists - - if not tile.exists(): - return Response(404, '{} not found.'.format(tile)) - - # Make sure this user is authorized to edit this Tile - - if not tile.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from editing {}'.format(tile)) - - # Instantiate a Rack from the database - - rack = Rack.from_primary_key((tile.object_id, )) - - # Make sure this Rack exists - - if not rack.exists(): - return Response(404, '{} not found'.format(rack)) - - # Update this Rack - - rack.name = request.params_body['rack']['name'] - rack.capacity = request.params_body['rack']['capacity'] - - rack.update() - - # Return this Rack - - rack.read() - - return Response(200, 'Successfully updated {}.'.format(rack), rack.to_JSON()) - - -def DELETE(request): - """Delete this Tile's Rack.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int'}, ) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Tile from the database - - tile = Tile.from_primary_key((request.params_path['tileId'], )) - - # Make sure this Tile exists - - if not tile.exists(): - return Response(404, '{} not found.'.format(tile)) - - # Make sure this user is authorized to edit this Tile - - if not tile.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from editing {}'.format(tile)) - - # Instantiate a Rack from the database - - rack = Rack.from_primary_key((tile.object_id, )) - - # Make sure this Rack exists - - if not rack.exists(): - return Response(404, '{} not found'.format(rack)) - - # Remove this Rack from this Tile - - tile.object_id = None - tile.object_type = None - - tile.update() - - # Delete this Rack - - rack.delete() - - # Return this Rack - - return Response(200, 'Successfully deleted {}.'.format(rack), rack.to_JSON()) diff --git a/opendc/api/v2/tiles/tileId/rack/machines/__init__.py b/opendc/api/v2/tiles/tileId/rack/machines/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/opendc/api/v2/tiles/tileId/rack/machines/__init__.py +++ /dev/null diff --git a/opendc/api/v2/tiles/tileId/rack/machines/endpoint.py b/opendc/api/v2/tiles/tileId/rack/machines/endpoint.py deleted file mode 100644 index 7980d676..00000000 --- a/opendc/api/v2/tiles/tileId/rack/machines/endpoint.py +++ /dev/null @@ -1,102 +0,0 @@ -from opendc.models_old.machine import Machine -from opendc.models_old.rack import Rack -from opendc.util import exceptions -from opendc.util.rest import Response - - -def GET(request): - """Get this Rack's Machines.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int'}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Rack from the database - - rack = Rack.from_tile_id(request.params_path['tileId']) - - # Make sure this Rack exists - - if not rack.exists(): - return Response(404, '{} not found.'.format(rack)) - - # Make sure this user is authorized to view this Rack's Machines - - if not rack.google_id_has_at_least(request.google_id, 'VIEW'): - return Response(403, 'Forbidden from viewing {}.'.format(rack)) - - # Get and return the Machines - - machines = Machine.query('rack_id', rack.id) - - for machine in machines: - machine.read() - - return Response(200, 'Successfully retrieved Machines for {}.'.format(rack), [x.to_JSON() for x in machines]) - - -def POST(request): - """Add a Machine to this rack.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int'}, - body={ - 'machine': { - 'rackId': 'int', - 'position': 'int', - 'tags': 'list-string', - 'cpuIds': 'list-int', - 'gpuIds': 'list-int', - 'memoryIds': 'list-int', - 'storageIds': 'list-int' - } - }) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Rack from the database - - rack = Rack.from_tile_id(request.params_path['tileId']) - - # Make sure this Rack exists - - if not rack.exists(): - return Response(404, '{} not found.'.format(rack)) - - # Make sure this Rack's ID matches the given rack ID - - if rack.id != request.params_body['machine']['rackId']: - return Response(400, 'Rack ID in `machine` and path do not match.') - - # Make sure this user is authorized to edit this Rack's Machines - - if not rack.google_id_has_at_least(request.google_id, 'VIEW'): - 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.') - - except: - return Response(400, 'Invalid Machine.') - - # Return this Machine - - machine.read() - - return Response(200, 'Successfully added {}.'.format(machine), machine.to_JSON()) diff --git a/opendc/api/v2/tiles/tileId/rack/machines/position/__init__.py b/opendc/api/v2/tiles/tileId/rack/machines/position/__init__.py deleted file mode 100644 index e69de29b..00000000 --- a/opendc/api/v2/tiles/tileId/rack/machines/position/__init__.py +++ /dev/null diff --git a/opendc/api/v2/tiles/tileId/rack/machines/position/endpoint.py b/opendc/api/v2/tiles/tileId/rack/machines/position/endpoint.py deleted file mode 100644 index dc598162..00000000 --- a/opendc/api/v2/tiles/tileId/rack/machines/position/endpoint.py +++ /dev/null @@ -1,140 +0,0 @@ -from opendc.models_old.machine import Machine -from opendc.models_old.rack import Rack -from opendc.util import exceptions -from opendc.util.rest import Response - - -def GET(request): - """Get the Machine at this location in this Rack.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int', 'position': 'int'}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Machine from the database - - machine = Machine.from_tile_id_and_rack_position(request.params_path['tileId'], request.params_path['position']) - - # Make sure this Machine exists - - if not machine.exists(): - return Response(404, '{} not found.'.format(machine)) - - # Make sure this user is authorized to view this Machine - - if not machine.google_id_has_at_least(request.google_id, 'VIEW'): - return Response(403, 'Forbidden from retrieving {}.'.format(machine)) - - # Return this Machine - - machine.read() - - return Response(200, 'Successfully retrieved {}.'.format(machine), machine.to_JSON()) - - -def PUT(request): - """Update the Machine at this location in this Rack.""" - - try: - request.check_required_parameters(path={ - 'tileId': 'int', - 'position': 'int' - }, - body={ - 'machine': { - 'rackId': 'int', - 'position': 'int', - 'tags': 'list-string', - 'cpuIds': 'list-int', - 'gpuIds': 'list-int', - 'memoryIds': 'list-int', - 'storageIds': 'list-int' - } - }) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Machine from the database - - machine = Machine.from_tile_id_and_rack_position(request.params_path['tileId'], request.params_path['position']) - - # Make sure this Machine exists - - if not machine.exists(): - return Response(404, '{} not found.'.format(machine)) - - # Make sure this Machine's rack ID is right - - rack = Rack.from_tile_id(request.params_path['tileId']) - - if not rack.exists() or rack.id != request.params_body['machine']['rackId']: - return Response(400, 'Mismatch in Rack IDs.') - - # Make sure this user is authorized to edit this Machine - - if not machine.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from retrieving {}.'.format(machine)) - - # Update this Machine - - 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'] - machine.memory_ids = request.params_body['machine']['memoryIds'] - machine.storage_ids = request.params_body['machine']['storageIds'] - - try: - machine.update() - - except exceptions.ForeignKeyError: - return Response(409, 'Rack position occupied.') - - except Exception as e: - print(e) - return Response(400, 'Invalid Machine.') - - # Return this Machine - - machine.read() - - return Response(200, 'Successfully updated {}.'.format(machine), machine.to_JSON()) - - -def DELETE(request): - """Delete the Machine at this location in this Rack.""" - - # Make sure required parameters are there - - try: - request.check_required_parameters(path={'tileId': 'int', 'position': 'int'}) - - except exceptions.ParameterError as e: - return Response(400, str(e)) - - # Instantiate a Machine from the database - - machine = Machine.from_tile_id_and_rack_position(request.params_path['tileId'], request.params_path['position']) - - # Make sure this Machine exists - - if not machine.exists(): - return Response(404, '{} not found.'.format(machine)) - - # Make sure this user is authorized to edit this Machine - - if not machine.google_id_has_at_least(request.google_id, 'EDIT'): - return Response(403, 'Forbidden from retrieving {}.'.format(machine)) - - # Delete this Machine - - machine.delete() - - # Return this Machine - - return Response(200, 'Successfully deleted {}.'.format(machine), machine.to_JSON()) |
