Changeset 12458 for trunk

Timestamp:

02/09/11 16:13:27 (13 years ago)

Author:

sil

Message:

• Converted some tab-indented lines to space-intented
• Added methods to Network for reverseName(s)
• Fixed bug: template-output from CMT templates wasn't saved when the template didn't contain a store-templatetag
• Changed order of INSTALLED_APS

Location:

trunk/sara_cmt

Files:

• cmt.py (modified) (2 diffs)
• sara_cmt/cluster/models.py (modified) (1 diff)
• sara_cmt/settings.py (modified) (1 diff)

trunk/sara_cmt/cmt.py

@@ -322 +322 @@
         logger.error('Template does not exist: %s' % e)
 
-    if not parser.values.DRYRUN:
-        
-        if not c.has_key( 'stores' ):
-        
-                c[ 'stores' ] = { c['output'] : res }
-
-        for store_file, store_output in c['stores'].items():
-
-                write_msg = 'Writing outputfile: %s' %store_file
-                created_msg = 'Outputfile(s) created: %s' %store_file
-
-                try:
-                    logger.info(write_msg)
-                    f = open(store_file, 'w')
-                    f.writelines(store_output)
-                    f.close()
-                    logger.info(created_msg)
-                except IOError, e:
-                    logger.error('Failed creating outputfile: %s' % e)
-                except KeyError, e:
-                    logger.error('No output/stores defined in template')
+    if not parser.values.DRYRUN: # Write output file(s)
+        
+        c['stores'] = c['stores'] or {c['output']:res}
+
+        for store_file, store_output in c['stores'].items():
+
+            write_msg = 'Writing outputfile: %s' %store_file
+            created_msg = 'Outputfile(s) created: %s' %store_file
+
+            try:
+                logger.info(write_msg)
+                f = open(store_file, 'w')
+                f.writelines(store_output)
+                f.close()
+                logger.info(created_msg)
+            except IOError, e:
+                logger.error('Failed creating outputfile: %s' % e)
+            except KeyError, e:
+                logger.error('No output/stores defined in template')
 
     else:
@@ -352 +350 @@
             for script in c['epilogue']:
                 ### <DEBUG>
-                #logger.info('Now executing epilogue script')
+                logger.info('Now executing epilogue script')
                 #logger.debug('<EPILOGUE>')
                 os.system(script)
                 #logger.debug('</EPILOGUE>')
-                #logger.info('Finished epilogue script')
+                logger.info('Finished epilogue script')
                 ### </DEBUG>
         except KeyError, e:

trunk/sara_cmt/sara_cmt/cluster/models.py

@@ -225 +225 @@
         return self.name
 
+    #
+    def _rev_name(self):
+        network = IP("%s/%s" % (self.netaddress, self.netmask))
+        reverse_name = network.reverseName()
+        return reverse_name
+
+    #
+    def _rev_names(self):
+        network = IP("%s/%s" % (self.netaddress, self.netmask))
+        reverse_names = network.reverseNames()
+        return reverse_names
+
     def _max_hosts(self):
         """

trunk/sara_cmt/sara_cmt/settings.py

@@ -167 +167 @@
     'django.contrib.databrowse',
     'django.contrib.webdesign',
+    'piston',
     'sara_cmt.cluster',
     'sara_cmt.api',
-    'piston',
     'django_extensions',
     'tagging',