b85de3cd9e
A couple of things going on, but I think it makes sense to do them atomically. The NodeBase.create() argument "results" is the global state dictionary that will be saved to "state.json", and re-loaded in later phases and passed to them as the argument "state". So for consistency, call this argument "state" (this fits with the change out to start building the state dictionary earlier in the PluginBase.__init__() calls). Since the "state" is a pretty important part of how everything works, move it into a separate object. This is treated as essentially a singleton. It bundles it nicely together for some added documentation [1]. We move instantiation of this object out of the generic BlockDevice.__init__() call and into the actual cmd_* drivers. This is because there's two distinct instantiation operations -- creating a new state (during cmd_create) and loading an existing state (other cmd_*). This is also safer -- since we know the cmd_* arguments are looking for an existing state.json, we will fail if it somehow goes missing. To more fully unit test this, some testing plugins and new entry-points are added. These add known state values which we check for. These should be a good basis for further tests. [1] as noted, we could probably do some fun things in the future like make this implement a dictionary and have some saftey features like r/o keys. Change-Id: I90eb711b3e9b1ce139eb34bdf3cde641fd06828f
59 lines
1.8 KiB
Python
59 lines
1.8 KiB
Python
# Copyright 2017 Andreas Florath (andreas@florath.net)
|
|
#
|
|
# 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.plugin import NodeBase
|
|
from diskimage_builder.block_device.plugin import PluginBase
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
class FstabNode(NodeBase):
|
|
def __init__(self, config, params):
|
|
super(FstabNode, self).__init__(config['name'])
|
|
self.base = config['base']
|
|
self.options = config.get('options', 'defaults')
|
|
self.dump_freq = config.get('dump-freq', 0)
|
|
self.fsck_passno = config.get('fsck-passno', 2)
|
|
|
|
def get_edges(self):
|
|
edge_from = [self.base]
|
|
edge_to = []
|
|
return (edge_from, edge_to)
|
|
|
|
def create(self, state, rollback):
|
|
logger.debug("fstab create called [%s]", self.name)
|
|
|
|
if 'fstab' not in state:
|
|
state['fstab'] = {}
|
|
|
|
state['fstab'][self.base] = {
|
|
'name': self.name,
|
|
'base': self.base,
|
|
'options': self.options,
|
|
'dump-freq': self.dump_freq,
|
|
'fsck-passno': self.fsck_passno
|
|
}
|
|
|
|
|
|
class Fstab(PluginBase):
|
|
def __init__(self, config, defaults):
|
|
super(Fstab, self).__init__()
|
|
|
|
self.node = FstabNode(config, defaults)
|
|
|
|
def get_nodes(self):
|
|
return [self.node]
|