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

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

CVSROOT:	/cvs/cluster
Module name:	conga
Branch: 	RHEL5
Changes by:	jparsons at sourceware.org	2006-10-24 01:42:53

Modified files:
	luci/site/luci/Extensions: ModelBuilder.py cluster_adapters.py 
Added files:
	luci/site/luci/Extensions: Vm.py 

Log message:
	Change UI name and tag name from Xenvm

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/Vm.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=NONE&r2=1.1.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/ModelBuilder.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.8&r2=1.8.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/cluster_adapters.py.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.120.2.3&r2=1.120.2.4

--- conga/luci/site/luci/Extensions/ModelBuilder.py	2006/10/16 20:46:55	1.8
+++ conga/luci/site/luci/Extensions/ModelBuilder.py	2006/10/24 01:42:52	1.8.2.1
@@ -33,7 +33,7 @@
 from Service import Service
 from QuorumD import QuorumD
 from Heuristic import Heuristic
-from Xenvm import Xenvm
+from Vm import Vm
 from RefObject import RefObject
 from FailoverDomain import FailoverDomain
 from FailoverDomains import FailoverDomains
@@ -57,7 +57,7 @@
            'lockserver':Lockserver,
            'rm':Rm,
            'service':Service,
-           'xenvm':Xenvm,
+           'vm':Vm,
            'resources':Resources,
            'failoverdomain':FailoverDomain,
            'failoverdomains':FailoverDomains,
@@ -86,7 +86,7 @@
 RESOURCES_PTR_STR="resources"
 FENCEDAEMON_PTR_STR="fence_daemon"
 SERVICE="service"
-XENVM="xenvm"
+VM="vm"
 GULM_TAG_STR="gulm"
 MCAST_STR="multicast"
 CMAN_PTR_STR="cman"
@@ -663,7 +663,7 @@
     if self.resourcemanager_ptr != None:
       kids = self.resourcemanager_ptr.getChildren()
       for kid in kids:
-        if kid.getTagName() == XENVM:
+        if kid.getTagName() == VM:
           rg_list.append(kid)
 
     return rg_list
--- conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/23 20:47:10	1.120.2.3
+++ conga/luci/site/luci/Extensions/cluster_adapters.py	2006/10/24 01:42:52	1.120.2.4
@@ -16,7 +16,7 @@
 from NFSClient import NFSClient
 from NFSExport import NFSExport
 from Netfs import Netfs
-from Xenvm import Xenvm
+from Vm import Vm
 from Script import Script
 from Samba import Samba
 from clusterOS import resolveOSType
@@ -910,10 +910,10 @@
 
   if model.getIsVirtualized() == True:
     vmadd = {}
-    vmadd['Title'] = "Add a XenVM"
+    vmadd['Title'] = "Add a Virtual Service"
     vmadd['cfg_type'] = "xenvmadd"
     vmadd['absolute_url'] = url + "?pagetype=" + XENVM_ADD + "&clustername=" + cluname
-    vmadd['Description'] = "Add a XenVM to this cluster"
+    vmadd['Description'] = "Add a Virtual Service to this cluster"
     if pagetype == XENVM_ADD:
       vmadd['currentItem'] = True
     else:
@@ -963,7 +963,7 @@
     svc['Title'] = xenname
     svc['cfg_type'] = "xenvm"
     svc['absolute_url'] = url + "?pagetype=" + XENVM_CONFIG + "&servicename=" + xenname + "&clustername=" + cluname
-    svc['Description'] = "Configure this XenVM"
+    svc['Description'] = "Configure this Virtual Service"
     if pagetype == XENVM_CONFIG:
       try:
         xname = request['servicename']
@@ -2512,7 +2512,7 @@
     isNew = True
   
   if isNew == True:
-    xvm = Xenvm()
+    xvm = Vm()
     xvm.addAttribute("name", req.form['xenvmname'])
     xvm.addAttribute("path", req.form['xenvmpath'])
     rmptr = model.getResourceManagerPtr()