[Cluster-devel] conga/luci/cluster form-chooser form-macros in ...

[Cluster-devel] conga/luci/cluster form-chooser form-macros in ...

[jparsons]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	jparsons at sourceware.org	2006-10-16 20:25:33

Modified files:
	luci/cluster   : form-chooser form-macros index_html 

Log message:
	template support for xen

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-chooser.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/form-macros.diff?cvsroot=cluster&r1=1.88&r2=1.89
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.19&r2=1.20

--- conga/luci/cluster/form-chooser	2006/10/16 18:35:01	1.11
+++ conga/luci/cluster/form-chooser	2006/10/16 20:25:33	1.12
@@ -56,6 +56,12 @@
     <span tal:omit-tag="" tal:condition="python: ptype == '17'">
      <div metal:use-macro="here/form-macros/macros/nodelogs-form"/>
     </span>
+    <span tal:omit-tag="" tal:condition="python: ptype == '18'">
+     <div metal:use-macro="here/form-macros/macros/xenvmadd-form"/>
+    </span>
+    <span tal:omit-tag="" tal:condition="python: ptype == '19'">
+     <div metal:use-macro="here/form-macros/macros/xenvmconfig-form"/>
+    </span>
     <span tal:omit-tag="" tal:condition="python: ptype == '20'">
      <div metal:use-macro="here/form-macros/macros/servicelist-form"/>
     </span>
@@ -83,6 +89,9 @@
     <span tal:omit-tag="" tal:condition="python: ptype == '28'">
      <div metal:use-macro="here/form-macros/macros/servicerestart"/>
     </span>
+    <span tal:omit-tag="" tal:condition="python: ptype == '29'">
+     <div metal:use-macro="here/form-macros/macros/xenvmprocess"/>
+    </span>
     <span tal:omit-tag="" tal:condition="python: ptype == '30'">
      <div metal:use-macro="here/resource-form-macros/macros/resources-form"/>
     </span>
--- conga/luci/cluster/form-macros	2006/10/16 19:13:44	1.88
+++ conga/luci/cluster/form-macros	2006/10/16 20:25:33	1.89
@@ -1880,6 +1880,33 @@
 	</tal:block>
 </div>
 
+<div metal:define-macro="xenvmadd-form">
+  <span tal:define="python:here.appendModel(request, modelb)"/>
+  <form method="get" action="" tal:attributes="action python:request['baseurl'] + '?clustername=' + request['clustername'] + '&pagetype=29'">
+  <h4>Path to configuration file: </h4><input type="text" name="xenvmpath" value=""/>
+  <h4>Name of configuration file: </h4><input type="text" name="xenvmname" value=""/>
+  <input type="submit" value="Create Xen VM"/>
+  </form>
+</div>
+
+<div metal:define-macro="xenvmconfig-form">
+  <span tal:define="python:here.appendModel(request, modelb)"/>
+  <h4>Properties for Xen VM <font color="green"><span tal:content="request/servicename"/></font></h4>
+  <span tal:define="global xeninfo python:here.getXenVMInfo(modelb, request)">
+  <form method="get" action="" tal:attributes="action python:request['baseurl'] + '?clustername=' + request['clustername'] + '&pagetype=29&servicename=' + request['servicename']">
+  <h4>Path to configuration file: </h4><input type="text" name="xenvmpath" value="" tal:attributes="value xeninfo/path"/>
+  <h4>Name of configuration file: </h4><input type="text" name="xenvmname" value="" tal:attributes="value xeninfo/name"/>
+  <input type="button" value="Delete"/>
+  <input type="submit" value="Update"/>
+  </form>
+ </span>
+</div>
+
+<div metal:define-macro="xenvmprocess">
+  <span tal:define="retrn python:here.processXenVM(request)"/>
+</div>
+
+
 <div metal:define-macro="serviceadd-form">
 	<script type="text/javascript">
 		set_page_title('Luci ??? cluster ??? services ??? Add a new service');
--- conga/luci/cluster/index_html	2006/10/16 04:26:19	1.19
+++ conga/luci/cluster/index_html	2006/10/16 20:25:33	1.20
@@ -164,7 +164,7 @@
 	    <tal:block tal:define="global ricci_agent python: here.getRicciAgentForCluster(request)" />
 		<tal:block tal:condition="ricci_agent"
 			tal:define="
-				global modelb python:here.getmodelbuilder(ricci_agent)" />
+				global modelb python:here.getmodelbuilder(ricci_agent,isVirtualized)" />
     </tal:block>
 
       <table id="portal-columns">