Merge branch 'development' into 'master'

Fix test and front errors

See merge request hosting/api!37

Author: SeaweedbrainCY

backend/proxmox_api/db/db_functions.py

@@ -35,10 +35,8 @@ def get_user_list(user_id=None, searchItem = None): # filter is for the user nam
         return User.query.filter_by(id=user_id).first()
     elif searchItem is not None:
         search = "%{}%".format(searchItem)
-        print("db search : ", search)
         start = time.time()
         filtered = User.query.filter(User.id.like(search)).all()
-        print("db search time : ", time.time() - start)
         return filtered
 
     else : 

backend/proxmox_api/proxmox.py

@@ -275,7 +275,7 @@ def create_vm(name, vm_type, user_id, password="no", vm_user="", main_ssh_key="n
 
 
     if node[1] != 201:
-        return node
+        return {"error": "Impossible to find an available server"}, 500
     else:
         node = node[0]["server"]
 

backend/test/conftest.py

@@ -15,6 +15,8 @@
 #
 @pytest.fixture()
 def init_user_database():
+    if configuration.ENV != "DEV":
+        raise Exception("You must set the environnement to DEV to run the tests")
     app = util.create_app()
     db = SQLAlchemy()
     db.init_app(app.app)
@@ -25,6 +27,8 @@ def init_user_database():
         db.create_all()
         # List of test users
         test_users = [
+            {"id": "user-1", "freezeState": "0.0",  "lastNotificationDate": None},
+            {"id": "user-2", "freezeState": "0.0",  "lastNotificationDate": None},
             {"id": "valid-user", "freezeState": "0.0",  "lastNotificationDate": None},
              {"id": "expired-user-1", "freezeState": "1.0",    "lastNotificationDate": None},
             {"id": "expired-user-2", "freezeState": "2.0",    "lastNotificationDate": None},
@@ -59,18 +63,18 @@ def create_post_model(user):
 
 @pytest.fixture()
 def init_vm_database():
+    if configuration.ENV != "DEV":
+        raise Exception("You must set the environnement to DEV to run the tests")
     app = util.create_app()
     db = SQLAlchemy()
     db.init_app(app.app)
     with app.app.app_context():
-        db.session.query(model.Vm).delete()
-        db.session.query(model.User).delete()
+        try:
+            db.session.query(model.Vm).delete()
+        except:
+            print("No VM to delete")
         db.create_all()
-        # List of test users
-        test_users = [
-            {"id": "user-1", "freezeState": "0.0",  "lastNotificationDate": None},
-            {"id": "user-2", "freezeState": "0.0",  "lastNotificationDate": None},
-        ]
+
         # List of test VM
         test_vms = [
             {"id" : 1, "userId" : "user-1", "type":"bare", "ip" : None, "mac" : None,"needToBeRestored" : False},
@@ -88,12 +92,9 @@ def create_vm_model(vms):
             return model.Vm(**vms)
 
         # Create a list of objects
-        mapped_users = map(create_user_model, test_users)
-        t_users = list(mapped_users)
         mapped_vms = map(create_vm_model, test_vms)
         t_vms = list(mapped_vms)
 
-        db.session.add_all(t_users)
         db.session.add_all(t_vms)
 
         # Commit the changes for the users

backend/test/integration/test_vm_life.py

@@ -52,7 +52,7 @@ def fake_set_new_vm_ip(next_vmid, node):
 
 
         body,status = proxmox.create_vm("INTEGRATION-TEST-VM",  "bare_vm", "valid-user", password="1A#aaaaaaaaa",  vm_user="user", main_ssh_key="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWkpOTUuLKpZEQT2CmEsgZwZzegitYCx/8vHICvv261 fake@key")
-        assert status == 201
+        assert status == 201 
         start_time = time.time()
         configuration_state = "creating"
         while time.time() - start_time <= 600 and   configuration_state == "creating": # timeout after 10min

backend/test/test-vm-creation-form.py

@@ -0,0 +1,69 @@
+import pytest
+from proxmox_api import proxmox
+from test.conftest import *
+from proxmox_api.db import db_functions
+
+
+
+
+def test_creation_for_new_user(monkeypatch,init_user_database, init_vm_database, proxmoxAPI):
+    """Test case for creation of VM by a new user
+    The creation does not concern proxmox
+    """
+
+    node = "wammu"
+
+    def fake_next_available_vmid():
+        return "999"
+
+    def fake_set_new_vm_ip(next_vmid, node):
+        return "127.0.0.1"
+    
+    def fake_load_balance_server():
+        return {'server' :'wammu'},201
+
+    def fake_proxmox_clone_vm(name, newid,target, full):
+        return True 
+    
+    def fake_vm_config(vmid, node, password, vm_user,main_ssh_key, ip):
+        return True
+
+    def fake_check_update_cotisation(user_id):
+        return {"freezeState": "1"}, 200
+    
+    
+
+    app = util.create_app()
+    db = SQLAlchemy()
+    db.init_app(app.app)
+    with app.app.app_context():
+        # Mocking 
+        monkeypatch.setattr(proxmox, 'next_available_vmid', fake_next_available_vmid)
+        monkeypatch.setattr(proxmox, 'set_new_vm_ip', fake_set_new_vm_ip)
+        monkeypatch.setattr(proxmoxAPI.nodes("wammu").qemu(10003).clone, 'create', fake_proxmox_clone_vm)
+        monkeypatch.setattr(proxmox, 'load_balance_server', fake_load_balance_server)
+        monkeypatch.setattr(proxmox, 'config_vm', fake_vm_config)
+        monkeypatch.setattr(proxmox, 'check_update_cotisation', fake_check_update_cotisation)
+
+        userId = "new-user6"
+        body,status = proxmox.create_vm("INTEGRATION-TEST-VM",  "bare_vm", userId, password="1A#aaaaaaaaa",  vm_user="user", main_ssh_key="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKWkpOTUuLKpZEQT2CmEsgZwZzegitYCx/8vHICvv261 fake@key")
+        assert status == 201
+        userVms = db_functions.get_vm_list(user_id=userId)
+        assert len(userVms) == 1
+
+
+
+    
+
+    
+
+
+    
+
+
+
+
+
+
+
+    

backend/test/test_vm_creation_form.py

@@ -3,7 +3,7 @@
     <router-outlet *ngIf="(validToken$ | async)  || router.url === this.cookie.get('lang')+'/manual' || router.url === this.cookie.get('lang')+'/legal'; else landing"></router-outlet>
     <ng-template #landing>
         <div class="text-center">
-            <img id="logo" class="mb-3" style="height: 150px" src="assets/images/minet.png">
+            <img id="logo" class="mb-3" style="height: 150px" src="assets/images/minet_light_noel.png">
             <div class="alert alert-success" role="alert">
                 <p>Welcome to MiNET's new hosting service. It is still in beta, please report any problem
                     to our <a href="mailto:[email protected]"> webmaster</a>.</p>

frontend/src/app/app.component.html

@@ -2,6 +2,7 @@
   <a class="navbar-brand" [routerLink]="['/']">
     <img src="../../assets/images/logo.png" height="30" style="margin-right: 10px"/>
     MiNET Hosting
+    <span class="badge bg-secondary">Beta Publique </span>
   </a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarNav" aria-controls="navbarNav"
           aria-expanded="false" aria-label="Toggle navigation">