Merge 8d5ec0a into d979d83

src/ralph_scrooge/admin.py

@@ -8,6 +8,7 @@
 from django import forms
 from django.contrib import admin
 from django.contrib.admin.widgets import FilteredSelectMultiple
+from django.utils.translation import ugettext_lazy as _
 from lck.django.common.admin import ModelAdmin
 from simple_history.admin import SimpleHistoryAdmin
 
@@ -162,6 +163,36 @@ class ServiceAdmin(SimpleHistoryAdmin):
 # =============================================================================
 # PRICING SERVICE
 # =============================================================================
+class PricingServiceForm(forms.ModelForm):
+    class Meta:
+        model = models.PricingService
+
+    services = forms.ModelMultipleChoiceField(
+        help_text=_('Services used to calculate costs of Pricing Service'),
+        queryset=models.Service.objects.all(),
+        required=False,
+        widget=FilteredSelectMultiple('Services', False),
+
+    )
+
+    def __init__(self, *args, **kwargs):
+        super(PricingServiceForm, self).__init__(*args, **kwargs)
+        if self.instance:
+            self.fields['services'].initial = (
+                self.instance.services.exclude(pricing_service=None)
+            )
+
+    def save(self, commit=True):
+        # NOTE: Previously assigned Services and their pricing services are
+        # silently reset
+        instance = super(PricingServiceForm, self).save(commit=False)
+        self.fields['services'].initial.update(pricing_service=None)
+        instance.save()
+        if self.cleaned_data['services']:
+            self.cleaned_data['services'].update(pricing_service=instance)
+        return instance
+
+
 class ServiceUsageTypesInline(admin.TabularInline):
     model = models.ServiceUsageTypes
 
@@ -170,6 +201,7 @@ class ServiceUsageTypesInline(admin.TabularInline):
 class PricingServiceAdmin(ModelAdmin):
     list_display = ('name',)
     search_fields = ('name',)
+    form = PricingServiceForm
     inlines = [ServiceUsageTypesInline]
 
 

src/ralph_scrooge/models/service.py

@@ -18,6 +18,7 @@
     IntervalHistoricalRecords,
     ModelDiffMixin,
 )
+from ralph_scrooge.models.usage import DailyUsage
 
 
 class BusinessLine(Named):
@@ -74,6 +75,12 @@ class Service(ModelDiffMixin, EditorTrackable, TimeTrackable):
         through='ServiceEnvironment',
         related_name='services',
     )
+    pricing_service = db.ForeignKey(
+        'PricingService',
+        related_name='services',
+        null=True,
+        blank=True,
+    )
     history = IntervalHistoricalRecords()
 
     class Meta:
@@ -94,14 +101,14 @@ class PricingService(Named):
         verbose_name=_("Use universal plugin"),
         default=True,
     )
-    services = db.ManyToManyField(
-        'Service',
-        verbose_name=_("Services"),
-        related_name='pricing_services',
-        help_text=_('Services used to calculate costs of Pricing Service'),
-        blank=False,
-        null=False,
-    )
+    # services = db.ManyToManyField(
+    #     'Service',
+    #     verbose_name=_("Services"),
+    #     related_name='pricing_services',
+    #     help_text=_('Services used to calculate costs of Pricing Service'),
+    #     blank=False,
+    #     null=False,
+    # )
     usage_types = db.ManyToManyField(
         'UsageType',
         through='ServiceUsageTypes',
@@ -142,11 +149,33 @@ class Meta:
         verbose_name_plural = _("pricing services")
         app_label = 'ralph_scrooge'
 
+    @property
+    def service_environments(self):
+        return ServiceEnvironment.objects.filter(
+            service__in=self.services.all()
+        )
+
     def get_plugin_name(self):
         if self.use_universal_plugin:
             return 'pricing_service_plugin'
         return self.symbol or self.name.lower().replace(' ', '_')
 
+    def get_dependent_services(self, start, end):
+        """
+        Returns pricing services, which resources (usage types) are used by
+        this service (between start and end dates).
+        """
+        return PricingService.objects.filter(
+            serviceusagetypes__id__in=DailyUsage.objects.filter(
+                type__type='SU',
+                service_environment__in=ServiceEnvironment.objects.filter(
+                    service__in=self.services.all(),
+                ),
+                date__gte=start,
+                date__lte=end
+            ).values_list('type', flat=True).distinct()
+        ).distinct()
+
 
 class ServiceUsageTypes(db.Model):
     usage_type = db.ForeignKey(

src/ralph_scrooge/plugins/base.py

@@ -8,7 +8,7 @@
 import abc
 import re
 
-from lck.cache import memoize
+from ralph_scrooge.utils import memoize
 
 from ralph.util import plugin
 from ralph_scrooge.models import Warehouse

src/ralph_scrooge/plugins/collect/ceilometer.py

@@ -9,7 +9,7 @@
 import time
 
 from django.conf import settings
-from lck.cache import memoize
+from ralph_scrooge.utils import memoize
 from sqlalchemy import create_engine
 
 from ralph.util import plugin