From a86243b475817a760043540cfd702e8312523cae Mon Sep 17 00:00:00 2001
From: vanzhiganov <vanzhiganov@ya.ru>
Date: Thu, 26 May 2016 04:04:04 +0300
Subject: [PATCH] =?UTF-8?q?44=20=D0=A1=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D1=80=D0=B5=D0=B4=D1=81=D1=82=D0=B2=20=D1=81=D0=BE=20?=
 =?UTF-8?q?=D1=81=D1=87=D1=91=D1=82=D0=B0=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SWSCloudCore/templates/default/_header.html |  4 ++
 cloud-cron-balance.py                       | 53 ++++++++++++++-------
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/SWSCloudCore/templates/default/_header.html b/SWSCloudCore/templates/default/_header.html
index 1e3cd9c..7275dd0 100644
--- a/SWSCloudCore/templates/default/_header.html
+++ b/SWSCloudCore/templates/default/_header.html
@@ -17,8 +17,12 @@
                                 <li><a href="{{ url_for('account.logout') }}">Выход</a></li>
                             </ul>
                             <ul class="left">
+                                {% if g.settings.get('SERVICE_CONTAINERS_ENABLE', "0") == "1" %}
                                 <li><a href="{{ url_for('containers.index') }}">Контейнеры</a></li>
+                                {% endif %}
+                                {% if g.settings.get('SERVICE_VMS_ENABLE', '0') == '1' %}
                                 <li><a href="{{ url_for('vms.index') }}">Виртуальные машины</a></li>
+                                {% endif %}
                             </ul>
                         {% else %}
                             <ul class="right">
diff --git a/cloud-cron-balance.py b/cloud-cron-balance.py
index 42d1feb..195fcc0 100644
--- a/cloud-cron-balance.py
+++ b/cloud-cron-balance.py
@@ -4,24 +4,43 @@
 from SWSCloudCore import models
 
 
-print 'total vms:', models.Vms.select().count()
-for vm in models.Vms.select():
-    # Высчитываем, сколько стоит виртуальная машина 15 минут
-    price_quarter = vm.plan.price / 30 / 24 / 4
+if int(models.Settings.select().where(models.Settings.key == 'SERVICE_VMS_ENABLE').get().val) == 1:
+    print 'total vms:', models.Vms.select().count()
+    for vm in models.Vms.select():
+        # Высчитываем, сколько стоит виртуальная машина 15 минут
+        price_quarter = vm.plan.price / 30 / 24 / 4
 
-    print dict(id=vm.id, user=vm.user.id, plan=vm.plan.id, cost_mo=vm.plan.price, cost_quarter=price_quarter)
+        print dict(id=vm.id, user=vm.user.id, plan=vm.plan.id, cost_mo=vm.plan.price, cost_quarter=price_quarter)
 
-    # Списание средств
-    x = models.UsersBalance.update(
-        balance=models.UsersBalance.balance - price_quarter
-    ).where(
-        models.UsersBalance.user == vm.user.id
-    )
-    x.execute()
+        # Списание средств
+        x = models.UsersBalance.update(
+            balance=models.UsersBalance.balance - price_quarter
+        ).where(
+            models.UsersBalance.user == vm.user.id
+        )
+        x.execute()
 
-print 'total containers:', models.Containers.select().count()
+if int(models.Settings.select().where(models.Settings.key == 'SERVICE_CONTAINERS_ENABLE').get().val) == 1:
+    print 'total containers:', models.Containers.select().count()
+    for container in models.Containers.select():
+        container_state = models.ContainersStatisticsState.select().where(
+            models.ContainersStatisticsState.container == container.id
+        ).get()
+        # min_price = 100 + (container_state.size * )
 
-# Post operations
-# Check user balance
-# If user balance less that allowable limit
-# then power off all virtual machines and containers
+        # # Высчитываем, сколько стоит виртуальная машина 15 минут
+        # price_quarter = vm.plan.price / 30 / 24 / 4
+        #
+        # print dict(id=vm.id, user=vm.user.id, plan=vm.plan.id, cost_mo=vm.plan.price, cost_quarter=price_quarter)
+        #
+        # # Списание средств
+        # x = models.UsersBalance.update(
+        #     balance=models.UsersBalance.balance - price_quarter
+        # ).where(
+        #     models.UsersBalance.user == vm.user.id
+        # )
+        # x.execute()
+    # Post operations
+    # Check user balance
+    # If user balance less that allowable limit
+    # then power off all virtual machines and containers