Dropped support for 'disk-size' from system morphology files'

15 files changed, 10 insertions, 79 deletions

diff --git a/morphlib/morph2.py b/morphlib/morph2.py
index a733ce77..ec4f2e9a 100644
--- a/morphlib/morph2.py
+++ b/morphlib/morph2.py
@@ -169,10 +169,6 @@ class Morphology(object):
             self._set_default_value(self._dict, 'max-jobs',
                                     int(self['max-jobs']))
 
-        if 'disk-size' in self:
-            self._set_default_value(self._dict, 'disk-size',
-                                    self._parse_size(self['disk-size']))
-
         for name, value in self.static_defaults[self['kind']]:
             if name not in self._dict:
                 self._set_default_value(self._dict, name, value)
@@ -207,17 +203,6 @@ class Morphology(object):
                                             'deploy',
                                             dict())
 
-    def _parse_size(self, size):
-        if isinstance(size, basestring):
-            size = size.lower()
-            if size.endswith('g'):
-                return int(size[:-1]) * 1024 ** 3
-            elif size.endswith('m'):  # pragma: no cover
-                return int(size[:-1]) * 1024 ** 2
-            elif size.endswith('k'):  # pragma: no cover
-                return int(size[:-1]) * 1024
-        return int(size) # pragma: no cover
-
     def lookup_child_by_name(self, name):
         '''Find child reference by its name.
 
@@ -284,10 +269,7 @@ class Morphology(object):
             # Simple values. Use original value unless it has been changed from
             # the default in memmory.
             if live_dict[key] == live_dict.get('_orig_' + key, None):
-                if key in original_dict:
-                    result = original_dict[key]
-                else:
-                    result = None
+                result = original_dict.get(key, None)
             else:
                 result = live_dict[key]
         return result
diff --git a/morphlib/morph2_tests.py b/morphlib/morph2_tests.py
index bf32d3c2..c11d7058 100644
--- a/morphlib/morph2_tests.py
+++ b/morphlib/morph2_tests.py
@@ -96,29 +96,16 @@ class MorphologyTests(unittest.TestCase):
         self.assertEqual(m['chunks'][0]['morph'], 'le-chunk')
         self.assertEqual(m['chunks'][0]['build-depends'], None)
 
-    def test_parses_system_disk_size(self):
-        m = Morphology('''
-            {
-                "name": "foo",
-                "kind": "system",
-                "disk-size": "1g"
-            }
-        ''')
-
-        self.assertEqual(m['disk-size'], 1024 ** 3)
-
     def test_returns_dict_keys(self):
         m = Morphology('''
             {
                 "name": "foo",
                 "kind": "system",
-                "disk-size": "1g"
             }
         ''')
 
         self.assertTrue('name' in m.keys())
         self.assertTrue('kind' in m.keys())
-        self.assertTrue('disk-size' in m.keys())
 
     def test_system_indexes_strata(self):
         m = Morphology('''
@@ -307,32 +294,10 @@ class MorphologyTests(unittest.TestCase):
 
     system_text = '''{
     "kind": "system",
-    "disk-size": "1g",
     "arch": "x86_64",
     "system-kind": "rootfs-tarball"
 }'''
 
-    def test_writing_preserves_disk_size(self):
-        text_lines = self.system_text.splitlines()
-        morphology = Morphology(self.system_text)
-
-        output = StringIO.StringIO()
-        morphology.update_text(self.system_text, output)
-        output_lines = output.getvalue().splitlines()
-        self.assertEqual(text_lines, output_lines)
-
-    def test_writing_updates_disk_size(self):
-        text_lines = self.system_text.splitlines()
-        text_lines[2] = '    "disk-size": 512,'
-
-        morphology = Morphology(self.system_text)
-        morphology._dict['disk-size'] = 512
-
-        output = StringIO.StringIO()
-        morphology.update_text(self.system_text, output)
-        output_lines = output.getvalue().splitlines()
-        self.assertEqual(text_lines, output_lines)
-
     def test_nested_dict(self):
         # Real morphologies don't trigger this code path, so we test manually
         original_dict = {
diff --git a/morphlib/morphloader.py b/morphlib/morphloader.py
index c94078f9..9b134509 100644
--- a/morphlib/morphloader.py
+++ b/morphlib/morphloader.py
@@ -146,7 +146,6 @@ class MorphologyLoader(object):
             'arch': None,
             'system-kind': 'rootfs-tarball',
             'configuration-extensions': [],
-            'disk-size': '1G',
         },
         'cluster': {},
     }
diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py
index ac0fef53..d302551e 100644
--- a/morphlib/morphloader_tests.py
+++ b/morphlib/morphloader_tests.py
@@ -474,7 +474,6 @@ name: foo
                 'arch': 'x86_64',
                 'strata': [],
                 'configuration-extensions': [],
-                'disk-size': '1G',
             })
 
     def test_unsets_defaults_for_system(self):
diff --git a/morphlib/plugins/branch_and_merge_plugin.py b/morphlib/plugins/branch_and_merge_plugin.py
index 37d5e40c..3be61297 100644
--- a/morphlib/plugins/branch_and_merge_plugin.py
+++ b/morphlib/plugins/branch_and_merge_plugin.py
@@ -360,8 +360,6 @@ class BranchAndMergePlugin(cliapp.Plugin):
             'system': [
                 'kind',
                 'description',
-                'disk-size',
-                '_disk-size',
                 'configuration-extensions',
             ],
             'stratum': [
diff --git a/scripts/setup-3rd-party-strata b/scripts/setup-3rd-party-strata
index f2ea2a4c..25ea3254 100644
--- a/scripts/setup-3rd-party-strata
+++ b/scripts/setup-3rd-party-strata
@@ -99,7 +99,6 @@ cat <<EOF > "hello-system.morph"
     "kind": "system",
     "system-kind": "rootfs-tarball",
     "arch": "x86_64",
-    "disk-size": "1G",
     "strata": [
         {
             "morph": "hello-stratum",
diff --git a/tests.as-root/archless-system-fails.script b/tests.as-root/archless-system-fails.script
index eda797f1..2fdeb018 100755
--- a/tests.as-root/archless-system-fails.script
+++ b/tests.as-root/archless-system-fails.script
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# Copyright (C) 2011, 2012  Codethink Limited
+# Copyright (C) 2011-2013  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@ cat <<EOF >archless-system.morph
 {
   "name": "archless-system",
   "kind": "system",
-  "disk-size": "1G",
   "strata": [
     {
       "morph": "hello-stratum",
diff --git a/tests.as-root/setup b/tests.as-root/setup
index eea9e061..2c5e09ca 100755
--- a/tests.as-root/setup
+++ b/tests.as-root/setup
@@ -136,7 +136,6 @@ name: hello-system
 kind: system
 system-kind: rootfs-tarball
 arch: `uname -m`
-disk-size: 1G
 strata:
     - morph: hello-stratum
       repo: test:morphs
@@ -165,7 +164,6 @@ name: linux-system
 kind: system
 system-kind: rootfs-tarball
 arch: `uname -m`
-disk-size: 1G
 strata:
     - morph: hello-stratum
       repo: test:morphs
diff --git a/tests.as-root/system-overlap.script b/tests.as-root/system-overlap.script
index 6e6ef2ac..5df9374b 100755
--- a/tests.as-root/system-overlap.script
+++ b/tests.as-root/system-overlap.script
@@ -33,7 +33,6 @@ cat <<EOF >overlap-system.morph
   "kind": "system",
   "system-kind": "rootfs-tarball",
   "arch": "$(uname -m)",
-  "disk-size": "1G",
   "strata": [
     {
       "morph": "foo-baz-stratum",
diff --git a/tests.branching.disabled/workflow-petrify.stdout b/tests.branching.disabled/workflow-petrify.stdout
index 9f0cfb0c..3531ee4b 100644
--- a/tests.branching.disabled/workflow-petrify.stdout
+++ b/tests.branching.disabled/workflow-petrify.stdout
@@ -4,7 +4,6 @@ test/petrify after petrifying:
     "kind": "system",
     "system-kind": "rootfs-tarball",
     "arch": "x86_64",
-    "disk-size": "1G",
     "strata": [
         {
             "morph": "hello-stratum",
@@ -58,7 +57,6 @@ test/petrify after editing a chunk:
     "kind": "system",
     "system-kind": "rootfs-tarball",
     "arch": "x86_64",
-    "disk-size": "1G",
     "strata": [
         {
             "morph": "hello-stratum",
@@ -111,7 +109,6 @@ test/unpetrify after unpetrifying:
     "kind": "system",
     "system-kind": "rootfs-tarball",
     "arch": "x86_64",
-    "disk-size": "1G",
     "strata": [
         {
             "morph": "hello-stratum",
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.script b/tests.branching/tag-works-with-multiple-morphs-repos.script
index 38d73852..cdb65b04 100755
--- a/tests.branching/tag-works-with-multiple-morphs-repos.script
+++ b/tests.branching/tag-works-with-multiple-morphs-repos.script
@@ -34,7 +34,6 @@ name: test-system
 kind: system
 system-kind: rootfs-tarball
 arch: $(uname -m)
-disk-size: 1G
 strata:
 - morph: stratum1
   ref: master
diff --git a/tests.branching/tag-works-with-multiple-morphs-repos.stdout b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
index 938e41ff..f570b2cd 100644
--- a/tests.branching/tag-works-with-multiple-morphs-repos.stdout
+++ b/tests.branching/tag-works-with-multiple-morphs-repos.stdout
@@ -4,7 +4,7 @@ Date:   Tue Jul 31 16:51:54 2012 +0000
 
 create tag
 
-commit 7253f9b1471f1983e07823d2b84582dde9fb108d
+commit 8378526fced8e920e486a58d047efe664831aa40
 Author: developer <developer@example.com>
 Date:   Tue Jul 31 16:51:54 2012 +0000
 
@@ -67,11 +67,11 @@ index 0000000..610fae6
 +  repo: test:hello
 +  unpetrify-ref: master
 diff --git a/test-system.morph b/test-system.morph
-index 44d5ae5..08f9adc 100644
+index 2fad584..6aa58c2 100644
 --- a/test-system.morph
 +++ b/test-system.morph
-@@ -5,8 +5,11 @@ arch: x86_64
- disk-size: 1G
+@@ -4,8 +4,11 @@ system-kind: rootfs-tarball
+ arch: x86_64
  strata:
  - morph: stratum1
 -  ref: master
@@ -85,7 +85,7 @@ index 44d5ae5..08f9adc 100644
 +  repo: test:morphs1
 +  unpetrify-ref: master
 +  unpetrify-repo: test:morphs2
-commit 7253f9b1471f1983e07823d2b84582dde9fb108d
+commit 8378526fced8e920e486a58d047efe664831aa40
 Author:     developer <developer@example.com>
 AuthorDate: Tue Jul 31 16:51:54 2012 +0000
 Commit:     developer <developer@example.com>
@@ -156,11 +156,11 @@ index 0000000..610fae6
 +  repo: test:hello
 +  unpetrify-ref: master
 diff --git a/test-system.morph b/test-system.morph
-index 44d5ae5..08f9adc 100644
+index 2fad584..6aa58c2 100644
 --- a/test-system.morph
 +++ b/test-system.morph
-@@ -5,8 +5,11 @@ arch: x86_64
- disk-size: 1G
+@@ -4,8 +4,11 @@ system-kind: rootfs-tarball
+ arch: x86_64
  strata:
  - morph: stratum1
 -  ref: master
diff --git a/tests.build/setup b/tests.build/setup
index 499dbb21..52516804 100755
--- a/tests.build/setup
+++ b/tests.build/setup
@@ -109,7 +109,6 @@ cat <<EOF > hello-system.morph
     "kind": "system",
     "arch": "$(uname -m)",
     "system-kind": "rootfs-tarball",
-    "disk-size": "1G",
     "strata": [
         {
             "morph": "hello-stratum",
diff --git a/tests.merging/setup b/tests.merging/setup
index 11fdf0f1..5be4993a 100755
--- a/tests.merging/setup
+++ b/tests.merging/setup
@@ -53,7 +53,6 @@ cat <<EOF > "$DATADIR/morphs/hello-system.morph"
     "kind": "system",
     "system-kind": "rootfs-tarball",
     "arch": "$(uname -m)",
-    "disk-size": "1G",
     "strata": [
         {
             "morph": "hello-stratum",
diff --git a/tests/setup b/tests/setup
index 91a30236..62f8071d 100755
--- a/tests/setup
+++ b/tests/setup
@@ -108,7 +108,6 @@ cat <<EOF > hello-system.morph
     "name": "hello-system",
     "kind": "system",
     "system-kind": "rootfs-tarball",
-    "disk-size": "1G",
     "strata": [
         {
             "morph": "hello-stratum",