Changeset 991 for dassmodus

Timestamp:

Apr 7, 2012, 5:44:00 PM (13 years ago)

Author:

pstorz

Message:

director ressource sorted differently

Location:

dassmodus/trunk/dassmodus/nosferatu/nosferatu

Files:

• auto_configrules.py (modified) (1 diff)
• tools/generate_web2py_db_model.py (modified) (8 diffs)

dassmodus/trunk/dassmodus/nosferatu/nosferatu/auto_configrules.py

@@ -542 +542 @@
 # It must have one item for each of the resources.
 dird_resources = [
+  [ 'catalog' , 'R_CATALOG', dird_cat_items ], 
+  [ 'storage' , 'R_STORAGE', dird_store_items ], 
+  [ 'fileset' , 'R_FILESET', dird_fs_items ], 
+  [ 'pool' , 'R_POOL', dird_pool_items ], 
+  [ 'jobdefs' , 'R_JOBDEFS', dird_job_items ], 
+  [ 'client' , 'R_CLIENT', dird_cli_items ], 
+  [ 'counter' , 'R_COUNTER', dird_counter_items ], 
+  [ 'messages' , 'R_MSGS', lib_msgs_items ], 
+  [ 'job' , 'R_JOB', dird_job_items ], 
+  [ 'director' , 'R_DIRECTOR', dird_dir_items ], 
   [ 'console' , 'R_CONSOLE', dird_con_items ], 
-  [ 'jobdefs' , 'R_JOBDEFS', dird_job_items ], 
   [ 'schedule' , 'R_SCHEDULE', dird_sch_items ], 
-  [ 'messages' , 'R_MSGS', lib_msgs_items ], 
-  [ 'counter' , 'R_COUNTER', dird_counter_items ], 
-  [ 'storage' , 'R_STORAGE', dird_store_items ], 
-  [ 'catalog' , 'R_CATALOG', dird_cat_items ], 
-  [ 'fileset' , 'R_FILESET', dird_fs_items ], 
-  [ 'director' , 'R_DIRECTOR', dird_dir_items ], 
-  [ 'job' , 'R_JOB', dird_job_items ], 
-  [ 'client' , 'R_CLIENT', dird_cli_items ], 
-  [ 'pool' , 'R_POOL', dird_pool_items ], 
 ]
 

dassmodus/trunk/dassmodus/nosferatu/nosferatu/tools/generate_web2py_db_model.py

@@ -52 +52 @@
 
 
-
-
-def item2field(item):
+def item2field(confshort, item):
     if item.name == 'where' : # where cannot be a column name in sqlite
       item.name = 'where_'
@@ -62 +60 @@
       if item.name.endswith('pool'):
         refname = 'pool'
-      fieldtype = 'reference dird_conf__%s'  %  (refname)
+      print '### ' + refname
+      
+      fieldtype = 'reference %s_conf__%s'  %  (confshort,refname)
       defaultvalue = 0
       return """ Field('%s','%s', default=%s), """ %(item.name, fieldtype , defaultvalue)
@@ -70 +70 @@
       if item.type == "store_bool":
         fieldtype = "boolean"
-        print "#####%s %s %s" % (item.name, item.defaultvalue, defaultvalue) 
+        #print "#####%s %s %s" % (item.name, item.defaultvalue, defaultvalue) 
         return """ Field('%s','%s', default=%s), """ %(item.name, fieldtype , defaultvalue)
       return """ Field('%s','%s', default='%s'), """ %(item.name, fieldtype , defaultvalue)
@@ -81 +81 @@
 dir_res_list = list()
  
+confshort = 'dird'
 for res in auto_configrules.dird_resources:
   res_name = res[0]
@@ -88 +89 @@
   print 
   #print res_name
-  print """db.define_table('dird_conf__%s',  """ % (res_name)
-  for item in res_items:
-    item.required=False
-    item.printall=True
-    print item2field(item)
-  print """ format='%(name)s')"""
-
-
-
+  print """db.define_table('%s_conf__%s',  """ % (confshort,res_name)
+  for item in res_items:
+    item.required=False
+    item.printall=True
+    print item2field(confshort,item)
+  print """ format='%(name)s')"""
+
+
+confshort = 'stored'
 stor_res_list = list()
 for res in auto_configrules.stored_resources:
@@ -105 +106 @@
   print 
   #print res_name
-  print """db.define_table('stored_conf__%s',  """ % (res_name)
-  for item in res_items:
-    item.required=False
-    item.printall=True
-    print item2field(item)
-  print """ format='%(name)s')"""
-
-
-
+  print """db.define_table('%s_conf__%s',  """ % (confshort,res_name)
+  for item in res_items:
+    item.required=False
+    item.printall=True
+    print item2field(confshort,item)
+  print """ format='%(name)s')"""
+
+
+confshort = 'filed'
 filed_res_list = list()
 for res in auto_configrules.filed_resources:
@@ -122 +123 @@
   print 
   #print res_name
-  print """db.define_table('filed_conf__%s',  """ % (res_name)
-  for item in res_items:
-    item.required=False
-    item.printall=True
-    print item2field(item)
-  print """ format='%(name)s')"""
-
-
-
-
-
-
-
-
-
-
-for res in dir_res_list:
-#  print """db.define_table('dird_conf__%s',
-#  Field('name','string'),
-#  format = '%%(name)s')
-#  """ % (res)
-   
+  print """db.define_table('%s_conf__%s',  """ % (confshort,res_name)
+  for item in res_items:
+    item.required=False
+    item.printall=True
+    print item2field(confshort,item)
+  print """ format='%(name)s')"""
+
+confshort = 'cons'
+cons_res_list = list()
+for res in auto_configrules.console_resources:
+  res_name = res[0]
+  res_type = res[1]
+  res_items = res[2]
+  cons_res_list.append(res_name)
+  print 
+  #print res_name
+  print """db.define_table('%s_conf__%s',  """ % (confshort,res_name)
+  for item in res_items:
+    item.required=False
+    item.printall=True
+    print item2field(confshort,item)
+  print """ format='%(name)s')"""
+
+
+
+
+
+for res in dir_res_list:   
   print """db.define_table('dird_conf__%s_link',
   Field('%s','reference dird_conf__%s'),
   format = '%%(id)s')
     """ % (res,res,res)
-
-
-
 print """db.define_table('dird_conf',
   Field('name','string'),"""
+
 for res in dir_res_list:
   print "  Field('dird_conf__%s', 'reference dird_conf__%s_link')," % (res,res )
@@ -160 +165 @@
 
 
-
-
-#for item in auto_configrules.dird_cat_items:
-#  item.required=False
-#  print """
-#   Field('%s','reference dird_conf_catalog'),
-#  """
+for res in stor_res_list:   
+  print """db.define_table('stord_conf__%s_link',
+  Field('%s','reference stord_conf__%s'),
+  format = '%%(id)s')
+    """ % (res,res,res)
+print """db.define_table('stord_conf',
+  Field('name','string'),"""
+
+for res in stor_res_list:
+  print "  Field('stord_conf__%s', 'reference stord_conf__%s_link')," % (res,res )
+print """  format='%(name)s')
+"""
+
+
+
+for res in filed_res_list:   
+  print """db.define_table('filed_conf__%s_link',
+  Field('%s','reference filed_conf__%s'),
+  format = '%%(id)s')
+    """ % (res,res,res)
+print """db.define_table('filed_conf',
+  Field('name','string'),"""
+
+for res in filed_res_list:
+  print "  Field('filed_conf__%s', 'reference filed_conf__%s_link')," % (res,res )
+print """  format='%(name)s')
+"""
+
+
+
+
+for res in cons_res_list:   
+  print """db.define_table('cons_conf__%s_link',
+  Field('%s','reference cons_conf__%s'),
+  format = '%%(id)s')
+    """ % (res,res,res)
+print """db.define_table('cons_conf',
+  Field('name','string'),"""
+
+for res in cons_res_list:
+  print "  Field('cons_conf__%s', 'reference cons_conf__%s_link')," % (res,res )
+print """  format='%(name)s')
+"""
+
+
+#Abhängikeiten:
+# dird 
+#  job/jobdefs   ->client
+#                -> pool
+#                -> fileset
+#                -> pool
+#                -> messages
+#                -> schedule
+#                -> storage
+#                -> jobdefs
+#                -> job
+# messages   -> catalog
+# counter    -> catalog
+# storage    -> device
+# director   -> messages
+# client     -> catalog
+# pool       -> catalog, storage
+
+
+# Reihenfolge:
+# storage->catalog->fileset->pool->jobdefs->client->
+# counter->messages->job->director
+
+
+
+# stored:
+# autochanger -> device
+# storage  -> messages
+# messages -> catalog
+
+# filed:
+# messages -> catalog
+# client/filedaemon -> messages
+
+
+
+
+