3wordchant/capsul-flask
1
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

Merge branch 'webapi' into docker-api
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
3wc 2021-07-11 12:36:38 +02:00
commit 49dca12719
7 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
capsulflask/console.py
View File

@ -236,7 +236,7 @@ def _create(vm_sizes, operating_systems, public_keys_for_account, server_data):
""") """)
if len(errors) == 0: if len(errors) == 0:
id = makeCapsulId() id = make_capsul_id()
get_model().create_vm( get_model().create_vm(
email=session["account"], email=session["account"],
id=id, id=id,

2
capsulflask/db.py
View File

@ -43,7 +43,7 @@ def init_app(app, is_running_server):
hasSchemaVersionTable = False hasSchemaVersionTable = False
actionWasTaken = False actionWasTaken = False
schemaVersion = 0 schemaVersion = 0
desiredSchemaVersion = 16 desiredSchemaVersion = 17
cursor = connection.cursor() cursor = connection.cursor()

4
capsulflask/db_model.py
View File

@ -183,8 +183,8 @@ class DBModel:
def create_vm(self, email, id, size, os, ssh_authorized_keys): def create_vm(self, email, id, size, os, ssh_authorized_keys):
self.cursor.execute(""" self.cursor.execute("""
INSERT INTO vms (email, id, size, os) INSERT INTO vms (email, id, size, os, network_name, host)
VALUES (%s, %s, %s, %s) VALUES (%s, %s, %s, %s, 'virbr1', 'baikal')
""", """,
(email, id, size, os) (email, id, size, os)
) )

4
capsulflask/publicapi.py
View File

@ -10,7 +10,7 @@ from nanoid import generate
from capsulflask.auth import account_required from capsulflask.auth import account_required
from capsulflask.db import get_model from capsulflask.db import get_model
bp = Blueprint("webapi", __name__, url_prefix="/api") bp = Blueprint("publicapi", __name__, url_prefix="/api")
@bp.route("/capsul/create", methods=["POST"]) @bp.route("/capsul/create", methods=["POST"])
@account_required @account_required
@ -25,6 +25,8 @@ def capsul_create():
account_balance = get_account_balance(get_vms(), get_payments(), datetime.datetime.utcnow()) account_balance = get_account_balance(get_vms(), get_payments(), datetime.datetime.utcnow())
capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024) capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
request.json['ssh_authorized_key_count'] = 1
id, errors = _create( id, errors = _create(
vm_sizes, vm_sizes,
operating_systems, operating_systems,

2
capsulflask/schema_migrations/16_down_api_tokens.py
View File

@ -1,2 +0,0 @@
DROP TABLE api_keys;
UPDATE schemaversion SET version = 15;

2
capsulflask/schema_migrations/17_down_api_tokens.py Normal file
View File

@ -0,0 +1,2 @@
DROP TABLE api_keys;
UPDATE schemaversion SET version = 16;

2
capsulflask/schema_migrations/16_up_api_tokens.py → capsulflask/schema_migrations/17_up_api_tokens.py
View File

@ -6,4 +6,4 @@ CREATE TABLE api_tokens (
token TEXT NOT NULL token TEXT NOT NULL
); );
UPDATE schemaversion SET version = 16; UPDATE schemaversion SET version = 17;