X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Ftemplates%2Fslice-tab-experiment.html;h=34873daea9f3c9ffad691dbaf8b9e08a1e4b35e3;hb=fce3531291a0c584c0ed6c93dcc135469ce3fa9d;hp=4d58fe510c1e8f6398c29a034dd39a34978d3c19;hpb=74b487f012db9d16fbb79ce99bf172f7f45005f9;p=unfold.git

diff --git a/portal/templates/slice-tab-experiment.html b/portal/templates/slice-tab-experiment.html
index 4d58fe51..34873dae 100644
--- a/portal/templates/slice-tab-experiment.html
+++ b/portal/templates/slice-tab-experiment.html
@@ -1,6 +1,4 @@
-<div class="col-md-2">
-</div>
-<div class="col-md-8">
+<div class="col-md-10 col-md-offset-1">
 	<h2>How to access your slice</h2>
 	<h3>PlanetLab Europe</h3>
 	
@@ -8,14 +6,23 @@
 		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>
+	{%if ple_resources%}
 	<p class="command">
-		$ ssh converted_slice_name@planetlab-resource.hostname.com
-	</p>
-	<p>You need to convert your typical slicename into a specific format in order to do SSH. An example below will demonstrate the conversion:</p>
-	<p class="command">
-		Typical slice_name = onelab.upmc.mytestslice<br>
-		converted_slice_name = onelab8upmc_mytestslice
-	</p>
+	{%for resource in ple_resources %}
+		$ ssh {{ple_slicename}}@{{resource}}<br>
+	{%endfor%}
+	</p>
+	 <h4>Windows users</h4>
+	 <p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
+	{%else%}
+		<p><b>NOTE:</b> You did not reserve any PLE resources yet. Once reserved, you will get the actual SSH command. A specimen command is given below:</p>
+		<p class="command">
+    		$ ssh {{ple_slicename}}@planetlab-resource.hostname.com<br>
+		</p>
+	{%endif%}
+	<h4>Windows users</h4>
+	<p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
+	<p><strong>NOTE:</strong> Your original slicename <b>{{slicename}}</b> has been converted to PlanetLab specific format <b>{{ple_slicename}}</b> in order to do SSH.</p>
 	<p>Please note that the first '.' is replaced by number 8 and the rest of the dot/s are replaced by underscore/s.</p>
 	<p>
 		Be aware that after you reserve a PlanetLab Europe resource your slice will be deployed with a delay of about 15 minutes, 
@@ -28,19 +35,29 @@
 		the following command:
 	</p>
 	<p class="command">
-		ssh onelab_username@fit3-dev.inrialpes.fr
+		ssh {{username}}@fit3-dev.inrialpes.fr
 	</p>
-	
+	<h4>Windows users</h4>
+	<p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></p>
+
 	<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 NITOS server address is nitlab.inf.uth.gr, so to connect to the NITOS server:
+	 You will find the ssh commands to connect to NITOS nodes below:
 	</p>
+	<h4>NITLab</h4>
 	<p class="command">
-	$ ssh your_slice_name@nitlab.inf.uth.gr
+	$ ssh {{slicename}}@nitlab.inf.uth.gr
 	</p>
-	
+	<h4>FIT NITOS-Lab Paris</h4>
+	 <p class="command">
+ 	$ ssh {{slicename}}@griffin.ipv6.lip6.fr
+	 </p>
+
+	 <h5>Windows users</h5>
+	 <p>Use <a href="http://www.putty.org/" target="_blank">SSH client.</a></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. 
@@ -53,7 +70,7 @@
 	</p>
 	
 	<p class="command">
-		$ omf load -i baseline_grid.ndz -t omf.nitos.node016
+		$ omf load -i baseline_grid.ndz -t node016
 	</p>
 
 	<p>
@@ -61,7 +78,7 @@
 	</p>
 	
 	<p class="command">
-		$ omf tell -a on -t omf.nitos.node016
+		$ omf tell -a on -t node016
 	</p>
 	<p>
 		And finally ssh on the node:
@@ -80,6 +97,7 @@
 	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>
+	<p>To learn more about OMF6, please click <a href="http://omf.mytestbed.net/projects/omf6/wiki/Wiki" target="_blank">here.</a></p>
 	
 	<br />
 	
@@ -88,12 +106,17 @@
 	<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>
-	<p> More Info: <a href="http://en.wikipedia.org/wiki/Secure_Shell" target="_blank">http://en.wikipedia.org/wiki/Secure_Shell</a></p>
+	<p> More info: <a href="http://en.wikipedia.org/wiki/Secure_Shell" target="_blank">http://en.wikipedia.org/wiki/Secure_Shell</a></p>
 	<br>
+	<p><img src="{{ STATIC_URL }}img/putty-logo.png" width="50"> <b>PuTTY</b></p>
+	<p>
+		PuTTY is an SSH and telnet client, developed originally by Simon Tatham for the Windows platform. PuTTY is open source software that is available with source code and is developed and supported by a group of volunteers.
+	</p>
+	<p>More info: <a href="http://www.putty.org/" target="_blank">http://www.putty.org/</a></p>	
 	<br>
 	<p><img src="{{ STATIC_URL }}img/nepi_logo.png" width="90"></p>
 	<p>NEPI, the Network Experimentation Programming Interface, is a life-cycle management tool for network experiments. The idea behind NEPI is to provide a single tool to design, deploy, and control network experiments, and gather the experiment results. Going further, NEPI was specially conceived to function with arbitrary experimentation platforms, so researchers could use a single tool to work with network simulators, emulators, or physical testbeds, or even a mixture of them. To accomplish this, NEPI provides a high-level interface to describe experiments that is independent from any experimentation platform, but is able to capture platform specific configurations. Experiment definitions can be stored in XML format to be later reproduced, and modified according to experimentation needs. Experiment execution is orchestrated by a global experiment controller, that is platform independent, and different platform-dependent testbed controllers, creating a control hierarchy that is able t adapt to platform specific requirements while providing an integrated control scheme.</p>
-	<p> More Info: <a href="http://nepi.inria.fr" target="_blank">http://nepi.inria.fr</a></p>
+	<p> More info: <a href="http://nepi.inria.fr" target="_blank">http://nepi.inria.fr</a></p>
 	<br>
 	<p><img src="{{ STATIC_URL }}img/omf-logo.png" width="90"></p>
 	<p>OMF is a Testbed Control, Measurement and Management Framework.</p>
@@ -103,5 +126,3 @@
 	<p>In addition to the main OMF software, this site also hosts OMF sub-projects addressing various related aspects of a testbed's control, measurement, and management.</p>
 	<p>More Info: <a href="http://mytestbed.net/projects/omf" target="_blank">http://mytestbed.net/projects/omf</a></p>
 </div>
-<div class="col-md-2">
-</div>