[Erp5-report] r35593 rafael - in /erp5/trunk/utils/erp5.timmy: ./ src/erp5/timmy/ src/erp5/...

[nobody at svn.erp5.org]

Author: rafael
Date: Tue May 25 06:05:39 2010
New Revision: 35593

URL: http://svn.erp5.org?rev=35593&view=rev
Log:
Release 0.3, Added support to KVM and Test Instance.

Added:
    erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/test-instance-template.cfg
Modified:
    erp5/trunk/utils/erp5.timmy/CHANGES.txt
    erp5/trunk/utils/erp5.timmy/setup.py
    erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/kvm-instance-template.cfg
    erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py

Modified: erp5/trunk/utils/erp5.timmy/CHANGES.txt
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/CHANGES.txt?rev=35593&r1=35592&r2=35593&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/CHANGES.txt [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/CHANGES.txt [utf8] Tue May 25 06:05:39 2010
@@ -1,5 +1,11 @@
+0.3 (2010-05-25)
+----------------
+
+ - Added Support for KVM and Test Instances.
+    [Rafael Monnerat]
+
 0.2 (2010-04-15)
---------------
+-----------------
 
  - eggification
    [Lukasz Nowak]

Modified: erp5/trunk/utils/erp5.timmy/setup.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/setup.py?rev=35593&r1=35592&r2=35593&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/setup.py [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/setup.py [utf8] Tue May 25 06:05:39 2010
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 
 name = "timmy"
-version = '0.2'
+version = '0.3'
 
 def read(name):
     return open(name).read()

Modified: erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/kvm-instance-template.cfg
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/kvm-instance-template.cfg?rev=35593&r1=35592&r2=35593&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/kvm-instance-template.cfg [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/kvm-instance-template.cfg [utf8] Tue May 25 06:05:39 2010
@@ -16,5 +16,5 @@
 ssh_key_path = ${buildout:var-directory}/%{ID}.key
 
 ssh_key = 
-%{KVM_SSH_KEY}
+  %{KVM_SSH_KEY}
 

Added: erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/test-instance-template.cfg
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/test-instance-template.cfg?rev=35593&view=auto
==============================================================================
--- erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/test-instance-template.cfg (added)
+++ erp5/trunk/utils/erp5.timmy/src/erp5/timmy/examples/test-instance-template.cfg [utf8] Tue May 25 06:05:39 2010
@@ -1,0 +1,8 @@
+[%{ID}]
+<= test-instance-template
+url = %{URL}
+testing_script_name = %{TESTING_SCRIPT_NAME}
+testing_script_args =
+  %{SSH_KEY}
+  %{TCP_PORT}
+  %{TEST}

Modified: erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py
URL: http://svn.erp5.org/erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py?rev=35593&r1=35592&r2=35593&view=diff
==============================================================================
--- erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] (original)
+++ erp5/trunk/utils/erp5.timmy/src/erp5/timmy/timmy.py [utf8] Tue May 25 06:05:39 2010
@@ -497,18 +497,13 @@
     else:
       return 'error', '%s %s' % (result_std, result_err)
 
- # KVM Instance related
+  # KVM Instance related
   def KVMInstance(self):
     self.control_script = os.path.join('bin', '%s-ctl' % self.item_id)
 
-  def install_KVMInstance(self):
-    return self.install_ZopeInstance()
-
-  def start_KVMInstance(self):
-    return self.start_ZopeInstance()
-
-  def stop_KVMInstance(self):
-    return self.stop_ZopeInstance()
+  install_KVMInstance = install_ZopeInstance
+  start_KVMInstance = start_ZopeInstance
+  stop_KVMInstance = stop_ZopeInstance
 
   def getPartitionState_KVMInstance(self):
     logging.info('Fetching status of instance %s' % self.item_id)
@@ -519,6 +514,16 @@
       return 'stopped', ''
     else:
       return 'error', '%s %s' % (result_std, result_err)
+
+  # Test Instance related
+  def TestInstance(self):
+    self.control_script = os.path.join('bin', '%s_run_test' % self.item_id)
+
+  install_TestInstance = install_ZopeInstance
+  start_TestInstance = start_ZopeInstance
+  stop_TestInstance = stop_ZopeInstance
+
+  getPartitionState_TestInstance = getPartitionState_KVMInstance
 
 class Helper(object):
   def manageNothing(self, partition, server):