slice view experiment tab adding terminal icon

diff --git a/portal/static/img/terminal_icon.png b/portal/static/img/terminal_icon.png
new file mode 100644 (file)
index 0000000..95e7623
Binary files /dev/null and b/portal/static/img/terminal_icon.png differ

diff --git a/portal/templates/slice-tab-experiment.html b/portal/templates/slice-tab-experiment.html
index 563cb90..db9b282 100644 (file)
--- a/portal/templates/slice-tab-experiment.html
+++ b/portal/templates/slice-tab-experiment.html
@@ -2,25 +2,23 @@
 </div>
 <div class="col-md-8">
        <h2>Secure Shell (SSH)</h2>
+       <p><img src="{{ STATIC_URL }}img/terminal_icon.png" width="50"></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>
        <p> More Info: <a href="http://en.wikipedia.org/wiki/Secure_Shell" target="_blank">http://en.wikipedia.org/wiki/Secure_Shell</a></p>
-       
-       
-       <p><img src="{{ STATIC_URL }}img/nepi_logo.png" height="50" width="80"></p>
+       <br>
+       <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><img src="{{ STATIC_URL }}img/omf-logo.png" height="50" width="80"></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>
        <p>
        OMF was originally developed for the ORBIT wireless testbed at Winlab, Rutgers University. Since 2007, OMF has been actively extended to operate on testbeds with many different type of network and resource technologies. It is now deployed and used on different testbeds in Australia, Europe, and in the U.S. OMF is currently being extended further to support exciting new features and technologies. This website is hosting this ongoing activity. OMF development is now conducted essentially within the TEMPO project at NICTA (Australia) in strong collaboration with Winlab (Rutgers University).
        </p>
-       
        <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">

diff --git a/rest/__init__.py b/rest/__init__.py
index 3c4eb5f..faef22e 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -50,7 +50,7 @@ class ObjectRequest(object):
                 self.fields = ['user_id', 'email', 'password', 'config','status'];
             elif table == "account":
                 # XXX TODO: Multiple key for account = (platform_id, user_id)
-                self.id = None
+                self.id = "platform_id, user_id"
                 self.fields = ['platform_id', 'user_id', 'auth_type', 'config'];
             elif table == "platform":
                 self.id = 'platform'
@@ -141,7 +141,10 @@ class ObjectRequest(object):
             print "query = ",query
         else:
             raise Exception, "Params are required for update"
-        
+
+        if self.id is not None:
+           query.select(self.id)
+       
         return execute_query(self.request, query)
     
     def delete(self):