[Cluster-devel] conga/luci/site/luci/Extensions ModelBuilder.p ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-05-11 02:36:44

Modified files:
	luci/site/luci/Extensions: ModelBuilder.py 
Added files:
	luci/site/luci/Extensions: SAPDatabase.py SAPInstance.py 

Log message:
	Add SAPDatabase and SAPInstance resource agent support to the cluster model.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/SAPDatabase.py.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/SAPInstance.py.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ModelBuilder.py.diff?cvsroot=cluster&r1=1.26&r2=1.27

/cvs/cluster/conga/luci/site/luci/Extensions/SAPDatabase.py,v  -->  standard output
revision 1.1
--- conga/luci/site/luci/Extensions/SAPDatabase.py
+++ -	2007-05-11 02:36:45.150800000 +0000
@@ -0,0 +1,13 @@
+from BaseResource import BaseResource
+
+import gettext
+_ = gettext.gettext
+
+TAG_NAME = "SAPDatabase"
+RESOURCE_TYPE = _("SAP Database")
+
+class SAPDatabase(BaseResource):
+  def __init__(self):
+    BaseResource.__init__(self)
+    self.TAG_NAME = TAG_NAME
+    self.resource_type = RESOURCE_TYPE
/cvs/cluster/conga/luci/site/luci/Extensions/SAPInstance.py,v  -->  standard output
revision 1.1
--- conga/luci/site/luci/Extensions/SAPInstance.py
+++ -	2007-05-11 02:36:45.277270000 +0000
@@ -0,0 +1,13 @@
+from BaseResource import BaseResource
+
+import gettext
+_ = gettext.gettext
+
+TAG_NAME = "SAPInstance"
+RESOURCE_TYPE = _("SAP Instance")
+
+class SAPInstance(BaseResource):
+  def __init__(self):
+    BaseResource.__init__(self)
+    self.TAG_NAME = TAG_NAME
+    self.resource_type = RESOURCE_TYPE
--- conga/luci/site/luci/Extensions/ModelBuilder.py	2007/03/15 22:08:42	1.26
+++ conga/luci/site/luci/Extensions/ModelBuilder.py	2007/05/11 02:36:44	1.27
@@ -1,12 +1,6 @@
-#!/usr/bin/python
-#import xml.dom.minidom
 from xml.dom import minidom, Node
 import string
 import os
-#import sys
-#directory = os.path.dirname(__file__)
-#from Cluster import Cluster
-#sys.path.append(directory)
 from TagObject import TagObject
 from Cluster import Cluster
 from ClusterNode import ClusterNode
@@ -32,6 +26,8 @@
 from OpenLDAP import OpenLDAP
 from Postgres8 import Postgres8
 from Tomcat5 import Tomcat5
+from SAPInstance import SAPInstance
+from SAPDatabase import SAPDatabase
 from Multicast import Multicast
 from FenceDaemon import FenceDaemon
 from FenceXVMd import FenceXVMd
@@ -79,6 +75,8 @@
            'openldap':OpenLDAP,
            'postgres-8':Postgres8,
            'tomcat-5':Tomcat5,
+           'SAPDatabase':SAPDatabase,
+           'SAPInstance':SAPInstance,
            'fence_daemon':FenceDaemon,
            'multicast':Multicast,
            'clusterfs':Clusterfs,
@@ -1169,12 +1167,3 @@
     self.object_tree.searchTree(objlist, tagtype)
 
     return objlist
- 
-   
-if __name__ == "__main__":
-  print "Starting main program"
-  mdl = ModelBuilder()
-  objs = mdl.buildModel(None)
-
-  mdl.exportModel("/tmp/tags.xml",objs)
-