From 6a11181075fdb4a8cf2e562d28d8e4c31f945d3d Mon Sep 17 00:00:00 2001
From: viacheslav anzhiganov <vanzhiganov@outlook.com>
Date: Sun, 5 Jan 2025 07:55:28 +0300
Subject: [PATCH] update

---
 .gitignore                                         |  2 +-
 .rsyncignore                                       |  1 +
 SWSCloudAdministrator/Administrator/compute/vms.py | 12 ++++++++----
 SWSCloudAdministrator/application.py               |  6 +++++-
 SWSCloudServerAPI/ServerAPI/__init__.py            |  2 +-
 SWSStatisticsClient/__init__.py                    |  9 +++++++--
 extra/settings.origin.ini                          |  6 +++---
 7 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index f34049a..d35cf29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 settings.ini
 .idea/
-
+.venv/
 # Created by .ignore support plugin (hsz.mobi)
 ### Python template
 # Byte-compiled / optimized / DLL files
diff --git a/.rsyncignore b/.rsyncignore
index 9de86e8..ff3e151 100644
--- a/.rsyncignore
+++ b/.rsyncignore
@@ -1,4 +1,5 @@
 .venv
 .git
 __pycache__/
+*.egg-info/
 venv
\ No newline at end of file
diff --git a/SWSCloudAdministrator/Administrator/compute/vms.py b/SWSCloudAdministrator/Administrator/compute/vms.py
index 5a61c59..3e7dea5 100644
--- a/SWSCloudAdministrator/Administrator/compute/vms.py
+++ b/SWSCloudAdministrator/Administrator/compute/vms.py
@@ -7,15 +7,19 @@ from SWSCloudCore.controllers.tasks import ControllerTasks
 from SWSCloudCore import models
 from SWSCloudAdministrator.Administrator.common import requires_login
 
-view_administrator_compute_vms = Blueprint('administrator_compute_vms', __name__, url_prefix='/administrator/compute/vms')
+view_administrator_compute_vms = Blueprint(
+    'administrator_compute_vms',
+    __name__,
+    url_prefix='/administrator/compute/vms')
 
 
 @view_administrator_compute_vms.route('/', methods=['GET'])
 @requires_login
 def index():
-    # формируем список правил
-    return render_template(
-        'administrator/compute/vms/index.html', vms=models.Vms.get_items())
+    """Virtual Machines list"""
+    template = 'administrator/compute/vms/index.html'
+    items = models.Vms.get_items()
+    return render_template(template, vms=items)
 
 
 @view_administrator_compute_vms.route('/<uuid:vm_id>', methods=['GET'])
diff --git a/SWSCloudAdministrator/application.py b/SWSCloudAdministrator/application.py
index 0697310..45ec538 100644
--- a/SWSCloudAdministrator/application.py
+++ b/SWSCloudAdministrator/application.py
@@ -51,7 +51,11 @@ app.register_blueprint(view_administrator_compute_containers)
 def before_request():
     g.settings = dict()
     # извлекаем настройки и определяем их в глобальную переменную
-    for setting in models.Settings.select(models.Settings.key, models.Settings.val).execute():
+    settings = models.Settings.select(
+        models.Settings.key,
+        models.Settings.val
+    ).execute()
+    for setting in settings:
         g.settings[setting.key] = setting.val
 
 
diff --git a/SWSCloudServerAPI/ServerAPI/__init__.py b/SWSCloudServerAPI/ServerAPI/__init__.py
index e2dc7ac..06342b9 100644
--- a/SWSCloudServerAPI/ServerAPI/__init__.py
+++ b/SWSCloudServerAPI/ServerAPI/__init__.py
@@ -1,4 +1,4 @@
-# coding: utf-8
+"""Stack Web Services LLC."""
 
 import json
 from flask import Blueprint, jsonify, request, g
diff --git a/SWSStatisticsClient/__init__.py b/SWSStatisticsClient/__init__.py
index 836f340..ddadee4 100644
--- a/SWSStatisticsClient/__init__.py
+++ b/SWSStatisticsClient/__init__.py
@@ -2,8 +2,13 @@ import requests
 
 
 class SWSStatisticsClient(object):
-    def get_vm(self, vm_id, limit=96):
-        r = requests.get('http://server-stats.gocloud.ru/stats/v1/compute/vms/%s' % vm_id, params={'limit': limit})
+    def get_vm(self, vm_id: str, limit: int = 96):
+        r = requests.get(
+            f"http://server-stats.gocloud.ru/stats/v1/compute/vms/{vm_id}",
+            params={
+                'limit': limit
+            }
+        )
         if r.status_code == 200:
             return r.json()
         return None
diff --git a/extra/settings.origin.ini b/extra/settings.origin.ini
index bda31a7..90b5ae0 100644
--- a/extra/settings.origin.ini
+++ b/extra/settings.origin.ini
@@ -1,9 +1,9 @@
 [Database]
 host = localhost
-user = postgres
-password = postgres
+user = cherry
+password = P@ss5476
 port = 5432
-name = gocloud
+name = testdb
 
 [Application]
 DEBUG = true