changes to support the biweekly update from master (#409)

* changes to support the biweekly update from master.

CA enabled switch is now in the CS yaml config file,
not in the topology anymore.
Updated test data.

* data migration supporting the biweekly update from master.

Bump the version of those hosts that run the Control Service of Core ASes.
They need to get new configuration from the Coordinator, due to a change in how the
CA type is specified.

Author: juagargi

scionlab/migrations/0006_bump_version_cs_hosts.py

@@ -0,0 +1,27 @@
+# Generated by Django 3.1.6 on 2022-01-27 14:35
+
+from django.db import migrations
+
+from scionlab.models.core import Host, Service
+
+
+def bump_version(apps, schema_editor):
+    """
+    Data migration: bump the version of those hosts that run
+    the Control Service of Core ASes.
+    They need to get new configuration from the Coordinator, due to a change in how the
+    CA type is specified.
+    """
+    Host.objects.bump_config(services__type=Service.CS, AS__is_core=True)
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('scionlab', '0005_trc_pem'),
+    ]
+
+    operations = [
+        migrations.RunPython(bump_version,        # forward
+                             lambda a, b: None),  # backward
+    ]

scionlab/models/core.py

@@ -447,11 +447,12 @@ def create(self, uid=None, secret=None, **kwargs):
             **kwargs
         )
 
-    def bump_config(self):
+    def bump_config(self, **filter_args):
         """
         Increment the config version counter, i.e. set `needs_config_deployement` to True.
+        If filter_args is not empty, only the subset of those filters will be bumped.
         """
-        self.update(config_version=F('config_version') + 1)
+        self.filter(**filter_args).update(config_version=F('config_version') + 1)
 
     def reset_needs_config_deployment(self):
         """

scionlab/scion/config.py

@@ -316,6 +316,12 @@ def build_cs_conf(self, service):
                 'address': _join_host_port(service.host.internal_ip, CS_QUIC_PORT),
             },
         })
+        if service.AS.is_core:
+            conf.update({
+                'ca': {
+                    'mode': 'in-process',
+                },
+            })
 
         return conf
 

scionlab/tests/data/test_config_tar/host_1.yml

@@ -495,6 +495,9 @@ etc/scion/cs-1.toml: |
   origination_interval = "60s"
   propagation_interval = "60s"
 
+  [ca]
+  mode = "in-process"
+
   [general]
   config_dir = "/etc/scion"
   id = "cs-1"
@@ -600,7 +603,7 @@ scionlab-config.json: |-
       "etc/scion/crypto/voting/ISD17-ASffaa_0_1101.sensitive.crt": "131ec8597fbf56d7f65c9bba48874c5cd64c157a",
       "etc/scion/crypto/voting/regular-voting.key": "48fd836d8c4f7a3cb2bec2045d03a46c2ca99337",
       "etc/scion/crypto/voting/sensitive-voting.key": "0ca15a73e4d864f32228f4687f29505ac093dbfc",
-      "etc/scion/cs-1.toml": "47ad2499da3f424ae2e5632598f002efee1119c5",
+      "etc/scion/cs-1.toml": "9aa4d5460b518ac50caac845f9e70f1b7918f589",
       "etc/scion/keys/master0.key": "9a91ea3b0c0121326d29224de5d444a31c74ef20",
       "etc/scion/keys/master1.key": "9a91ea3b0c0121326d29224de5d444a31c74ef20",
       "etc/scion/topology.json": "c1afb4da9e309ca7a1c697cb0238e41fc84ae96b"