Make recurring period a database model

- For easier handling (foreignkeys, many2many)
- For higher flexibility (users can define their own periods)

uncloud_vm/models.py

@@ -71,12 +71,12 @@ class VMProduct(models.Model):
         return "Virtual machine '{}': {} core(s), {}GB memory".format(
                 self.name, self.cores, self.ram_in_gb)
 
-    @staticmethod
-    def allowed_recurring_periods():
-        return list(filter(
-            lambda pair: pair[0] in [RecurringPeriod.PER_365D,
-                RecurringPeriod.PER_30D, RecurringPeriod.PER_HOUR],
-            RecurringPeriod.choices))
+    # @staticmethod
+    # def allowed_recurring_periods():
+    #     return list(filter(
+    #         lambda pair: pair[0] in [RecurringPeriod.PER_365D,
+    #             RecurringPeriod.PER_30D, RecurringPeriod.PER_HOUR],
+    #         RecurringPeriod.choices))
 
 
     def __str__(self):

uncloud_vm/serializers.py

@@ -101,8 +101,8 @@ class VMProductSerializer(serializers.ModelSerializer):
         read_only_fields = ['order', 'owner', 'status']
 
 class OrderVMProductSerializer(VMProductSerializer):
-    recurring_period = serializers.ChoiceField(
-            choices=VMWithOSProduct.allowed_recurring_periods())
+    # recurring_period = serializers.ChoiceField(
+    #         choices=VMWithOSProduct.allowed_recurring_periods())
 
     def __init__(self, *args, **kwargs):
         super(VMProductSerializer, self).__init__(*args, **kwargs)
@@ -133,8 +133,8 @@ class DCLVMProductSerializer(serializers.HyperlinkedModelSerializer):
     """
 
     # Custom field used at creation (= ordering) only.
-    recurring_period = serializers.ChoiceField(
-        choices=VMProduct.allowed_recurring_periods())
+    # recurring_period = serializers.ChoiceField(
+    #     choices=VMProduct.allowed_recurring_periods())
 
     os_disk_uuid = serializers.UUIDField()
     # os_disk_size =