[migrations] Fix monitoring migrations after #162

nepython · nepython · commit a2f88d9d9b3f · 2020-07-24T23:55:17.000+05:30
diff --git a/openwisp_monitoring/monitoring/migrations/0016_metric_configuration.py b/openwisp_monitoring/monitoring/migrations/0016_metric_configuration.py
@@ -7,7 +7,7 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('monitoring', '0012_rename_graph_chart'),
+        ('monitoring', '0015_delete_models'),
     ]
 
     operations = [
diff --git a/openwisp_monitoring/monitoring/migrations/0017_merge_traffic_metrics_and_fill_metric_config.py b/openwisp_monitoring/monitoring/migrations/0017_merge_traffic_metrics_and_fill_metric_config.py
@@ -51,7 +51,7 @@ def fill_configuration(apps, schema_editor):
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('monitoring', '0013_metric_configuration'),
+        ('monitoring', '0016_metric_configuration'),
     ]
 
     operations = [
diff --git a/tests/openwisp2/sample_monitoring/migrations/0001_initial.py b/tests/openwisp2/sample_monitoring/migrations/0001_initial.py
@@ -9,6 +9,7 @@
 import swapper
 
 from openwisp_monitoring.monitoring.charts import CHART_CONFIGURATION_CHOICES
+from openwisp_monitoring.monitoring.metrics import get_metric_configuration_choices
 
 
 class Migration(migrations.Migration):
@@ -49,7 +50,14 @@ class Migration(migrations.Migration):
                     ),
                 ),
                 ('name', models.CharField(max_length=64)),
-                ('description', models.TextField(blank=True)),
+                (
+                    'configuration',
+                    models.CharField(
+                        choices=get_metric_configuration_choices(),
+                        max_length=16,
+                        null=True,
+                    ),
+                ),
                 (
                     'key',
                     models.SlugField(
diff --git a/tests/openwisp2/sample_monitoring/migrations/0006_metric_configuration.py b/tests/openwisp2/sample_monitoring/migrations/0006_metric_configuration.py

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`class Migration(migrations.Migration):`
`8`	`8`
`9`	`9`	`dependencies = [`
`10`		`- ('monitoring', '0012_rename_graph_chart'),`
	`10`	`+ ('monitoring', '0015_delete_models'),`
`11`	`11`	`]`
`12`	`12`
`13`	`13`	`operations = [`
Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ def fill_configuration(apps, schema_editor):`
`51`	`51`	`class Migration(migrations.Migration):`
`52`	`52`
`53`	`53`	`dependencies = [`
`54`		`- ('monitoring', '0013_metric_configuration'),`
	`54`	`+ ('monitoring', '0016_metric_configuration'),`
`55`	`55`	`]`
`56`	`56`
`57`	`57`	`operations = [`