Commit graph

635 commits

Author SHA1 Message Date
Steven Armstrong
b92ea62f72 export OBJECT_MARKER for use in tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-09 20:36:40 +01:00
Steven Armstrong
e1cf8d094b --AttributeError
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-09 20:29:36 +01:00
Steven Armstrong
ae23f1576f --TypeError
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-09 20:28:51 +01:00
Steven Armstrong
f95ee8062f --SyntaxError
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-09 20:28:04 +01:00
Nico Schottelius
c7d0d581b1 we pass base_path, not object_path (clearification)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-11-09 18:41:46 +01:00
Nico Schottelius
b3337a18b9 in theory catch error when requiring an undefined object (in practise not)
Error message trying to fix:

ERROR: [Errno 2] No such file or directory: '/home/users/nico/.tmp/tmptvy1ic/out/object/__localch_yum_repos/singleton/.cdist/state'

Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-11-09 18:30:12 +01:00
Nico Schottelius
e18bd97c86 SUCESSFUL is very helpful to grep for :-)
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-11-08 08:28:04 +01:00
Steven Armstrong
d0123acc2a implement singleton as requirement
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-03 15:44:51 +01:00
Steven Armstrong
efedfbf47c test for singleton requirement
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-03 15:44:12 +01:00
Steven Armstrong
c58ec7e4ef prevent circular dependencies
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-03 00:25:06 +01:00
Steven Armstrong
7d0238682b implement autorequire in emulator
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-02 23:58:18 +01:00
Steven Armstrong
0d05e61b85 tests and fixtures for emulator autorequire
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-02 23:57:13 +01:00
Steven Armstrong
e36e538f81 sort lists before testing for equality
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-02 09:15:44 +01:00
Steven Armstrong
792ddf0a5b add utility method to join object name from type and object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-02 09:13:23 +01:00
Steven Armstrong
afba5e9280 add utilitly method to split an object name into its type name and object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-02 07:52:08 +01:00
Steven Armstrong
70ee0f1681 implement __lt__ to support sorting a list of objects
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-01 22:46:46 +01:00
Steven Armstrong
bf1b995908 implement __lt__ and __eq__ to support sorting a list of types
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-11-01 22:20:46 +01:00
Nico Schottelius
80cd35fc3d Merge remote-tracking branch 'steven/run-explorers-in-cdist.core.explorer' 2011-10-21 20:19:41 +02:00
Steven Armstrong
18f08d893c export defaults for __remote_{exec,copy}
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-21 15:59:39 +02:00
Steven Armstrong
c29c419f61 also export __target_host to check_call
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-21 15:50:19 +02:00
Steven Armstrong
6ec4cefe09 Merge remote-tracking branch 'telmich/master' 2011-10-21 15:39:17 +02:00
Steven Armstrong
d4e715f052 close file handles opened with tempfile.mkstemp
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-21 15:26:27 +02:00
Steven Armstrong
17e7642615 implement: export __target_host in remote exec
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-21 15:17:19 +02:00
Steven Armstrong
16b118b38e add test for: __target_host exported to remote exec run
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-21 15:16:38 +02:00
Steven Armstrong
8e2b9e4337 add test for: __target_host exported to remote exec
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-21 15:10:41 +02:00
Steven Armstrong
1e354387f9 add missing import
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-21 14:48:47 +02:00
Steven Armstrong
81e4c0a418 move run_*_explorers from config_install to core.explorer
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-20 11:10:30 +02:00
Steven Armstrong
9588c5189c Merge branch 'master' into run-explorers-in-cdist.core.explorer 2011-10-20 11:08:23 +02:00
Steven Armstrong
6223402b9e bugfix: only attempt to transfer object parameters it their are any
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-20 11:07:48 +02:00
Steven Armstrong
60c4e21981 implement Explorer run_global_explorers and run_type_explorers
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-20 11:05:50 +02:00
Steven Armstrong
40971208f2 add test for Explorer run_type_explorers
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-20 11:04:41 +02:00
Steven Armstrong
6f82aef704 add test for Explorer run_global_explorers
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-20 10:55:11 +02:00
Steven Armstrong
97ab6effa4 introduce new cdist.test.CdistTestCase base class which handles common tasks
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 17:59:21 +02:00
Nico Schottelius
c189bd9daf resort output in object_run
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-10-19 16:47:52 +02:00
Steven Armstrong
ca1ef28fe1 change order of log.info
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 16:42:14 +02:00
Steven Armstrong
e9541b2a2a == is not = :-/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 16:29:30 +02:00
Steven Armstrong
de8a09b45d ++FIXME
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 16:16:52 +02:00
Steven Armstrong
9156d2f5ac trust in telmich we do (or should)
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 16:15:52 +02:00
Steven Armstrong
c45c9cd702 dont re-run already fulfilled requirements
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 16:07:13 +02:00
Steven Armstrong
24bf7369d9 ++info
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 15:54:26 +02:00
Steven Armstrong
50eead577c +missing import
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 15:49:32 +02:00
Steven Armstrong
8cfc16cd76 finish migration to cdist_object.state
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 15:48:22 +02:00
Steven Armstrong
6734ff693f fix object_prepare to use object.state
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 15:39:38 +02:00
Nico Schottelius
e98272e0c5 move log.info down
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-10-19 15:34:24 +02:00
Nico Schottelius
0e7c532870 add new state code, begin to detect circular dependencies
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-10-19 15:32:06 +02:00
Steven Armstrong
d6cf85e6f6 implement /__object_fq/__object_name/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 15:17:45 +02:00
Steven Armstrong
b56925d24a /__object_fq/__object_name/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 15:15:05 +02:00
Steven Armstrong
8f306a7484 /__debug/__cdist_debug/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 15:04:14 +02:00
Steven Armstrong
dc3ed07153 /__debug/__cdist_debug/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 15:03:47 +02:00
Steven Armstrong
eb5b80d132 remove legacy tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 15:02:17 +02:00
Steven Armstrong
1fb96c0fc2 update test for upcomming change: /__debug/__cdist_debug/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 14:58:25 +02:00
Steven Armstrong
ef5eb34274 update test for upcomming change: /__debug/__cdist_debug/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 14:57:32 +02:00
Steven Armstrong
f732220e77 remove legacy tests
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 14:54:38 +02:00
Steven Armstrong
ff2192f6de remove legacy attributes: ran, prepared
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 14:54:15 +02:00
Steven Armstrong
022b17d700 implement Object state
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 14:53:31 +02:00
Steven Armstrong
4f398a834f /ran/done/
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 14:53:06 +02:00
Steven Armstrong
02de396905 tests for Object state
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-19 14:50:16 +02:00
Nico Schottelius
4d4287c580 Merge remote-tracking branch 'steven/master' 2011-10-18 15:14:44 +02:00
Steven Armstrong
04af96b5e3 Merge remote-tracking branch 'telmich/master' 2011-10-18 15:09:50 +02:00
Steven Armstrong
d427e3f585 __self should not contain .cdist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
205cd7b28a fix the test
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
2246b7496b fails if requirement has illegal object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
2a5465c03c test that emulator fails if requirement has illegal object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
030d5919e6 raise exception if object_id contains .cdist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
af367a76f8 test for: .cdist may not be used in object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
e58b52592b add missing environment variable __self
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
1805c16fd4 --debug
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Steven Armstrong
a946b5cf59 verify manifest environment
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 15:07:58 +02:00
Nico Schottelius
7bb81e2f18 Whitespace does not not weigh anything - remove - sed -i 's/ *$//g' *py */*py
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-10-18 13:32:36 +02:00
Nico Schottelius
7160637014 remove trailing whitespace: :%s/ *$//g
Signed-off-by: Nico Schottelius <nico@brief.schottelius.org>
2011-10-18 13:29:44 +02:00
Steven Armstrong
91c1215566 wrap exceptions in cdist.Error
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 13:27:44 +02:00
Steven Armstrong
e9a0aa1863 fail if requirements type does not exist
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 13:20:14 +02:00
Steven Armstrong
64edfc4640 add tests for emulator
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 13:19:37 +02:00
Steven Armstrong
4975b4643a --typo
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 13:11:53 +02:00
Steven Armstrong
95a858c350 implement: fail if type does not exist on the filesystem
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 12:46:06 +02:00
Steven Armstrong
a0a4a7382d import NoSuchTypeError into cdist.core namespace
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 12:44:07 +02:00
Steven Armstrong
bd81045caf test for nonexistent type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-18 12:43:14 +02:00
Nico Schottelius
50cb8807bf fix tests to work (not code :-)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-18 09:57:50 +02:00
Nico Schottelius
03ea7787d2 +self
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-16 18:38:22 +02:00
Nico Schottelius
420b6aeae7 ensure object is not ran twice
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-16 15:08:00 +02:00
Nico Schottelius
32b2c49d32 found 2 bugs in transfer_code_remote
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-16 12:39:06 +02:00
Nico Schottelius
3883fe4247 raise cdist error instead of oserror
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-16 00:12:32 +02:00
Nico Schottelius
3c31b4f9a3 and finally also adjust the requirement itself
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 23:40:11 +02:00
Nico Schottelius
950424d478 move log output into correct function, also log object code run/gencode
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 23:29:27 +02:00
Nico Schottelius
42e1c21f43 print progress output in info level for object prepare
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 23:26:54 +02:00
Nico Schottelius
5a72223ae3 strip away / in emulator in requirements
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 23:23:57 +02:00
Nico Schottelius
053903bb69 use instance logger in explorer
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 12:00:46 +02:00
Steven Armstrong
b8b9719cc6 Merge remote-tracking branch 'telmich/master'
Conflicts:
	lib/cdist/core/explorer.py
	lib/cdist/emulator.py

Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-15 10:51:08 +02:00
Nico Schottelius
ee1c568c7b almost finish correct requirement loading, but need sleep
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 02:54:54 +02:00
Nico Schottelius
0dd38f75c2 remove leading / from object_id of requirement
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 02:46:28 +02:00
Nico Schottelius
a7a3ee6f19 adjust prefix
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 02:36:33 +02:00
Nico Schottelius
e002710c4c rewrite emulator to class based approach for better logging
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 02:31:40 +02:00
Nico Schottelius
00a1f1eeb9 ++ more host prefixing log code
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 01:41:11 +02:00
Nico Schottelius
a415cc4b91 add correct logger in manifest
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 01:38:22 +02:00
Nico Schottelius
67b1094712 flatten error message in remotescripterror as well
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 01:25:57 +02:00
Nico Schottelius
ad1e51cb2e catch unicodedecodeerror
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 01:11:54 +02:00
Steven Armstrong
889e6c23cb Explorer tracks which type explorers have been transferred instad of Type
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-15 00:44:54 +02:00
Steven Armstrong
d83de25774 Stripp leading slash from requirements object_id
Signed-off-by: Steven Armstrong <steven@icarus.ethz.ch>
2011-10-15 00:26:00 +02:00
Nico Schottelius
db6fdeebfe log.info for global explorers (may also take some time)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 00:14:25 +02:00
Nico Schottelius
0d441eb378 report info when running initial manifest (it may take some time)
Signed-off-by: Nico Schottelius <nico@kr.ethz.ch>
2011-10-15 00:12:08 +02:00