More view updates

This commit is contained in:
Deon George 2012-11-28 13:34:39 +11:00
parent e00c3751de
commit 808730e1e3
6 changed files with 75 additions and 5 deletions

View File

@ -24,6 +24,7 @@ class Model_STGPOOL extends TSM_ORM {
'COPYGROUP_BU'=>array('foreign_key'=>'DESTINATION','far_key'=>'STGPOOL_NAME'), 'COPYGROUP_BU'=>array('foreign_key'=>'DESTINATION','far_key'=>'STGPOOL_NAME'),
'MGMTCLASS'=>array('foreign_key'=>'MIGDESTINATION','far_key'=>'STGPOOL_NAME'), 'MGMTCLASS'=>array('foreign_key'=>'MIGDESTINATION','far_key'=>'STGPOOL_NAME'),
'VOLUME'=>array('foreign_key'=>'STGPOOL_NAME','far_key'=>'STGPOOL_NAME'), 'VOLUME'=>array('foreign_key'=>'STGPOOL_NAME','far_key'=>'STGPOOL_NAME'),
'OCC'=>array('foreign_key'=>'STGPOOL_NAME','far_key'=>'STGPOOL_NAME'),
); );
// Return a list of volumes // Return a list of volumes

View File

@ -16,7 +16,7 @@ return array(
'client_type' => 'dsmadmc', 'client_type' => 'dsmadmc',
'client_errorlogname' => '/tmp/pta-tsm-errorlog.log', 'client_errorlogname' => '/tmp/pta-tsm-errorlog.log',
'date_format' => 'd-m-Y', 'date_format' => 'd-m-Y',
'tsmdatatypes' => array('Bkup'=>'BACKUP','Arch'=>'ARCHIVE'), 'tsmdatatypes' => array('Bkup'=>'BACKUP','Arch'=>'ARCHIVE','SpMg'=>'SPACE MANAGED'),
'tsmdbtypes' => array('BACKUPFULL','BACKUPINCR','DBSNAPSHOT'), 'tsmdbtypes' => array('BACKUPFULL','BACKUPINCR','DBSNAPSHOT'),
'tsmpooltypes' => array('PRIMARY','ACTIVEDATA','COPY'), 'tsmpooltypes' => array('PRIMARY','ACTIVEDATA','COPY'),
'tsmvolstatus' => array('FULL','FILLING','PENDING','EMPTY'), 'tsmvolstatus' => array('FULL','FILLING','PENDING','EMPTY'),

View File

@ -82,7 +82,7 @@
<?php $i=0; foreach ($do->getStoragePoolsType($btype,$type) as $spo) { ?> <?php $i=0; foreach ($do->getStoragePoolsType($btype,$type) as $spo) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>"> <tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td colspan="2">&nbsp;</td> <td colspan="2">&nbsp;</td>
<td class="data"><?php echo $spo->STGPOOL_NAME; ?></td> <td class="data"><?php echo HTML::anchor('stgpool/detail/'.$spo->STGPOOL_NAME,$spo->display('STGPOOL_NAME')); ?></td>
<td class="data-right"><?php echo $spo->display('NUMSCRATCHUSED'); ?></td> <td class="data-right"><?php echo $spo->display('NUMSCRATCHUSED'); ?></td>
<td class="data-right"><?php echo $spo->display('MAXSCRATCH'); ?></td> <td class="data-right"><?php echo $spo->display('MAXSCRATCH'); ?></td>
<td class="data-right"><?php echo $spo->display('ACCESS'); ?></td> <td class="data-right"><?php echo $spo->display('ACCESS'); ?></td>
@ -90,7 +90,7 @@
<td class="data-right"><?php echo $spo->display('PCT_UTILIZED'); ?></td> <td class="data-right"><?php echo $spo->display('PCT_UTILIZED'); ?></td>
<td class="data-right"><?php echo $spo->display('PCT_MIGR'); ?></td> <td class="data-right"><?php echo $spo->display('PCT_MIGR'); ?></td>
<td class="data-right"><?php printf('%s/%s',$spo->HIGHMIG,$spo->LOWMIG); ?></td> <td class="data-right"><?php printf('%s/%s',$spo->HIGHMIG,$spo->LOWMIG); ?></td>
<td class="data-right"><?php echo $spo->display('NEXTSTGPOOL'); ?></td> <td class="data-right"><?php echo $spo->NEXTSTGPOOL ? HTML::anchor('stgpool/detail/'.$spo->NEXTSTGPOOL,$spo->display('NEXTSTGPOOL')) : '&nbsp;'; ?></td>
<td class="data-right"><?php echo count($do->getStorageModeNodes($btype,$type,$spo)); ?></td> <td class="data-right"><?php echo count($do->getStorageModeNodes($btype,$type,$spo)); ?></td>
<td class="data-right"><?php echo count($do->getStorageModeVols($ctype,$type,$spo)); ?></td> <td class="data-right"><?php echo count($do->getStorageModeVols($ctype,$type,$spo)); ?></td>
<td class="data-right"><?php echo $do->getStorageModeFiles($btype,$type,$spo); ?></td> <td class="data-right"><?php echo $do->getStorageModeFiles($btype,$type,$spo); ?></td>

View File

@ -107,4 +107,41 @@
&nbsp; &nbsp;
</td> </td>
</tr> </tr>
<tr>
<td style="width: 50%; vertical-align: top;">
<table class="box-full">
<tr>
<td class="head" colspan="2">HSM Information</td>
</tr>
<?php if ($node->getStoragePools('SpMg')) { ?>
<tr>
<td class="spacer">&nbsp;</td>
</tr>
<tr>
<td>File Space</td>
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
if (count($pools = $node->getStoragePoolsType('SpMg',$type)))
foreach ($pools as $pool_name) { ?>
<td class="right"><?php echo $pool_name; ?> <span style="vertical-align: super; font-size: 60%;"><?echo $type; ?></span></td>
<?php } ?>
</tr>
<?php $i=0;foreach ($node->FILESPACE->find_all() as $fso) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="data"><?php echo $fso->display('FILESPACE_NAME'); ?></td>
<?php foreach (Kohana::$config->load('config')->tsmpooltypes as $type)
if (count($pools = $node->getStoragePoolsType('SpMg',$type)))
foreach ($pools as $pool_name) { ?>
<td class="data-right"><?php echo number_format($fso->pool_logical_util($pool_name,'SpMg'),2); ?> (<?php echo $fso->pool_numvols($pool_name,'SPACE MANAGED'); ?>)</td>
<?php } ?>
</tr>
<?php } ?>
<?php } else { ?>
<tr><td>There is NO HSM Data for this Node.</td></tr>
<?php } ?>
</table>
</td>
<td style="width: 50%; vertical-align: top;">
&nbsp;
</td>
</tr>
</table> </table>

View File

@ -4,7 +4,7 @@
<td style="width: 100%; vertical-align: top;"> <td style="width: 100%; vertical-align: top;">
<table class="box-full"> <table class="box-full">
<tr> <tr>
<td class="head" colspan="2"><?php echo $ctype=='BACKUP' ? _('Backup Volumes') : _('Archive Volumes'); ?></td> <td class="head" colspan="2"><?php echo $ctype.' '._('Volumes'); ?></td>
</tr> </tr>
<?php if ($node->volumes($ctype)) { ?> <?php if ($node->volumes($ctype)) { ?>
<tr> <tr>
@ -41,7 +41,7 @@
<?php } ?> <?php } ?>
<?php } ?> <?php } ?>
<?php } else { ?> <?php } else { ?>
<tr><td><?php echo $ctype=='BACKUP' ? _('There are NO Backup Volumes for this Node.') : _('There are NO Archive Volumes for this Node.'); ?></td></tr> <tr><td><?php echo _('There are NO volumes for this Node.'); ?></td></tr>
<?php } ?> <?php } ?>
</table> </table>
</td> </td>

View File

@ -270,4 +270,36 @@
</table> </table>
</td> </td>
</tr> </tr>
<tr>
<td style="width: 100%; vertical-align: top;" colspan="2">
<table class="box-full">
<tr>
<td class="head" colspan="5">Nodes with data in this Storage Pool</td>
</tr>
<tr>
<td class="spacer">&nbsp;</td>
</tr>
<tr>
<td>Node</td>
<td>Type</td>
<td>File Space</td>
<td>Num Files</td>
<td>Physical</td>
<td>Logical</td>
<td>Reporting</td>
</tr>
<?php $i=0; foreach ($so->OCC->find_all() as $oo) { ?>
<tr class="<?php echo $i++%2 ? 'odd' : 'even'; ?>">
<td class="data"><?php echo HTML::anchor('node/detail/'.$oo->NODE_NAME,$oo->NODE_NAME); ?></td>
<td class="data"><?php echo $oo->display('TYPE'); ?></td>
<td class="data"><?php echo $oo->display('FILESPACE_NAME'); ?></td>
<td class="data"><?php echo $oo->display('NUM_FILES'); ?></td>
<td class="data"><?php echo $oo->display('PHYSICAL_MB'); ?></td>
<td class="data"><?php echo $oo->display('LOGICAL_MB'); ?></td>
<td class="data"><?php echo $oo->display('REPORTING_MB'); ?></td>
</tr>
<?php } ?>
</table>
</td>
</tr>
</table> </table>