Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
1f557dfd
Commit
1f557dfd
authored
Nov 28, 2001
by
Leigh B. Stoller
Browse files
Add virtual node name to table (when reserved of course) as per Dave's
request.
parent
a012993a
Changes
2
Hide whitespace changes
Inline
Side-by-side
www/nodecontrol_form.php3
View file @
1f557dfd
...
...
@@ -24,7 +24,9 @@ if (!isset($node_id) ||
# Check to make sure that this is a valid nodeid
#
$query_result
=
DBQueryFatal
(
"SELECT * FROM nodes WHERE node_id='
$node_id
'"
);
DBQueryFatal
(
"select n.*,r.vname from nodes as n "
.
"left join reserved as r on n.node_id=r.node_id "
.
"where n.node_id='
$node_id
'"
);
if
(
mysql_num_rows
(
$query_result
)
==
0
)
{
USERERROR
(
"The node
$node_id
is not a valid nodeid!"
,
1
);
}
...
...
@@ -43,6 +45,7 @@ if (! $isadmin) {
$node_id
=
$row
[
node_id
];
$type
=
$row
[
type
];
$vname
=
$row
[
vname
];
$def_boot_osid
=
$row
[
def_boot_osid
];
$def_boot_path
=
$row
[
def_boot_path
];
$def_boot_cmd_line
=
$row
[
def_boot_cmd_line
];
...
...
@@ -94,6 +97,15 @@ echo "<tr>
</td>
</tr>
\n
"
;
if
(
$vname
)
{
echo
"<tr>
<td>Virtual Name:</td>
<td class=left>
<input type=readonly name=vname value='
$vname
'>
</td>
</tr>
\n
"
;
}
echo
"<tr>
<td>Node Type:</td>
<td class=
\"
left
\"
>
...
...
www/showstuff.php3
View file @
1f557dfd
...
...
@@ -882,7 +882,9 @@ function SHOWIMAGEID($imageid, $edit) {
#
function
SHOWNODE
(
$node_id
)
{
$query_result
=
DBQueryFatal
(
"SELECT * FROM nodes WHERE node_id='
$node_id
'"
);
DBQueryFatal
(
"select n.*,r.vname from nodes as n "
.
"left join reserved as r on n.node_id=r.node_id "
.
"where n.node_id='
$node_id
'"
);
if
(
mysql_num_rows
(
$query_result
)
==
0
)
{
TBERROR
(
"The node
$node_id
is not a valid nodeid!"
,
1
);
...
...
@@ -892,6 +894,7 @@ function SHOWNODE($node_id) {
$node_id
=
$row
[
node_id
];
$type
=
$row
[
type
];
$vname
=
$row
[
vname
];
$bios
=
$row
[
bios_version
];
$def_boot_osid
=
$row
[
def_boot_osid
];
$def_boot_path
=
$row
[
def_boot_path
];
...
...
@@ -928,7 +931,14 @@ function SHOWNODE($node_id) {
echo
"<tr>
<td>Node ID:</td>
<td class=left>
$node_id
</td>
</tr>
\n
"
;
</tr>
\n
"
;
if
(
$vname
)
{
echo
"<tr>
<td>Virtual Name:</td>
<td class=left>
$vname
</td>
</tr>
\n
"
;
}
echo
"<tr>
<td>Node Type:</td>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment