From c7b59ec762c41816619c9ae765b1b97bf520bbae Mon Sep 17 00:00:00 2001 From: Levi Date: Sat, 13 May 2017 17:59:04 -0500 Subject: [PATCH 1/2] added web-team@ungleich.ch email for error --- dynamicweb/settings/prod.py | 2 +- opennebula_api/models.py | 6 ------ opennebula_api/serializers.py | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dynamicweb/settings/prod.py b/dynamicweb/settings/prod.py index 3d268ed4..bb6577b5 100644 --- a/dynamicweb/settings/prod.py +++ b/dynamicweb/settings/prod.py @@ -3,7 +3,7 @@ from .base import * ADMINS = ( ('Nico Schottelius', 'nico.schottelius@ungleich.ch'), ('Raul Ascencio', 'raul.ascencio@yandex.com'), - ('Tomislav Rupcic','tmslav@gmail.com'), + ('Web team', 'web-team@ungleich.ch') ) # ('Sanghee Kim', 'sanghee.kim@ungleich.ch'), diff --git a/opennebula_api/models.py b/opennebula_api/models.py index 02ad1d9a..eb6d64a2 100644 --- a/opennebula_api/models.py +++ b/opennebula_api/models.py @@ -212,18 +212,12 @@ class OpenNebulaManager(): return template_pool def get_templates(self): - print("TEMPLATES") - print(self._get_template_pool()) - try: public_templates = [ template for template in self._get_template_pool() if 'public-' in template.name ] - print("TEMPLATES") - print(public_templates) - return public_templates except ConnectionRefusedError: return [] diff --git a/opennebula_api/serializers.py b/opennebula_api/serializers.py index 600f6fc3..957a98df 100644 --- a/opennebula_api/serializers.py +++ b/opennebula_api/serializers.py @@ -48,6 +48,8 @@ class VirtualMachineTemplateSerializer(serializers.Serializer): return manager.get_template(template_id=opennebula_id) def get_disk_size(self, obj): + import pdb + pdb.set_trace() template = obj.template disk_size = 0 for disk in template.disks: From 9141e1211c0af9f709804bf71617cc0891b09e04 Mon Sep 17 00:00:00 2001 From: Levi Date: Sat, 13 May 2017 18:00:30 -0500 Subject: [PATCH 2/2] remove pdb --- opennebula_api/serializers.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/opennebula_api/serializers.py b/opennebula_api/serializers.py index 957a98df..600f6fc3 100644 --- a/opennebula_api/serializers.py +++ b/opennebula_api/serializers.py @@ -48,8 +48,6 @@ class VirtualMachineTemplateSerializer(serializers.Serializer): return manager.get_template(template_id=opennebula_id) def get_disk_size(self, obj): - import pdb - pdb.set_trace() template = obj.template disk_size = 0 for disk in template.disks: