Merge branch 'webapi' into docker-api

capsulflask/console.py

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

capsulflask/db.py

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

capsulflask/db_model.py

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

capsulflask/publicapi.py

@@ -10,7 +10,7 @@ from nanoid import generate
 from capsulflask.auth import account_required
 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"])
 @account_required
@@ -25,6 +25,8 @@ def capsul_create():
     account_balance = get_account_balance(get_vms(), get_payments(), datetime.datetime.utcnow())
     capacity_avaliable = current_app.config["HUB_MODEL"].capacity_avaliable(512*1024*1024)
 
+    request.json['ssh_authorized_key_count'] = 1
+
     id, errors = _create(
       vm_sizes, 
       operating_systems,

capsulflask/schema_migrations/16_down_api_tokens.py

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

capsulflask/schema_migrations/17_down_api_tokens.py

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

capsulflask/schema_migrations/17_up_api_tokens.py

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

docker-compose.yml

@@ -13,6 +13,9 @@ services:
       - "5000:5000"
     environment:
       - "POSTGRES_CONNECTION_PARAMETERS=host=db port=5432 user=capsul password=capsul dbname=capsul"
+    # The image uses gunicorn by default, let's override it with Flask's
+    # built-in development server
+    command: ["flask", "run", "-h", "0.0.0.0", "-p", "5000"]
   db:
     image: "postgres:9.6.5"
     volumes: