Add support for instance parameters

slapos/runner/__init__.py

@@ -109,6 +109,7 @@ def run():
 
 def serve(config):
   from views import app
+  #import FlaskRealmDigestDB
   workdir = os.path.join(config.runner_workdir, 'project')
   app.config.update(**config.__dict__)
   app.config.update(
@@ -121,5 +122,9 @@ def serve(config):
   )
   if not os.path.exists(workdir):
     os.mkdir(workdir)
+  #authDB = FlaskRealmDigestDB('SlaposWebRunner')
+  #user_dict = authDB.toDict()
+  #if not user_dict['db']:
+  #  authDB.add_user('admin', 'root')
   app.run(host=config.runner_host, port=int(config.runner_port),
       debug=config.debug, threaded=True)

slapos/runner/static/css/jqueryTabs.css

@@ -9,7 +9,12 @@
 
 #tabContaier textarea {
 	width:702px;
+  margin-top:4px;
+  margin-left:4px;
+  resize: none;
 }
+#tabContaier textarea.slap{width:455px; max-height:120px; height:20px;padding:3px;color:#6F6F6F}
+#tabContaier input[type='text']{width:125px;}
 #tabContaier > ul{
 	overflow:hidden;
 	height:34px;

slapos/runner/static/css/styles.css

@@ -16,6 +16,7 @@ a:hover {
 
 table {
     margin: 0;
+    padding:0;
     border-right: none;
     border-bottom: none;
     font-size: 14px;
@@ -36,16 +37,18 @@ th{
     font-weight: normal;
     font-size: 18px;
 }
-
+table.small th{padding: 4px;font-size: 16px;}
 textarea {
 	width:762px;
 }
 
 body {
 	background: url("../images/1307251316-background-stripes.gif") repeat #9C9C9C;
-	font-family: 'Helvetica Neue',Helvetica,Arial,sans-serif;
+	font-family: 'Helvetica Neue',Tahoma,Helvetica,Arial,sans-serif;
 	color: #000000;
 	font-size: 13px;
+  overflow: -moz-scrollbars-vertical;
+overflow-y: scroll;
 }
 
 #page
@@ -314,7 +317,7 @@ input[type="radio"], input[type="checkbox"]{
 
 #home_box{
     background: none;
-    border: 1px solid #678dad;
+    border: 2px solid #87B0D4;
     padding: 0;
     color: #4c6172;
     margin: 15px 59px 15px 59px;
@@ -333,7 +336,7 @@ input[type="radio"], input[type="checkbox"]{
 #home_box h2{
     font-weight: normal;
     font-size: 23px;
-    color: #4c6172;
+    color: #475F73;
 }
 
 #home_box p{
@@ -351,7 +354,6 @@ input[type="radio"], input[type="checkbox"]{
 .inner_box{
     background: none;
     margin: 0;
-    border: 1px solid #CAD4DC;
     display: block;
     padding: 30px 0 30px 0;
 }
@@ -371,23 +373,24 @@ input[type="radio"], input[type="checkbox"]{
     margin: 10px 45px 10px 45px;
     padding: 10px;
     padding-bottom:15px;
-    border: #678dad;
     width: 530px;
     border: 1px solid #678dad;
 }
 
-.lmenu:hover, .smenu:hover, .sright_menu:hover{
+.smaller{margin-left:10px; width: 350px; float:right}
+.smaller p{width: 280px;}
+.umenu{display: block;margin: 10px 0 10px 45px; width: 147px; float:left;border: 1px solid #678dad;
+padding: 10px;height: 80px;padding-bottom:15px;}
+.umenu p{font-size: 13px;float: left;width: 77px;cursor:default;}
+.lmenu:hover, .smenu:hover, .sright_menu:hover, .smaller:hover, .umenu:hover{
     background: #96b9d7;
-
 }
-
 .smenu{
     display: block;
     height: 80px;
     margin: 0 10px 0 45px;
     padding: 10px;
     padding-bottom:15px;
-    border: #678dad;
     width: 250px;
     border: 1px solid #678dad;
     float: left;
@@ -583,6 +586,7 @@ a.lshare{
     color: #4DA0C6;
     text-align:center;
     font-weight:bold;
+    cursor:pointer;
 }
 a.lshare:hover{
     background:#D9D9D9;
@@ -593,7 +597,9 @@ a.lshare:hover{
 a.lshare:focus{
     border:solid 1px #73A6FF;
 }
-
+a.no-right-border{border-right:none}
+a.no-right-border:hover{border-right:none}
+a.no-right-border:focus{border-right:none}
 a.lshare img{
     margin: 5px;
 }
@@ -635,19 +641,19 @@ a.lshare img{
     width: 36px;
     height: 26px;
 }
-#error td.close{
+#error td.b_close{
     width: 30px;
     height:22px;
 }
 .list{background: url(../images/menu_dropdown.png) left center no-repeat; padding-left:10px;}
-
+.slidebox{padding:10px; }
 .alert_message{ background: url(../images/alert.png) center no-repeat; height: 26px;}
 .error_message{ background: url(../images/exit.png) center no-repeat; height: 26px;}
 .confirm_message{ background: url(../images/confirm.png) center no-repeat; height: 26px;}
 .info_message{ background: url(../images/info.png) center no-repeat; height: 26px;}
 #error p{ font-size: 13px; color: #4A131F;}
-#pClose{background:url(../images/close.png) no-repeat 0px 0px; display:block; width:22px; height:22px; cursor:pointer}
-#pClose:hover{background:url(../images/close_hover.png) no-repeat 0px 0px;}
+#pClose, .close{background:url(../images/close.png) no-repeat 0px 0px; display:block; width:22px; height:22px; cursor:pointer}
+#pClose:hover, .close:hover{background:url(../images/close_hover.png) no-repeat 0px 0px;}
 .md5sum {margin:10px; font-size:15px;}
 .title{background: #e4e4e4; width: 100%; height: 25px; padding-top:2px; text-indent: 5px; color: #737373; text-shadow: 0px 1px #FFF;}
 .menu-box-left{float:left; width: 120px; font-size:14px; background: #e4e4e4; padding:5px 0 5px 5px; margin-top:10px;
@@ -679,7 +685,8 @@ a.lshare img{
 .popup li{border-bottom: 1px dashed #666666; padding:5px; padding-top:5px;}
 .popup-value{display:none;}
 textarea.parameter {border: solid 1px #678dad; color: #666666; height:110px;}
-
+.link{color:#fff; font-weight:bold; text-decoration:none}
+.link:hover{color: #19485C;}
 input[type=radio] {
 }
 
@@ -689,3 +696,12 @@ input[type=radio]:checked {
 input[type=radio]:hover {
     box-shadow: 0px 1px 3px #F0F1F2;
 }
+/* Login Css region *******/
+#login-page{width:429px; height:236px; margin:130px auto 0px; background:url(../images/loginBox.png) no-repeat;
+padding:10px; font-size:14px; color:#03406A}
+#login-page h2{color:#fff; font-size:26px; font-weight:normal; text-indent:50px;}
+.login-content{margin:10px; margin-top:40px; margin-bottom:0; height:90px;}
+.login-button{width:140px; margin:0 auto;}
+.login-element{float:left; min-width:120px;}
+.login-label{padding:5px; font-size:16px;}
+.login-input{width:220px;}
\ No newline at end of file

slapos/runner/static/js/jquery/jqueryTabs.js

 $(document).ready(function(){
 	$(".tabContents").hide(); // Hide all tab content divs by default
   var hashes = window.location.href.split('#');
-  if (hashes.length == 2){
+  var fromheight = 0;
+  var previoustab = null;
+  if (hashes.length == 2 && hashes[1] != ""){
     $("#tabContaier>ul li").each(function() {
       var $tab = $(this).find("a");
-      if($tab.hasClass("active")) $tab.removeClass("active");
+      if($tab.hasClass("active")){
+        $tab.removeClass("active");
+      }
       if ($tab.attr("href") == "#"+hashes[1]){
         $tab.addClass("active");
         $("#"+hashes[1]).show();
+        previoustab = "#"+hashes[1];
       }
       //alert($(this).attr("href"));
     });
   }
-  else{$(".tabContents:first").show();} // Show the first div of tab content by default
+  else{$(".tabContents:first").show(); previoustab = ".tabContents:first";} // Show the first div of tab content by default
 	$("#tabContaier ul li a").click(function(){ //Fire the click event
 		if($(this).hasClass('active')){
 		    return;
 		}
+    fromheight = $(previoustab).height();
 		var activeTab = $(this).attr("href"); // Catch the click link
+    $("#tabContaier .tabDetails").css("height", $("#tabContaier .tabDetails").height());
 		$("#tabContaier ul li a").removeClass("active"); // Remove pre-highlighted link
 		$(this).addClass("active"); // set clicked link to highlight state
 		$(".tabContents").hide(); // hide currently visible tab content div
 		$(activeTab).fadeIn(); // show the target tab content div by matching clicked link.
+    var diff = fromheight - $(activeTab).height();
+    if (diff > 0){$("#tabContaier .tabDetails").animate({height: '-=' + diff + 'px'}, 850, 'swing', function() {
+      $("#tabContaier .tabDetails").css("height", "");
+    });}
+    else{diff = -1*diff; $("#tabContaier .tabDetails").animate({height: '+=' + diff + 'px'}, 850, 'swing', function() {
+      $("#tabContaier .tabDetails").css("height", "");
+    });}
+    previoustab = activeTab;
+    $("#tabContaier .tabDetails").css("height", $("#tabContaier .tabDetails").height());
 	});
 });
\ No newline at end of file

slapos/runner/static/js/jquery/popup.js

@@ -16,7 +16,7 @@
       $box.append('<div><table id="bcontent"><tr>' +
 	    '<td valign="middle" class="logo ' + option.type + '_message"></td>' +
 	    '<td valign="middle"><p>' + msg + '</p></td>' +
-	    '<td valign="middle" class="close"><span id="pClose"></span></td></tr></table></div>');         
+	    '<td valign="middle" class="b_close"><span id="pClose"></span></td></tr></table></div>');
       $(window).scroll(function(){
 	$box.animate({top:$(window).scrollTop()+"px" },{queue: false, duration: 350});
       });

slapos/runner/static/js/scripts/common.js

 /*Common javascript function*/
 String.prototype.toHtmlChar = function(){
-  c = {'<':'&lt;', '>':'&gt;', '&':'&amp;', '"':'&quot;', "'":'&#039;',
+  var c = {'<':'&lt;', '>':'&gt;', '&':'&amp;', '"':'&quot;', "'":'&#039;',
        '#':'&#035;' };
   return this.replace( /[<&>'"#]/g, function(s) { return c[s]; } );
 }
@@ -8,11 +8,12 @@ String.prototype.trim = function () {
     return this.replace(/^\s*/, "").replace(/\s*$/, "");
 }
 
-/**************************/
 
-$(document).ready(function() {
-  		$('input[type="text"]').addClass("idleField");
-       		$('input[type="text"]').focus(function() {
+/****************************************/
+function setInput($elt) {
+  if(!$elt){var $elt = $('input[type="text"], input[type="password"]');}
+	$elt.addClass("idleField");
+     	$elt.focus(function() {
    			$(this).removeClass("idleField").addClass("focusField");
 		    if (this.value == this.defaultValue){
 		    	this.value = '';
@@ -21,10 +22,36 @@ $(document).ready(function() {
   			this.select();
   		}
 		});
-    		$('input[type="text"]').blur(function() {
+		$elt.blur(function() {
 			$(this).removeClass("focusField").addClass("idleField");
 		    if ($.trim(this.value) == ''){
 	    	this.value = (this.defaultValue ? this.defaultValue : '');
 		  }
 	  });
-});
+}
\ No newline at end of file
+
+/**************************/
+(function ($, document, window) {
+    $.extend($.fn, {
+      slideBox: function(state) {
+        if (!state) state = "hide";
+        var header = $("#"+$(this).attr('id')+">h2");
+        var box = $("#"+$(this).attr('id')+">div");
+        header.addClass(state);
+        if(state=="hide"){box.css('display', 'none');}
+        header.click(function(){
+          var state = box.css("display");
+          if (state == "none"){
+            box.slideDown("normal");
+            header.removeClass("hide");
+            header.addClass("show");
+          }
+          else{
+            box.slideUp("normal");
+            header.removeClass("show");
+            header.addClass("hide");
+          }
+        });
+      }
+    });
+}(jQuery, document, this));
\ No newline at end of file

slapos/runner/static/js/scripts/inspectInstance.js

@@ -4,8 +4,9 @@ $(document).ready( function() {
   $($("#slappart li")[0]).find("input:radio").attr('checked', true);
   $(".menu-box-right>div").css('min-height', $("#slappart li").length*26 + 20 + "px");
   configRadio();
+  var send = false;
   var lastli = null;
-  var partitionAmount = $("imput#partitionAmount").val();
+  var partitionAmount = $("input#partitionAmount").val();
   $("#slappart li").each(function(){
     lastli = $(this);
     $(this).find("input:radio").change(function(){
@@ -13,10 +14,58 @@ $(document).ready( function() {
 	  });
   });
   lastli.css("border-bottom", "none");
+  $("#parameterkw").slideBox("show");
+  setupSlappart();
+  $("#softwareType").slideBox();
+  $("#reloadfiles").click(function(){
+    setupFileTree();
+  });
+  $("#refresh").click(function(){
+    if (send) return;
+    $("#imgwaitting").fadeIn();
+    $.ajax({
+        type: "GET",
+      url: $SCRIPT_ROOT + '/supervisordStatus',
+    	data: "",
+    	success: function(data){
+            if(data.code == 1){
+                $("#supervisordcontent").empty();
+                $("#supervisordcontent").append(data.result);
+            }
+            $("#imgwaitting").fadeOut();
+    	}
+    });
+    return false;
+  });
+  $("#add_attribute").click(function(){
+    var size = Number($("#partitionParameter > tbody > tr").last().attr('id').split('_')[1]) + 1;
+    var row="<tr id='row_"+size+"'><td class='propertie first'><input type='text' name='txt_"+size+"' id='txt_"+size+"'></td>"+
+            "<td style='padding:6px'><textarea class='slap' id='value_"+size+"'></textarea>"+
+            "</td><td valign='middle'><span style='margin-left: 10px;' id='btn_"+size+"' class='close'></span></td></tr>";
+    $("#partitionParameter").append(row);
+    setInput($("input#txt_"+size));
+    $("#btn_"+size).click(function(){
+      var index = $(this).attr('id').split('_')[1];
+      $("tr#row_"+index).remove();
+    });
+    return false;
+  });
+  $("#updateParameters").click(function(){
+    updateParameter();
+    return false;
+  });
+  //Load previous instance parameters
+  loadParameter();
 
-  function setupFileTree(){
+  function setupFileTree(path){
     var root = $("input#root").val();
     if (root == "") return;
+    if (path){
+      root += "/" + path;
+      $("#tab4>h2").html("File content for <strong>" + path + "</strong>");
+    }
+    else{$("#tab4>h2").html("File content for all your partitions");}
+    $('#fileTree').empty();
     $('#fileTree').fileTree({ root: root, script: $SCRIPT_ROOT + "/readFolder", folderEvent: 'click', expandSpeed: 750,
       collapseSpeed: 750, multiFolder: false, selectFolder: false }, function(file) {
 
@@ -91,6 +140,55 @@ $(document).ready( function() {
 	}
     });
   }
+  function updateParameter(){
+    var xml = '<?xml version="1.0" encoding="utf-8"?>\n', software_type="";
+    if($("input#software_type").val() != "" && $("input#software_type").val() != "Software Type here..."){
+      software_type = +$("input#software_type").val();
+    }
+    xml +='<instance>\n';
+    var size = $("#partitionParameter > tbody > tr").length;
+    if(size > 1){
+      for(var i=2; i<=size; i++){
+        if($("input#txt_"+i).val() != ""){
+          xml +='<parameter id="'+$("input#txt_"+i).val()+'">'+$("textarea#value_"+i).val()+'</parameter>\n';
+        }
+      }
+    }
+    xml +='</instance>\n';
+    $.ajax({
+    type: "POST",
+  	url: $SCRIPT_ROOT + '/saveParameterXml',
+  	data: {software_type:software_type, parameter:xml},
+  	success: function(data){
+  	  if(data.code == 1){
+        $("#error").Popup("Instance parameters has been updated, please run your instance now!", {type:'confirm', duration:5000});
+  	  }
+      else{
+        $("#error").Popup(data.result, {type:'error', duration:5000});
+  	  }
+  	}
+    });
+  }
+  function loadParameter(){
+    $.ajax({
+    type: "GET",
+    url: $SCRIPT_ROOT + '/getParameterXml',
+  	success: function(data){
+  	  if(data.code == 1){
+        var dict=data.result['instance'];
+        for (propertie in dict){
+          $("#add_attribute").click();
+          var size = Number($("#partitionParameter > tbody > tr").last().attr('id').split('_')[1]);
+          $("input#txt_"+size).val(propertie);
+          $("textarea#value_"+size).val(dict[propertie]);
+        }
+  	  }
+      else{
+        $("#error").Popup(data.result, {type:'error', duration:5000});
+  	  }
+  	}
+    });
+  }
   function configRadio(){
   	$("#slappart li").each(function() {
       var $radio = $(this).find("input:radio");
@@ -107,6 +205,19 @@ $(document).ready( function() {
 			}
 		});
 	}
+  function setupBox(){
+    var state = $("#softwareType").css("display");
+    if (state == "none"){
+      $("#softwareType").slideDown("normal");
+      $("#softwareTypeHead").removeClass("hide");
+      $("#softwareTypeHead").addClass("show");
+    }
+    else{
+      $("#softwareType").slideUp("normal");
+      $("#softwareTypeHead").removeClass("show");
+      $("#softwareTypeHead").addClass("hide");
+    }
+  }
   function setupEditor(){
     editor = ace.edit("editor");
     editor.setTheme("ace/theme/crimson_editor");
@@ -121,8 +232,13 @@ $(document).ready( function() {
   function setupSlappart(){
     for(var i=0; i<partitionAmount; i++){
       var elt = $("#slappart"+i+"Parameter");
-      if(elt != undefined) elt.click(function(){
-        alert(elt.attr('id'));
+      var fileId = $("#slappart"+i+"Files");
+      if(elt && elt != undefined) elt.click(function(){
+        alert($(this).html());
+      });
+      if(fileId && fileId != undefined) fileId.click(function(){
+        $("#instancetabfiles").click();
+        setupFileTree($(this).attr("rel"));
       });
     }
   }

slapos/runner/templates/instanceInspect.html

@@ -19,14 +19,15 @@
 <div id="tabContaier">
     <ul>
       <li><a href="#tab1" class="active">Slapgrid Supervisor</a></li>
-      <li><a href="#tab2">SLAP Response & Parameters</a></li>
-      <li><a href="#tab3">Partitions Content</a></li>
+      <li><a href="#tab2">SLAP Response</a></li>
+      <li><a href="#tab3">Parameters</a></li>
+      <li><a href="#tab4" id="instancetabfiles">Partitions Content</a></li>
     </ul><!-- //Tab buttons -->
     <div class="tabDetails">
     	<div id="tab1" class="tabContents">
 	    <p>This tab show all process generated by slapgrid for your application. You can click on the process name to display log.</p>
 	    {% if supervisor %}
-	    <table cellpadding="0" cellspacing="0" width="100%">
+	    <table cellpadding="0" cellspacing="0" width="100%" id="supervisordcontent">
 	      <tr>
 		      <th>Partition and Process name</th><th>Status</th><th>Process PID </th><th> UpTime</th><th></th>
 	      </tr>
@@ -39,7 +40,10 @@
 	      </tr>
 	    {% endfor %}
 	    </table><br/>
-      <a href="{{ url_for('stopAllPartition') }}" class="lshare simple">Stop all process</a>
+      <a href="#" id="refresh" class="lshare simple no-right-border" style="float:left">Refresh Status</a>
+      <a href="{{ url_for('stopAllPartition') }}" class="lshare simple" style="float:left">Stop all process</a>
+      <img class="waitting" id="imgwaitting" src="{{ url_for('static', filename='images/waiting.gif') }}" alt="" />
+      <div class="clear"></div><br/>
 	    {% else %}
 	    <h2>No process to display, please run your instance</h2>
 	    {%endif%}
@@ -52,10 +56,10 @@
         {% for item in slap_status %}
         <div id="box{{item[0]}}" style="display:none;">
         {% if item[1] %}
-          <!--<h2><span style="float:left; margin-left:10px;" id="{{item[0]}}title">Slap Response for {{item[0]}}</span>
-            <a href="#" id="{{item[0]}}Parameter" rel="{{item[0]}}" class="lshare simple" style="float:right">SLAP Parameters</a>
-          </h2>-->
-          <h2>Slap Response for {{item[0]}}</h2>
+          <h2><span style="float:left; margin-left:10px;" id="{{item[0]}}title">Slap Response for {{item[0]}}</span>
+            <a href="#" id="{{item[0]}}Parameter" rel="{{item[0]}}" class="lshare simple" style="float:right">Parameters</a>
+            <a href="#" id="{{item[0]}}Files" rel="{{item[0]}}" class="lshare simple no-right-border" style="float:right">Files</a>
+          </h2>
           <div class="clear"></div><br/>
           <div id="bcontent{{item[0]}}">
             <table cellpadding="0" cellspacing="0" width="100%">
@@ -92,8 +96,34 @@
       {%endif%}
         </div><!-- end tab2 -->
     	<div id="tab3" class="tabContents">
-	    <div id="fileTree" class="file_tree_tabs"></div>
+      <div id="softwareType">
+        <h2 class='hight'>Software Type parameter</h2>
+        <div class="slidebox">
+          <label for="software_type">Software Type </label>
+          <input type="text" name="software_type" id="software_type" size="35" value="Software Type here..." />
+        </div>
+      </div>
+      <br/>
+      <div id="parameterkw">
+        <h2 class='hight'>Partitions Parameter</h2>
+        <div class="slidebox">
+    	    <table class="small" cellpadding="0" cellspacing="0" width="100%" id="partitionParameter">
+            <tr id="row_1">
+    		      <th width="150">Parameter Name</th><th>Parameter Value</th><th width="49">
+      	        <a href="#" class="link" id="add_attribute">[new]</a>
+    		      </th>
+    	      </tr>
+          </table>
+        </div>
+      </div>
+      <div style="margin-left:10px;"><a id="updateParameters" class="lshare simple">Update Values</a></div>
         </div><!-- end tab3 -->
+      <div id="tab4" class="tabContents">
+      <h2>File content for all your partitions</h2>
+      <div id="fileTree" class="file_tree_tabs" alt="Double click to open file"></div>
+      <br/>
+      <a href="#" id="reloadfiles" class="lshare simple">Reload Files</a>
+        </div><!-- end tab4 -->
     </div>
 </div>
 <!-- This contains the hidden content for inline calls -->

slapos/runner/utils.py

@@ -38,6 +38,15 @@ def html_escape(text):
   """Produce entities within text."""
   return "".join(html_escape_table.get(c,c) for c in text)
 
+def checkLogin(config, login, pwd):
+  if not os.path.exists(os.path.join(config['runner_workdir'], '.users')):
+    return False
+  user = open(os.path.join(config['runner_workdir'], '.users'), 'r').read().split(';')
+  salt = "runner81" #to be changed
+  current_pwd = hashlib.md5( salt + pwd ).hexdigest()
+  if current_pwd == user[1]:
+    return user
+  return False
 
 def updateProxy(config):
   if not os.path.exists(config['instance_root']):
@@ -82,12 +91,11 @@ def updateProxy(config):
   #get instance parameter
   param_path = os.path.join(config['runner_workdir'], ".parameter.xml")
   xml_result = readParameters(param_path)
+  partition_parameter_kw = None
   if type(xml_result) != type('') and xml_result.has_key('instance'):
     partition_parameter_kw = xml_result['instance']
-  else:
-    partition_parameter_kw = None
   computer.updateConfiguration(xml_marshaller.dumps(slap_config))
-  sr_request = slap.registerOpenOrder().request(profile, partition_reference=partition_reference,
+  sr_request = slap.registerOpenOrder().request(profile, partition_reference=getSoftwareReleaseName(config),
                 partition_parameter_kw=partition_parameter_kw, software_type=None,
                 filter_kw=None, state=None, shared=False)
   #open(param_path, 'w').write(xml_marshaller.dumps(sr_request.
@@ -107,6 +115,27 @@ def readPid(file):
 def writePid(file, pid):
   open(file, 'w').write(str(pid))
 
+def updateInstanceParameter(config, software_type=None):
+  slap = slapos.slap.slap()
+  slap.initializeConnection(config['master_url'])
+  partition_list = []
+  #Get current software release profile
+  try:
+    software_folder = open(os.path.join(config['runner_workdir'],
+                                        ".project")).read()
+    profile = realpath(config, os.path.join(software_folder,
+                                          config['software_profile']))
+  except:
+    return False
+  #get instance parameter
+  param_path = os.path.join(config['runner_workdir'], ".parameter.xml")
+  xml_result = readParameters(param_path)
+  partition_parameter_kw = None
+  if type(xml_result) != type('') and xml_result.has_key('instance'):
+    partition_parameter_kw = xml_result['instance']
+  slap.registerOpenOrder().request(profile, partition_reference=getSoftwareReleaseName(config),
+          partition_parameter_kw=partition_parameter_kw, software_type=software_type,
+          filter_kw=None, state=None, shared=False)
 
 def startProxy(config):
   proxy_pid = os.path.join(config['runner_workdir'], 'proxy.pid')
@@ -244,6 +273,7 @@ def runInstanceWithLock(config):
     logfile = open(config['instance_log'], 'w')
     if not updateProxy(config):
       return False
+    svcStopAll(config) #prevent lost control of process
     slapgrid = Popen([config['slapgrid_cp'], '-vc', config['configuration_file_path']], stdout=logfile)
     writePid(slapgrid_pid, slapgrid.pid)
     slapgrid.wait()
@@ -264,8 +294,7 @@ def getSlapStatus(config):
   try:
     for partition in computer.getComputerPartitionList():
       # Note: Internal use of API, as there is no reflexion interface in SLAP
-      partition_list.append((partition.getId(), partition._connection_dict.copy(),
-                              partition._parameter_dict.copy()))
+      partition_list.append((partition.getId(), partition._connection_dict.copy()))
   except Exception:
     pass
   if partition_list:
@@ -445,6 +474,14 @@ def getProjectTitle(config):
     return software + " (" + string.join(project[:(len(project) - 2)], '/') + ")"
   return "No Profile"
 
+def getSoftwareReleaseName(config):
+  sr_profile = os.path.join(config['runner_workdir'], ".project")
+  if os.path.exists(sr_profile):
+    project = open(sr_profile, "r").read().split("/")
+    software = project[len(project) - 2]
+    return software.replace(' ', '_')
+  return "No_name"
+
 def loadSoftwareData(runner_dir):
   import pickle
   file_path = os.path.join(runner_dir, '.softdata')

slapos/runner/views.py

@@ -11,6 +11,9 @@ app = Flask(__name__)
 
 @app.before_request
 def before_request():
+  if not session.has_key('account') and request.path != '/login' \
+    and request.path != '/doLogin' and not  request.path.startswith('/static'):
+    return redirect(url_for('login'))
   session['title'] = getProjectTitle(app.config)
 
 # general views
@@ -20,11 +23,24 @@ def home():
     return redirect(url_for('configRepo'))
   return render_template('index.html')
 
+@app.route("/login")
+def login():
+  return render_template('login.html')
+
 @app.route('/configRepo')
 def configRepo():
   public_key = open(app.config['public_key'], 'r').read()
   return render_template('cloneRepository.html', workDir='workspace', public_key=public_key)
 
+@app.route("/doLogin", methods=['POST'])
+def doLogin():
+  check_user = checkLogin(app.config, request.form['clogin'], request.form['cpwd'])
+  if not check_user:
+    return jsonify(code=0, result="Login or password is incorrect, please check it!")
+  else:
+    session['account'] = check_user
+    return jsonify(code=1, result=check_user)
+
 # software views
 @app.route('/editSoftwareProfile')
 def editSoftwareProfile():
@@ -93,6 +109,21 @@ def inspectInstance():
       file_path=file_content, supervisor=result, slap_status=getSlapStatus(app.config),
       supervisore=result, partition_amount=app.config['partition_amount'])
 
+@app.route('/supervisordStatus', methods=['GET'])
+def supervisordStatus():
+  result = getSvcStatus(app.config)
+  if not (result):
+    return jsonify(code=0, result="")
+  html = "<tr><th>Partition and Process name</th><th>Status</th><th>Process PID </th><th> UpTime</th><th></th></tr>"
+  for item in result:
+    html += "<tr>"
+    html +="<td  class='first'><b><a href='" + url_for('tailProcess', process=item[0])+"'>"+item[0]+"</a></b></td>"
+    html +="<td align='center'><a href='"+url_for('startStopProccess', process=item[0], action=item[1])+"'>"+item[1]+"</a></td>"
+    html +="<td align='center'>"+item[3]+"</td><td>"+item[5]+"</td>"
+    html +="<td align='center'><a href='"+url_for('startStopProccess', process=item[0], action='RESTART')+"'>Restart</a></td>"
+    html +="</tr>"
+  return jsonify(code=1, result=html)
+
 @app.route('/removeInstance')
 def removeInstance():
   if isInstanceRunning(app.config):
@@ -360,7 +391,7 @@ def getPath():
     return jsonify(code=1, result=realfile)
 
 @app.route("/saveParameterXml", methods=['POST'])
-def redParameterXml():
+def saveParameterXml():
   project = os.path.join(app.config['runner_workdir'], ".project")
   if not os.path.exists(project):
     return jsonify(code=0, result="Please first open a Software Release")
@@ -370,20 +401,23 @@ def redParameterXml():
   f.write(content)
   f.close()
   result = readParameters(param_path)
+  software_type = None
+  if(request.form['software_type']):
+    software_type = request.form['software_type']
   if type(result) == type(''):
     return jsonify(code=0, result="XML Error: " + result)
   else:
     try:
-      updateProxy(app.config)
-    except Exeption:
-      return jsonify(code=0, result="An error occurred while applying your settings!")
+      updateInstanceParameter(app.config, software_type)
+    except Exception, e:
+      return jsonify(code=0, result="An error occurred while applying your settings!<br/>" + str(e))
     return jsonify(code=1, result="")
 
 @app.route("/getParameterXml", methods=['GET'])
 def getParameterXml():
   param_path = os.path.join(app.config['runner_workdir'], ".parameter.xml")
-  if os.path.exists(param_path):
-    content = open(param_path, 'r').read()
-    return html_escape(content)
+  parameters = readParameters(param_path)
+  if type(parameters) != type(''):
+    return jsonify(code=1, result=parameters)
   else:
-    return "&lt;?xml version='1.0' encoding='utf-8'?&gt;"
+    return jsonify(code=0, result=parameters)
\ No newline at end of file