Commit graph

412 commits

Author SHA1 Message Date
Nico Schottelius
845a863e01 Merge remote-tracking branch 'steven/master' 2011-10-13 11:25:43 +02:00
Nico Schottelius
143939a6f7 do not change current env
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-13 11:09:57 +02:00
Nico Schottelius
c305735ed5 begin cleanup/reordering in config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-13 11:08:23 +02:00
Steven Armstrong
841b54c6d0 +devnotes, +FIXME
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-13 11:06:03 +02:00
Steven Armstrong
c15673aef7 +docstring
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-13 11:05:39 +02:00
Steven Armstrong
63eee391e0 implement Explorer analog to Manifest + tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-13 01:25:31 +02:00
Steven Armstrong
0b1d7d01e0 Merge remote-tracking branch 'telmich/master' 2011-10-13 01:19:25 +02:00
Nico Schottelius
62383eed8d ++stuff
Signed-off-by: Nico Schottelius <nico@loch.schottelius.org>
2011-10-13 03:00:57 +02:00
Nico Schottelius
722f857b68 Merge remote-tracking branch 'steven/master' 2011-10-13 01:00:10 +02:00
Steven Armstrong
a8ec91c804 -e /type_base_path/type_path/ -e /object_base_path/object_path/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-13 00:35:14 +02:00
Steven Armstrong
48eb996a2e remove useless filename prefix
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-13 00:26:11 +02:00
Steven Armstrong
5d2827f66e tests for Remote paths
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-13 00:24:52 +02:00
Steven Armstrong
67de9d8c73 tests for Local paths
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-13 00:20:55 +02:00
Steven Armstrong
8545221787 consistent naming: /object_base_path/object_path/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-13 00:16:30 +02:00
Steven Armstrong
1d85d10f4f consistent naming: /type_base_path/type_path/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-13 00:16:02 +02:00
Nico Schottelius
6d87f4b917 integrate global explorer into core
Signed-off-by: Nico Schottelius <nico@loch.schottelius.org>
2011-10-12 23:59:20 +02:00
Nico Schottelius
50a07da967 global explorer belongs to core
Signed-off-by: Nico Schottelius <nico@loch.schottelius.org>
2011-10-12 23:55:02 +02:00
Steven Armstrong
d47039e91e prepend variables to remote commands
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 23:49:42 +02:00
Nico Schottelius
8d591b45e2 add type to test whether object parameter can be read
Signed-off-by: Nico Schottelius <nico@loch.schottelius.org>
2011-10-12 23:49:17 +02:00
Nico Schottelius
d9af865523 fixture type with one explorer
Signed-off-by: Nico Schottelius <nico@loch.schottelius.org>
2011-10-12 23:12:56 +02:00
Nico Schottelius
f2278c42ab init tests for type_explorer
Signed-off-by: Nico Schottelius <nico@loch.schottelius.org>
2011-10-12 23:10:18 +02:00
Nico Schottelius
4ad2e4f742 ++more to fix
Signed-off-by: Nico Schottelius <nico@loch.schottelius.org>
2011-10-12 23:10:05 +02:00
Steven Armstrong
0a1418f4d3 forward env
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 23:01:41 +02:00
Nico Schottelius
7b5864dfce Merge remote-tracking branch 'steven/master' 2011-10-12 22:44:16 +02:00
Nico Schottelius
d5e24492be begin to prepare TypeExplorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 20:30:38 +02:00
Nico Schottelius
478ee1a096 -senseless comments
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 20:30:08 +02:00
Nico Schottelius
09209e47d6 ideas for explorer run
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 20:29:53 +02:00
Steven Armstrong
fb80a95555 --debug
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:58:09 +02:00
Steven Armstrong
1c38fb492e fixtures for type manifest environment test
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:57:06 +02:00
Steven Armstrong
9a33bd3b90 test type manifest environment
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:56:45 +02:00
Nico Schottelius
1aa2c48baf new style classes
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 17:36:00 +02:00
Nico Schottelius
d93d132c05 finish global_explorer (in theory)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 17:27:21 +02:00
Steven Armstrong
5df8479c5a implement Manifest and tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:20:47 +02:00
Steven Armstrong
a254e1f31e return output of command execution as string instead of bytestring
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 17:12:22 +02:00
Nico Schottelius
b8cbf22086 add global and type explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 17:00:00 +02:00
Nico Schottelius
e8f7fe3faa intermediate commit for cdist state
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-12 16:59:02 +02:00
Steven Armstrong
78fd611bb0 fix cdist_base_path
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 16:56:16 +02:00
Steven Armstrong
d2878e931e /Remote/Local/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 16:50:21 +02:00
Steven Armstrong
5f358a5ef1 move link_emulator to local
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 16:46:54 +02:00
Steven Armstrong
117ccf94d3 --debug
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 16:13:22 +02:00
Steven Armstrong
424c060934 +FIXME
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 15:21:25 +02:00
Steven Armstrong
985ed2669a local code execution and tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 15:17:06 +02:00
Steven Armstrong
84e044407e +FIXME
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 15:16:33 +02:00
Steven Armstrong
7da3a3c305 remote code execution and tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-12 14:30:10 +02:00
Steven Armstrong
d85118c4c1 Merge remote-tracking branch 'telmich/master' 2011-10-12 08:19:07 +02:00
Nico Schottelius
9f49f99294 use self.log for correct logger
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 17:09:47 +02:00
Nico Schottelius
b7824c3ead move explorer out dir creation into Explorer class
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 17:05:35 +02:00
Nico Schottelius
d95d195b40 have object seave its explorer outputs
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:59:43 +02:00
Nico Schottelius
f0852209f0 save debug in context
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:59:22 +02:00
Steven Armstrong
823197cfb5 Merge remote-tracking branch 'telmich/master' 2011-10-11 16:57:10 +02:00
Steven Armstrong
dc9092dbef --os.environ
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:56:59 +02:00
Nico Schottelius
794a11d866 %s/\(self.\)\([a-z]*_path\)/\1context.\2/g
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:56:05 +02:00
Nico Schottelius
588731661e use context in explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:49:50 +02:00
Nico Schottelius
ba43212681 Merge branch 'master' of git://github.com/asteven/cdist 2011-10-11 16:46:01 +02:00
Nico Schottelius
73f1190d55 cleanup context internally
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:45:45 +02:00
Nico Schottelius
dbd31252a8 remove CODE_HEADER
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:45:36 +02:00
Steven Armstrong
8543f3ed58 rename to match others
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:41:44 +02:00
Steven Armstrong
1c73fb1288 -- unused imports
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:41:01 +02:00
Steven Armstrong
b3c0a5912f Merge remote-tracking branch 'telmich/master' 2011-10-11 16:32:11 +02:00
Steven Armstrong
8ef0c18da0 update test suite to match new code
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:31:43 +02:00
Steven Armstrong
a692e551c0 use new logger
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:31:05 +02:00
Nico Schottelius
d690fb30cb add base path and exec path to test main
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:26:33 +02:00
Nico Schottelius
dc21405583 use target host as key for logger
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:26:01 +02:00
Nico Schottelius
b8a3cf2f49 remove manifest code from config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:25:48 +02:00
Nico Schottelius
c28fd5bbfd add template for manifest for sar / steven to have fun
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:22:44 +02:00
Nico Schottelius
4c29d9839b configure logger based on hostname
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:19:27 +02:00
Steven Armstrong
6cbcd1132e Merge remote-tracking branch 'telmich/master' 2011-10-11 16:06:34 +02:00
Steven Armstrong
e437cd90d6 rewrite exec
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 16:06:21 +02:00
Nico Schottelius
d4f6328eef finish context
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:05:32 +02:00
Nico Schottelius
0397e77a3e cleanup context
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 16:04:09 +02:00
Nico Schottelius
5bd23d0605 template for context (REDO)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 15:59:26 +02:00
Steven Armstrong
4e00e2573e Merge remote-tracking branch 'telmich/master' 2011-10-11 15:54:42 +02:00
Nico Schottelius
8a327b6bc7 cleanup explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 15:50:50 +02:00
Nico Schottelius
d9d9e6bff6 move back transfer stuff to exec
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 15:47:32 +02:00
Steven Armstrong
d03f23129b test and fixtures for Object explorers
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 15:45:10 +02:00
Steven Armstrong
2c6c9bcab5 Object handles its explorers itself
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 15:44:31 +02:00
Nico Schottelius
5393471841 add template for new explorer type
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 15:25:29 +02:00
Steven Armstrong
45ff8f727f tests for Object source as list
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 14:22:29 +02:00
Steven Armstrong
d7adff4e21 silently ignore error when deleting nonexistent file
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 14:21:47 +02:00
Steven Armstrong
19ad2fe4a9 Merge remote-tracking branch 'telmich/master' 2011-10-11 14:10:04 +02:00
Steven Armstrong
442ffb75fa nuke legacy files
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 14:09:47 +02:00
Nico Schottelius
cfb74897c4 write down (almost?) all tests for config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 13:47:41 +02:00
Nico Schottelius
2c5b064b00 ++todo = remove CODE_HEADER in generated code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 13:06:29 +02:00
Nico Schottelius
5443db97c4 always setup __debug if debug is set
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 12:54:55 +02:00
Steven Armstrong
405ebbccb7 Merge remote-tracking branch 'telmich/master'
Conflicts:
	lib/cdist/emulator.py
2011-10-11 12:40:44 +02:00
Steven Armstrong
bcde8683af rewrite emulator to use Type and Object classes
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 12:27:08 +02:00
Nico Schottelius
e72ad1f7cb emulator not needed in config_install anymore
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 12:19:13 +02:00
Steven Armstrong
753936b7c3 make object.source a list
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 10:30:30 +02:00
Steven Armstrong
904396f6a5 new method to create object on the file system
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 10:29:06 +02:00
Steven Armstrong
5a082058e5 new method which checks if object exists on the file system
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 10:28:41 +02:00
Steven Armstrong
96c059983a - legacy code, + docstrings
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 10:28:10 +02:00
Steven Armstrong
af83c7af8e tests for Object source
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 09:38:31 +02:00
Steven Armstrong
005009ab5d finish FileStringProperty
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 09:38:03 +02:00
Steven Armstrong
a1e1c8d665 +docstring
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-11 09:02:01 +02:00
Nico Schottelius
72a2543470 introduce install support in emulator
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 00:42:03 +02:00
Nico Schottelius
94cca2e537 prepend hostname in emulator as well
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 00:28:53 +02:00
Nico Schottelius
9647933a40 Merge branch 'master' of git://github.com/asteven/cdist 2011-10-11 00:19:01 +02:00
Nico Schottelius
92d3925b1c add filter to prepend hostname in config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-11 00:18:32 +02:00
Nico Schottelius
35bfa2fcdc finish merge of context and config_install
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-10 18:50:06 +02:00
Steven Armstrong
67543146f0 add source property
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-10 17:46:25 +02:00