Split partition into it's own file

Split Partition() into it's own file for clarity.  This will be
followed-on by less dependence between Partitions and Partition

Change-Id: I860f6a1787c0e4fe99f93919ac37cf7d80bfaae9

diskimage_builder/block_device/level1/partition.py

@@ -0,0 +1,100 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import logging
+
+from diskimage_builder.block_device.tree_config import TreeConfig
+from diskimage_builder.graph.digraph import Digraph
+
+
+logger = logging.getLogger(__name__)
+
+
+class PartitionTreeConfig(object):
+
+    @staticmethod
+    def config_tree_to_digraph(config_key, config_value, pconfig, dconfig,
+                               base_name, plugin_manager):
+        logger.debug("called [%s] [%s] [%s]"
+                     % (config_key, config_value, base_name))
+        assert config_key == Partition.type_string
+
+        for partition in config_value:
+            name = partition['name']
+            nconfig = {'name': name}
+            for k, v in partition.items():
+                if k not in plugin_manager:
+                    nconfig[k] = v
+                else:
+                    plugin_manager[k].plugin \
+                                     .tree_config.config_tree_to_digraph(
+                                         k, v, dconfig, name, plugin_manager)
+            pconfig.append(nconfig)
+
+        logger.debug("finished [%s] [%s]" % (nconfig, dconfig))
+
+
+class Partition(Digraph.Node):
+
+    type_string = "partitions"
+    tree_config = TreeConfig("partitions")
+
+    def __init__(self, name, flags, size, ptype, base, partitioning,
+                 prev_partition):
+        Digraph.Node.__init__(self, name)
+        self.name = name
+        self.flags = flags
+        self.size = size
+        self.ptype = ptype
+        self.base = base
+        self.partitioning = partitioning
+        self.prev_partition = prev_partition
+
+    def __repr__(self):
+        return "<Partition [%s] on [%s] size [%s] prev [%s]>" \
+            % (self.name, self.base, self.size,
+               self.prev_partition.name if self.prev_partition else "UNSET")
+
+    def get_flags(self):
+        return self.flags
+
+    def get_size(self):
+        return self.size
+
+    def get_type(self):
+        return self.ptype
+
+    def get_name(self):
+        return self.name
+
+    def insert_edges(self, dg):
+        bnode = dg.find(self.base)
+        assert bnode is not None
+        dg.create_edge(bnode, self)
+        if self.prev_partition is not None:
+            logger.debug("Insert edge [%s]" % self)
+            dg.create_edge(self.prev_partition, self)
+
+    def create(self, result, rollback):
+        self.partitioning.create(result, rollback)
+
+    def umount(self, state):
+        """Partition does not need any umount task."""
+        pass
+
+    def cleanup(self, state):
+        """Partition does not need any cleanup."""
+        pass
+
+    def delete(self, state):
+        """Partition does not need any cleanup."""
+        pass

diskimage_builder/block_device/level1/partitioning.py

@@ -20,7 +20,10 @@ from subprocess import CalledProcessError
 from diskimage_builder.block_device.exception import \
     BlockDeviceSetupException
 from diskimage_builder.block_device.level1.mbr import MBR
-from diskimage_builder.block_device.tree_config import TreeConfig
+from diskimage_builder.block_device.level1.partition import \
+    Partition
+from diskimage_builder.block_device.level1.partition import \
+    PartitionTreeConfig
 from diskimage_builder.block_device.utils import exec_sudo
 from diskimage_builder.block_device.utils import parse_abs_size_spec
 from diskimage_builder.block_device.utils import parse_rel_size_spec
@@ -30,87 +33,6 @@ from diskimage_builder.graph.digraph import Digraph
 logger = logging.getLogger(__name__)
 
 
-class PartitionTreeConfig(object):
-
-    @staticmethod
-    def config_tree_to_digraph(config_key, config_value, pconfig, dconfig,
-                               base_name, plugin_manager):
-        logger.debug("called [%s] [%s] [%s]"
-                     % (config_key, config_value, base_name))
-        assert config_key == Partition.type_string
-
-        for partition in config_value:
-            name = partition['name']
-            nconfig = {'name': name}
-            for k, v in partition.items():
-                if k not in plugin_manager:
-                    nconfig[k] = v
-                else:
-                    plugin_manager[k].plugin \
-                                     .tree_config.config_tree_to_digraph(
-                                         k, v, dconfig, name, plugin_manager)
-            pconfig.append(nconfig)
-
-        logger.debug("finished [%s] [%s]" % (nconfig, dconfig))
-
-
-class Partition(Digraph.Node):
-
-    type_string = "partitions"
-    tree_config = TreeConfig("partitions")
-
-    def __init__(self, name, flags, size, ptype, base, partitioning,
-                 prev_partition):
-        Digraph.Node.__init__(self, name)
-        self.name = name
-        self.flags = flags
-        self.size = size
-        self.ptype = ptype
-        self.base = base
-        self.partitioning = partitioning
-        self.prev_partition = prev_partition
-
-    def __repr__(self):
-        return "<Partition [%s] on [%s] size [%s] prev [%s]>" \
-            % (self.name, self.base, self.size,
-               self.prev_partition.name if self.prev_partition else "UNSET")
-
-    def get_flags(self):
-        return self.flags
-
-    def get_size(self):
-        return self.size
-
-    def get_type(self):
-        return self.ptype
-
-    def get_name(self):
-        return self.name
-
-    def insert_edges(self, dg):
-        bnode = dg.find(self.base)
-        assert bnode is not None
-        dg.create_edge(bnode, self)
-        if self.prev_partition is not None:
-            logger.debug("Insert edge [%s]" % self)
-            dg.create_edge(self.prev_partition, self)
-
-    def create(self, result, rollback):
-        self.partitioning.create(result, rollback)
-
-    def umount(self, state):
-        """Partitioning does not need any umount task."""
-        pass
-
-    def cleanup(self, state):
-        """Partitioning does not need any cleanup."""
-        pass
-
-    def delete(self, state):
-        """Partitioning does not need any cleanup."""
-        pass
-
-
 class PartitioningTreeConfig(object):
 
     @staticmethod