Merge pull request #12 from grycap/devel

Add the TOSCA outputs
grycap · Mar 4, 2016 · 618f081 · 618f081
2 parents aa600c8 + cd9d604
commit 618f081
Show file tree

Hide file tree

Showing 4 changed files with 185 additions and 2 deletions.
diff --git a/getcontmsg.php b/getcontmsg.php
@@ -85,7 +85,7 @@
 <div id='cssmenutab'>
 <ul>
    <li><a href='list.php'><span>List</span></a></li>
-   <li class='active'><a><span>Inf id: 0</span></a></li>
+   <li class='active'><a><span>Inf id: <?php echo $id;?></span></a></li>
 </ul>
 </div>
 </div>

diff --git a/getoutputs.php b/getoutputs.php
@@ -0,0 +1,151 @@
+<?php
+/*
+ IM - Infrastructure Manager
+ Copyright (C) 2011 - GRyCAP - Universitat Politecnica de Valencia
+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+    if(!isset($_SESSION)) session_start();
+
+    include('user.php');
+    if (!check_session_user()) {
+	header('Location: index.php?error=Invalid User');
+    } else {
+        if (isset($_GET['id'])) {
+        	include('im.php');
+        	include('config.php');
+        	$id = $_GET['id'];
+        	$outputs = GetOutputs($im_host,$im_port,$id);
+        }
+
+?>
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE10" >
+<title>Infrastructure Manager | GRyCAP | UPV</title>
+<link rel="shortcut icon" href="images/favicon.ico">
+<link href="css/style.css" rel="stylesheet" type="text/css" media="all"/>
+    <link rel="stylesheet" href="css/style_login2.css"> 
+    <link rel="stylesheet" href="css/style_intro2.css"> 
+    <link rel="stylesheet" href="css/style_menu2.css">
+    <link rel="stylesheet" href="css/style_menutab.css">
+
+
+
+</head>
+<body>
+
+    <?php include('radl.php')?>
+
+
+
+<div id="caja_total_blanca">
+
+
+
+
+
+		<?php include('header.php')?>		
+		<?php $menu="Infrastructures";include('menu.php');?>
+		<?php include('footer.php')?>	
+
+
+
+
+
+
+
+<div id="caja_titulo">
+	<div id="texto_titulo">
+	Infrastructure Manager > Infrastructures&nbsp&nbsp&nbsp<img class="imagentitulo" src="images/icon_infra_gran.png">
+	</div>
+</div>
+
+
+<div id="caja_contenido_menutab">	
+
+<div id='cssmenutab'>
+<ul>
+   <li><a href='list.php'><span>List</span></a></li>
+   <li class='active'><a><span>Inf id: <?php echo $id;?></span></a></li>
+</ul>
+</div>
+</div>
+
+
+<div id="caja_contenido_tab">	
+
+
+    <div id="main">
+
+
+        <div class='h1'>:: TOSCA outputs::</div>
+		<br>
+        <div id='log'>
+
+ <table class="list" style="width:100%;margin-left: 0px;">
+	<tbody>
+		<tr>
+		  <td style="width:10px;background:#a27c3b;"><img src="images/icon_info.png"></td>
+                <th style="width:90px;">Outputs</th>
+                <td style="text-align:left;background:#e9d6b5;">
+                	<table>
+
+<?php
+					foreach ($outputs as $key => $value) {
+?>
+                	<tr>
+                	<td>
+                	<?php echo $key;?>
+                	</td>
+                	<td>
+                	<?php
+                	if (preg_match("@^(?:[^.]://)?([^/]+)@i", $value)) {
+                		echo "<a href='", $value, "' target='_blank'>", $value, "</a>";
+                	} else {
+                		echo $value;
+                	}
+                	?>
+                	</td>
+                	</tr>
+<?php
+					}
+?>
+                	</table>
+                </td>
+		</tr>
+	</tbody>
+ </table>
+
+		</div>
+
+
+</div>
+
+        </form>
+
+
+ </div>
+
+</body>
+</html>
+<?php
+    }
+?>
+
+
+
+
diff --git a/im-rest.php b/im-rest.php
@@ -203,4 +203,9 @@ function Reconfigure($host, $port, $inf_id, $radl) {
 	$res = BasicRESTCall("PUT", $host, $port, '/infrastructures/' . $inf_id . '/reconfigure', $radl, $headers);
 	return $res->getOutput();
 }
+
+function GetOutputs($host, $port, $inf_id) {
+	$res = BasicRESTCall("GET", $host, $port, '/infrastructures/' . $inf_id . '/outputs');
+	return json_decode($res->getOutput());
+}
 ?>
diff --git a/list.php b/list.php
@@ -89,7 +89,6 @@
 
 
   <div id="main">
-
 
     <?php
         if (count($res) > 0)
@@ -112,6 +111,14 @@ function confirm_delete(url, id) {
                             { "bSortable": true },
                             { "bSortable": false },
                             { "bSortable": false },
+                            	<?php
+                                    if ($im_use_rest)
+                                    {
+                                ?>
+                                { "bSortable": false },
+                                <?php
+                                    }
+                                ?>
                             { "bSortable": true },
                             { "bSortable": false },
                             { "bSortable": false },
@@ -136,6 +143,16 @@ function confirm_delete(url, id) {
                 <th>
                 VM IDs
                 </th>
+				<?php
+				if ($im_use_rest)
+				{
+				?>
+                <th width="100px">
+                Outputs
+                </th>
+				<?php
+				}
+				?>
                 <th width="100px">
                 Cont. Message
                 </th>
@@ -179,6 +196,16 @@ function confirm_delete(url, id) {
                     }
 ?>
                 </td>
+		<?php
+		if ($im_use_rest)
+		{
+		?>
+		<td>
+				<a href="getoutputs.php?id=<?php echo $inf;?>">Show</a>
+		</td>
+		<?php
+		}
+		?>
 		<td>
 				<a href="getcontmsg.php?id=<?php echo $inf;?>">Show</a>
 		</td>