forked from ungleich-public/cdist
make type emulator load again
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
This commit is contained in:
Nico Schottelius
parent
4eec4d9627
commit
6d75016139
2 changed files with 144 additions and 108 deletions
118
bin/cdist
118
bin/cdist
|
|
@ -146,9 +146,16 @@ class Cdist:
|
||||||
env['__cdist_local_base_dir'] = self.path.temp_dir
|
env['__cdist_local_base_dir'] = self.path.temp_dir
|
||||||
|
|
||||||
# Submit information to new type emulator
|
# Submit information to new type emulator
|
||||||
|
|
||||||
|
# Required for recording source
|
||||||
env['__cdist_manifest'] = manifest
|
env['__cdist_manifest'] = manifest
|
||||||
|
|
||||||
|
# Required to find types
|
||||||
env['__cdist_type_base_dir'] = self.path.type_base_dir
|
env['__cdist_type_base_dir'] = self.path.type_base_dir
|
||||||
|
|
||||||
|
# Required for loading emulator :-)
|
||||||
|
env['__cdist_python_lib'] = cdist_lib
|
||||||
|
|
||||||
# Other environment stuff
|
# Other environment stuff
|
||||||
if extra_env:
|
if extra_env:
|
||||||
env.update(extra_env)
|
env.update(extra_env)
|
||||||
|
|
@ -306,112 +313,6 @@ def install(args):
|
||||||
"""Install remote system"""
|
"""Install remote system"""
|
||||||
process = {}
|
process = {}
|
||||||
|
|
||||||
def emulator():
|
|
||||||
"""Emulate type commands (i.e. __file and co)"""
|
|
||||||
type = os.path.basename(sys.argv[0])
|
|
||||||
type_dir = os.path.join(os.environ['__cdist_type_base_dir'], type)
|
|
||||||
param_dir = os.path.join(type_dir, "parameter")
|
|
||||||
global_dir = os.environ['__global']
|
|
||||||
object_source = os.environ['__cdist_manifest']
|
|
||||||
|
|
||||||
parser = argparse.ArgumentParser(add_help=False)
|
|
||||||
|
|
||||||
# Setup optional parameters
|
|
||||||
for parameter in file_to_list(os.path.join(param_dir, "optional")):
|
|
||||||
argument = "--" + parameter
|
|
||||||
parser.add_argument(argument, action='store', required=False)
|
|
||||||
|
|
||||||
# Setup required parameters
|
|
||||||
for parameter in file_to_list(os.path.join(param_dir, "required")):
|
|
||||||
argument = "--" + parameter
|
|
||||||
parser.add_argument(argument, action='store', required=True)
|
|
||||||
|
|
||||||
# Setup positional parameter, if not singleton
|
|
||||||
|
|
||||||
if not os.path.isfile(os.path.join(type_dir, "singleton")):
|
|
||||||
parser.add_argument("object_id", nargs=1)
|
|
||||||
|
|
||||||
# And finally verify parameter
|
|
||||||
args = parser.parse_args(sys.argv[1:])
|
|
||||||
|
|
||||||
# Setup object_id
|
|
||||||
if os.path.isfile(os.path.join(type_dir, "singleton")):
|
|
||||||
object_id = "singleton"
|
|
||||||
else:
|
|
||||||
object_id = args.object_id[0]
|
|
||||||
del args.object_id
|
|
||||||
|
|
||||||
# FIXME: / hardcoded - better portable solution available?
|
|
||||||
if object_id[0] == '/':
|
|
||||||
object_id = object_id[1:]
|
|
||||||
|
|
||||||
# FIXME: verify object id
|
|
||||||
log.debug(args)
|
|
||||||
|
|
||||||
object_dir = os.path.join(global_dir, "object", type,
|
|
||||||
object_id, DOT_CDIST)
|
|
||||||
param_out_dir = os.path.join(object_dir, "parameter")
|
|
||||||
|
|
||||||
object_source_file = os.path.join(object_dir, "source")
|
|
||||||
|
|
||||||
if os.path.exists(param_out_dir):
|
|
||||||
object_exists = True
|
|
||||||
old_object_source_fd = open(object_source_file, "r")
|
|
||||||
old_object_source = old_object_source_fd.readlines()
|
|
||||||
old_object_source_fd.close()
|
|
||||||
|
|
||||||
else:
|
|
||||||
object_exists = False
|
|
||||||
try:
|
|
||||||
os.makedirs(param_out_dir, exist_ok=True)
|
|
||||||
except OSError as error:
|
|
||||||
raise CdistError(param_out_dir + ": " + error.args[1])
|
|
||||||
|
|
||||||
# Record parameter
|
|
||||||
params = vars(args)
|
|
||||||
for param in params:
|
|
||||||
value = getattr(args, param)
|
|
||||||
if value:
|
|
||||||
file = os.path.join(param_out_dir, param)
|
|
||||||
log.debug(file + "<-" + param + " = " + value)
|
|
||||||
|
|
||||||
# Already exists, verify all parameter are the same
|
|
||||||
if object_exists:
|
|
||||||
if not os.path.isfile(file):
|
|
||||||
print("New parameter + " + param + "specified, aborting")
|
|
||||||
print("Source = " + old_object_source + "new =" + object_source)
|
|
||||||
sys.exit(1)
|
|
||||||
else:
|
|
||||||
param_fd = open(file, "r")
|
|
||||||
param_old = param_fd.readlines()
|
|
||||||
param_fd.close()
|
|
||||||
|
|
||||||
if(param_old != param):
|
|
||||||
print("Parameter " + param + " differs: " + " ".join(param_old) + " vs. " + param)
|
|
||||||
print("Sources: " + " ".join(old_object_source) + " and " + object_source)
|
|
||||||
sys.exit(1)
|
|
||||||
else:
|
|
||||||
param_fd = open(file, "w")
|
|
||||||
param_fd.writelines(value)
|
|
||||||
param_fd.close()
|
|
||||||
|
|
||||||
# Record requirements
|
|
||||||
if "__require" in os.environ:
|
|
||||||
requirements = os.environ['__require']
|
|
||||||
print(object_id + ":Writing requirements: " + requirements)
|
|
||||||
require_fd = open(os.path.join(object_dir, "require"), "a")
|
|
||||||
require_fd.writelines(requirements.split(" "))
|
|
||||||
require_fd.close()
|
|
||||||
|
|
||||||
# Record / Append source
|
|
||||||
source_fd = open(os.path.join(object_dir, "source"), "a")
|
|
||||||
source_fd.writelines(object_source)
|
|
||||||
source_fd.close()
|
|
||||||
|
|
||||||
# sys.exit(1)
|
|
||||||
print("Finished " + type + "/" + object_id + repr(params))
|
|
||||||
|
|
||||||
|
|
||||||
def commandline():
|
def commandline():
|
||||||
"""Parse command line"""
|
"""Parse command line"""
|
||||||
# Construct parser others can reuse
|
# Construct parser others can reuse
|
||||||
|
|
@ -479,7 +380,10 @@ if __name__ == "__main__":
|
||||||
logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
|
logging.basicConfig(level=logging.INFO, format='%(levelname)s: %(message)s')
|
||||||
|
|
||||||
if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])):
|
if re.match(TYPE_PREFIX, os.path.basename(sys.argv[0])):
|
||||||
emulator()
|
cdist_lib = os.environ["__cdist_python_lib"]
|
||||||
|
sys.path.insert(0, cdist_lib)
|
||||||
|
import cdist.emulator
|
||||||
|
cdist.emulator.emulator(sys.argv)
|
||||||
else:
|
else:
|
||||||
cdist_lib = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
cdist_lib = os.path.abspath(os.path.join(os.path.dirname(__file__),
|
||||||
'../lib'))
|
'../lib'))
|
||||||
|
|
|
||||||
132
lib/cdist/emulator.py
Executable file
132
lib/cdist/emulator.py
Executable file
|
|
@ -0,0 +1,132 @@
|
||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
#
|
||||||
|
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
|
||||||
|
#
|
||||||
|
# This file is part of cdist.
|
||||||
|
#
|
||||||
|
# cdist is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 3 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
#
|
||||||
|
# cdist is distributed in the hope that it will be useful,
|
||||||
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
# GNU General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU General Public License
|
||||||
|
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
import argparse
|
||||||
|
import logging
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
def emulator(argv):
|
||||||
|
"""Emulate type commands (i.e. __file and co)"""
|
||||||
|
type = os.path.basename(argv[0])
|
||||||
|
type_dir = os.path.join(os.environ['__cdist_type_base_dir'], type)
|
||||||
|
param_dir = os.path.join(type_dir, "parameter")
|
||||||
|
global_dir = os.environ['__global']
|
||||||
|
object_source = os.environ['__cdist_manifest']
|
||||||
|
|
||||||
|
parser = argparse.ArgumentParser(add_help=False)
|
||||||
|
|
||||||
|
# Setup optional parameters
|
||||||
|
for parameter in file_to_list(os.path.join(param_dir, "optional")):
|
||||||
|
argument = "--" + parameter
|
||||||
|
parser.add_argument(argument, action='store', required=False)
|
||||||
|
|
||||||
|
# Setup required parameters
|
||||||
|
for parameter in file_to_list(os.path.join(param_dir, "required")):
|
||||||
|
argument = "--" + parameter
|
||||||
|
parser.add_argument(argument, action='store', required=True)
|
||||||
|
|
||||||
|
# Setup positional parameter, if not singleton
|
||||||
|
|
||||||
|
if not os.path.isfile(os.path.join(type_dir, "singleton")):
|
||||||
|
parser.add_argument("object_id", nargs=1)
|
||||||
|
|
||||||
|
# And finally verify parameter
|
||||||
|
args = parser.parse_args(argv[1:])
|
||||||
|
|
||||||
|
# Setup object_id
|
||||||
|
if os.path.isfile(os.path.join(type_dir, "singleton")):
|
||||||
|
object_id = "singleton"
|
||||||
|
else:
|
||||||
|
object_id = args.object_id[0]
|
||||||
|
del args.object_id
|
||||||
|
|
||||||
|
# FIXME: / hardcoded - better portable solution available?
|
||||||
|
if object_id[0] == '/':
|
||||||
|
object_id = object_id[1:]
|
||||||
|
|
||||||
|
# FIXME: verify object id
|
||||||
|
log.debug(args)
|
||||||
|
|
||||||
|
object_dir = os.path.join(global_dir, "object", type,
|
||||||
|
object_id, DOT_CDIST)
|
||||||
|
param_out_dir = os.path.join(object_dir, "parameter")
|
||||||
|
|
||||||
|
object_source_file = os.path.join(object_dir, "source")
|
||||||
|
|
||||||
|
if os.path.exists(param_out_dir):
|
||||||
|
object_exists = True
|
||||||
|
old_object_source_fd = open(object_source_file, "r")
|
||||||
|
old_object_source = old_object_source_fd.readlines()
|
||||||
|
old_object_source_fd.close()
|
||||||
|
|
||||||
|
else:
|
||||||
|
object_exists = False
|
||||||
|
try:
|
||||||
|
os.makedirs(param_out_dir, exist_ok=True)
|
||||||
|
except OSError as error:
|
||||||
|
raise CdistError(param_out_dir + ": " + error.args[1])
|
||||||
|
|
||||||
|
# Record parameter
|
||||||
|
params = vars(args)
|
||||||
|
for param in params:
|
||||||
|
value = getattr(args, param)
|
||||||
|
if value:
|
||||||
|
file = os.path.join(param_out_dir, param)
|
||||||
|
log.debug(file + "<-" + param + " = " + value)
|
||||||
|
|
||||||
|
# Already exists, verify all parameter are the same
|
||||||
|
if object_exists:
|
||||||
|
if not os.path.isfile(file):
|
||||||
|
print("New parameter + " + param + "specified, aborting")
|
||||||
|
print("Source = " + old_object_source + "new =" + object_source)
|
||||||
|
sys.exit(1)
|
||||||
|
else:
|
||||||
|
param_fd = open(file, "r")
|
||||||
|
param_old = param_fd.readlines()
|
||||||
|
param_fd.close()
|
||||||
|
|
||||||
|
if(param_old != param):
|
||||||
|
print("Parameter " + param + " differs: " + " ".join(param_old) + " vs. " + param)
|
||||||
|
print("Sources: " + " ".join(old_object_source) + " and " + object_source)
|
||||||
|
sys.exit(1)
|
||||||
|
else:
|
||||||
|
param_fd = open(file, "w")
|
||||||
|
param_fd.writelines(value)
|
||||||
|
param_fd.close()
|
||||||
|
|
||||||
|
# Record requirements
|
||||||
|
if "__require" in os.environ:
|
||||||
|
requirements = os.environ['__require']
|
||||||
|
print(object_id + ":Writing requirements: " + requirements)
|
||||||
|
require_fd = open(os.path.join(object_dir, "require"), "a")
|
||||||
|
require_fd.writelines(requirements.split(" "))
|
||||||
|
require_fd.close()
|
||||||
|
|
||||||
|
# Record / Append source
|
||||||
|
source_fd = open(os.path.join(object_dir, "source"), "a")
|
||||||
|
source_fd.writelines(object_source)
|
||||||
|
source_fd.close()
|
||||||
|
|
||||||
|
# sys.exit(1)
|
||||||
|
print("Finished " + type + "/" + object_id + repr(params))
|
||||||
Loading…
Reference in a new issue