From: Loic Baron <loic.baron@lip6.fr>
Date: Thu, 14 Aug 2014 17:39:59 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.0~9
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4f412c5d376e32ebace33044d493b59db70761c5;hp=2c1bd9325dc325f82d99807fcdb9d14ae148f167;p=unfold.git

Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
---

diff --git a/myslice/monitor.ini.dist b/myslice/monitor.ini.dist
index f46e9ab7..4613e1a1 100644
--- a/myslice/monitor.ini.dist
+++ b/myslice/monitor.ini.dist
@@ -18,7 +18,7 @@ url = https://nitlab.inf.uth.gr:8001/RPC2
 type = am
 
 [iotlab]
-name = FIT-IoTLab
+name = FIT IoT-Lab
 url = http://194.199.16.169:52347
 type = am
 
diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 83f1d10e..aceb6f44 100644
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -23,6 +23,13 @@ a.current {
     text-decoration:underline;
     color:#333333;
 }
+p.command {
+    padding:15px;
+    margin:15px 0;
+    color:#890000;
+    background-color:#E0E0E0;
+    font-family:Courier, monospace;
+}
 h1 {
     border-bottom:1px solid #DDDDDD;
     padding:0 0 0 0;
diff --git a/portal/templates/_widget-monitor.html b/portal/templates/_widget-monitor.html
index 93dea378..cb7af4fc 100644
--- a/portal/templates/_widget-monitor.html
+++ b/portal/templates/_widget-monitor.html
@@ -13,7 +13,6 @@
 <script>
 	$(document).ready(function() {
 		$.get('/monitor/services', function(result) {
-			console.log(result);
 			for (var r in result) {
 				html = '<div class="col-xs-6 col-sm-4 col-md-3 s-monitor"><div class="row">';
 				html += '<div class="col-md-2"><img src="{{ STATIC_URL }}icons/'+result[r].status+'.png"></div>';
diff --git a/portal/templates/slice-tab-experiment.html b/portal/templates/slice-tab-experiment.html
index db9b2823..55b27531 100644
--- a/portal/templates/slice-tab-experiment.html
+++ b/portal/templates/slice-tab-experiment.html
@@ -1,8 +1,77 @@
 <div class="col-md-2">
 </div>
 <div class="col-md-8">
-	<h2>Secure Shell (SSH)</h2>
-	<p><img src="{{ STATIC_URL }}img/terminal_icon.png" width="50"></p>
+	<h2>How to access your slice</h2>
+	<h3>PlanetLab Europe</h3>
+	
+	<p>
+		PlanetLab Europe resources are accessible directly via SSH. Your SSH public key is deployed automatically
+		on the reserved nodes. To access your slice on a resource just type the following command:
+	</p>
+	<p class="command">
+		$ ssh your_slice_name@planetlab-resource.hostname.com
+	</p>
+	<p>
+		Be aware that after you reserve a PlanetLab Europe resource your slice will be deployed with a delay of about 15 minutes, 
+		after witch you will be able to access the resource.
+	</p>
+	
+	<h3>FIT IoT-Lab</h3>
+	
+	<h3>NITOS</h3>
+	
+	<p>
+	 NITOS resources are not directly accessible. You will need to log in on a gateway server and from there access the node.
+	 The NITO server address is nitlab.inf.uth.gr, so to connect to the NITOS server:
+	</p>
+	<p class="command">
+	$ ssh your_slice_name@nitlab.inf.uth.gr
+	</p>
+	
+	<p>
+	<!-- In order to connect to NITOS server he has to upload his public key on the server. 
+	For now we do it this way: http://nitlab.inf.uth.gr/NITlab/index.php/your-ssh-keys. 
+	I think this is a procedure that needs to be done at the registration phase of the user, 
+	through myslice, Broker etc. but I will answer you in a couple of days for sure. -->
+	</p>
+
+	<p>
+		You will then need to prepare the resource by loading an OMF image on it:
+	</p>
+	
+	<p class="command">
+		$ omf load -i baseline_grid.ndz -t omf.nitos.node016
+	</p>
+
+	<p>
+		Turn on the node:
+	</p>
+	
+	<p class="command">
+		$ omf tell -a on -t omf.nitos.node016
+	</p>
+	<p>
+		And finally ssh on the node:
+	</p>
+	<p class="command">
+		$ ssh root@node016
+	</p>
+	<p>
+		On the node itself you will have to modify the file /etc/omf-resctl-5.3/omf-resctl.yaml according to your slice settings and then
+		restart the OMF Resource Controller and finally execute the experiment:
+	</p>
+	<p class="command">
+		$ omf exec --slice slice_name your_exp.rb
+	</p>
+	<p>
+	The complete tutorial is available at the following address:
+	<a target="_blank" href="http://nitlab.inf.uth.gr/NITlab/index.php/testbed/instructions/basic-tutorial">NITOS basic tutorial</a>
+	</p>
+	
+	<br />
+	
+	<h2>Available Tools</h2>
+	<p><img src="{{ STATIC_URL }}img/terminal_icon.png" width="50"> <b>SSH</b></p>
 	<p>
 	Secure Shell (SSH) is a cryptographic network protocol for secure data communication, remote command-line login, remote command execution, and other secure network services between two networked computers that connects, via a secure channel over an insecure network, a server and a client (running SSH server and SSH client programs, respectively). The protocol specification distinguishes between two major versions that are referred to as SSH-1 and SSH-2.
 	</p>