Add initial code to support clusters in morphloader

Although clusters morphologies are still loaded using
the old code, `checkout` in the new branch-and-merge
plugin tries to load and validate the morphology using
morphloader.

2 files changed, 27 insertions, 6 deletions

diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index 9b00ded5..70f46064 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -109,6 +109,10 @@ class MorphologyLoader(object):
             'name',
             'arch',
         ],
+        'cluster': [
+          'name',
+          'systems',
+        ],
     }
 
     _static_defaults = {
@@ -144,6 +148,7 @@ class MorphologyLoader(object):
             'configuration-extensions': [],
             'disk-size': '1G',
         },
+        'cluster': {},
     }
 
     def parse_morphology_text(self, text, whence):
@@ -217,8 +222,10 @@ class MorphologyLoader(object):
 
         # The rest of the validation is dependent on the kind.
 
+        # FIXME: move validation of clusters from morph2 to
+        # here, and use morphload to load the morphology
         kind = morph['kind']
-        if kind not in ('system', 'stratum', 'chunk'):
+        if kind not in ('system', 'stratum', 'chunk', 'cluster'):
             raise UnknownKindError(morph['kind'], morph.filename)
 
         required = ['kind'] + self._required_fields[kind]
@@ -230,9 +237,10 @@ class MorphologyLoader(object):
             self._validate_system(morph)
         elif kind == 'stratum':
             self._validate_stratum(morph)
-        else:
-            assert kind == 'chunk'
+        elif kind == 'chunk':
             self._validate_chunk(morph)
+        else:
+            assert kind == 'cluster'
 
     def _validate_system(self, morph):
         # All stratum names should be unique within a system.
@@ -322,9 +330,10 @@ class MorphologyLoader(object):
             self._set_system_defaults(morphology)
         elif kind == 'stratum':
             self._set_stratum_defaults(morphology)
-        else:
-            assert kind == 'chunk'
+        elif kind == 'chunk':
             self._set_chunk_defaults(morphology)
+        else:
+            assert kind == 'cluster'
 
     def _set_system_defaults(self, morph):
         pass
diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py
index 0f115eb1..a9b3b26d 100644
--- a/morphlib/morphloader_tests.py
+++ b/morphlib/morphloader_tests.py
@@ -471,4 +471,16 @@ name: foo
         self.loader.set_defaults(m)
         self.assertEqual(m['max-jobs'], 42)
 
-
+    def test_parses_simple_cluster_morph(self):
+	string = '''
+            name: foo
+            kind: cluster
+            systems:
+                - morph: bar
+        '''
+        m = self.loader.parse_morphology_text(string, 'test')
+        self.loader.set_defaults(m)
+        self.loader.validate(m)
+        self.assertEqual(m['name'], 'foo')
+        self.assertEqual(m['kind'], 'cluster')
+        self.assertEqual(m['systems'][0]['morph'], 'bar')