From 7be397c997baf538c4919d1d9fade26caf027fbb Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Tue, 27 Nov 2007 16:00:27 +0000 Subject: [PATCH] Moved most web interface files into the proper subdirs git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@85 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-web/{ => config}/prefs.php | 13 +- xCAT-web/config/site.php | 11 ++ xCAT-web/deploy/osimages.php | 11 ++ xCAT-web/images/topl.jpg | Bin 0 -> 5841 bytes xCAT-web/images/topr.jpg | Bin 0 -> 5449 bytes .../images/{xCAT_icon.gif => xCAT_icon-l.gif} | Bin xCAT-web/index.php | 86 +----------- xCAT-web/jobs/overview.php | 11 ++ xCAT-web/lib/functions.php | 80 ++++++++--- xCAT-web/{ => lib}/phpinfo.php | 0 xCAT-web/lib/style.css | 77 +++++++---- xCAT-web/{ => machines}/dsh.php | 56 ++------ xCAT-web/{ => machines}/dsh_action.php | 0 xCAT-web/{rack.php => machines/frames.php} | 7 +- xCAT-web/machines/groups.php | 8 +- xCAT-web/node_table.html | 31 ----- xCAT-web/nodes.html | 61 -------- xCAT-web/suggestions.html | 130 ------------------ xCAT-web/support/about.php | 20 +++ xCAT-web/support/diagnose.php | 11 ++ xCAT-web/support/suggest.php | 54 ++++++++ xCAT-web/{softmaint => support}/updategui.php | 0 22 files changed, 258 insertions(+), 409 deletions(-) rename xCAT-web/{ => config}/prefs.php (66%) create mode 100644 xCAT-web/config/site.php create mode 100644 xCAT-web/deploy/osimages.php create mode 100644 xCAT-web/images/topl.jpg create mode 100644 xCAT-web/images/topr.jpg rename xCAT-web/images/{xCAT_icon.gif => xCAT_icon-l.gif} (100%) create mode 100644 xCAT-web/jobs/overview.php rename xCAT-web/{ => lib}/phpinfo.php (100%) rename xCAT-web/{ => machines}/dsh.php (80%) rename xCAT-web/{ => machines}/dsh_action.php (100%) rename xCAT-web/{rack.php => machines/frames.php} (99%) delete mode 100644 xCAT-web/node_table.html delete mode 100644 xCAT-web/nodes.html delete mode 100644 xCAT-web/suggestions.html create mode 100644 xCAT-web/support/about.php create mode 100644 xCAT-web/support/diagnose.php create mode 100644 xCAT-web/support/suggest.php rename xCAT-web/{softmaint => support}/updategui.php (100%) diff --git a/xCAT-web/prefs.php b/xCAT-web/config/prefs.php similarity index 66% rename from xCAT-web/prefs.php rename to xCAT-web/config/prefs.php index f5caf495d..e29b87bfe 100644 --- a/xCAT-web/prefs.php +++ b/xCAT-web/config/prefs.php @@ -1,13 +1,11 @@
@@ -30,7 +28,6 @@ if (isAIX()) { $aixDisabled = 'disabled'; }
- - \ No newline at end of file diff --git a/xCAT-web/dsh_action.php b/xCAT-web/machines/dsh_action.php similarity index 100% rename from xCAT-web/dsh_action.php rename to xCAT-web/machines/dsh_action.php diff --git a/xCAT-web/rack.php b/xCAT-web/machines/frames.php similarity index 99% rename from xCAT-web/rack.php rename to xCAT-web/machines/frames.php index c6ac755d6..537bd3bb8 100644 --- a/xCAT-web/rack.php +++ b/xCAT-web/machines/frames.php @@ -1,9 +1,8 @@ diff --git a/xCAT-web/machines/groups.php b/xCAT-web/machines/groups.php index 8ce44713e..cd3967222 100644 --- a/xCAT-web/machines/groups.php +++ b/xCAT-web/machines/groups.php @@ -16,20 +16,18 @@ echo "
\n"; insertButtons(array( array( 'Attributes', - 'Create Like', 'Create Group', 'Ping', //'Updatenode', 'Run Cmd', - 'Copy Files' + 'Copy Files', + 'Sync Files' ), array( //'Soft Maint', 'HW Ctrl', 'RSA/MM/FSP', - 'Install', - 'Perf Mon', - //'Webmin', + 'Deploy', 'Diagnose', 'Remove' ), diff --git a/xCAT-web/node_table.html b/xCAT-web/node_table.html deleted file mode 100644 index ba469baa4..000000000 --- a/xCAT-web/node_table.html +++ /dev/null @@ -1,31 +0,0 @@ - - - - -Untitled Document - - - - - - - - - - - - - - - - - - - - - - - -
Nodes
HW Type
OS
Mode
Status
HW Ctrl Pt
Comment
       
- - diff --git a/xCAT-web/nodes.html b/xCAT-web/nodes.html deleted file mode 100644 index 846b41848..000000000 --- a/xCAT-web/nodes.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - -Untitled Document - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-   Filter:      Group - -or    Node Range -    
 
 
 
 
- - diff --git a/xCAT-web/suggestions.html b/xCAT-web/suggestions.html deleted file mode 100644 index bacf63ca7..000000000 --- a/xCAT-web/suggestions.html +++ /dev/null @@ -1,130 +0,0 @@ - - - - - - - -Send Sugestions to the CSM Development Team - - - - - -

Send Sugestions to the CSM Development Team

- -

Suggestions, bug reports, bug fixes, etc., are always welcome.  Please post them to the CSM forum.  Contributions are also welcome, such as minor new features, better -images, or even whole new pages.  See the developer section of -the CSM Linux GUI white paper for more info.  Thanks!

- -

Todo List

- -

The following items are already on our todo list, in -approximately priority order:

- -
    -
  • When the license expires, have to give a good msg from the main page
    • -
  • Finish modifying the following pages with the More... links: definenode, - definehwdev, dev properties, condition properties, response properties.
    • -
  • Change the xcsm-utils resources so they can also be defined in the xcsm - dir
    • -
  • Add LastEvent to the Condition Attributes page, for releases in which it - is supported
    • -
  • Have the task pane save the current task in the cookie and have each page set the current task
    • -
  • Add list of CSM env vars to Tips section of CSM Config page.
    • -
  • Add hw ctrl info to the Add Nodes page
    • -
  • Finish rack layout of partitioned pSeries systems
    • -
  • Add -c option (adapter config) to updatenode page.  Also run cfmupdatenode - if only -F specified and smsupdatenode if only -S specified.
    • -
  • Monitoring: -
      -
    • Add to Sensor page: -
        -
      • create a mkresources file to facilitate creating/modifying sensors on nodes
        • -
      • force the execution of a sensor immediately
        • -
      -
      • -
    • Provide an Operator monitoring mode (log in as non-root user and get simpler - monitoring page)
      • -
    • Add option to monitor in node group view and be able to drill down to the - problem node
      • -
    • Make drill down on the problem more obvious
      • -
    • Add additional conditions/sensors for a more complete "Health Monitoring"
      • -
    -
    • -
  • Be able to log in as non-root id and su to root (exploit webmin acls)
    • -
  • Display the 1st time user/set up cluster wizard page link automatically - if no nodes are defined.
    • -
  • Scalabilty improvements:
      -
    • When a large # of nodes are displayed on the main - page, only get the 1st 50.
      • -
    -
    • -
  • Fix running perfmondata -h in Tips section of perfmon page, and add it - to xcsm/utils
    • -
  • Get gnuplot (and plotutils on SLES) installed - automatically.
    • -
  • Add to the Diagnose MS page to restart the HWCTRLRM with - tracing on or off:
      -
    • stopsrc -s IBM.HWCTRLRM
      • -
    • If IBM.HWCTRLRM does not stop within a minute, - "ps -ef | grep HW" and kill any - processes.
      • -
    • Delete the contents of /var/log/csm
      • -
    • startsrc -s IBM.HWCTRLRM - -eHC_JAVA_VERBOSE=/tmp/jni.txt
      • -
    • send the trace files in /var/log/csm and - /tmp/jni.txt
      • -
    -
    • -
  • Add some items from csmsnap design to Diagnose MS page
    • -
  • Clean up code for HW Ctrl page
    • -
  • Add BIOS/firmware flashing page
    • -
  • Debug or improve opening a console for a node
    • -
  • Install page:
      -
    • Set up page should use InstallTemplate attribute - as default for the template file
      • -
    • Implement remaining buttons:  Test Console, - Copy Distros, Run Install Probe.
      • -
    • Add nodegrp option to page and add a link to this page on the task list.
      • -
    • Update monitoring of install progress
      • -
    • Add list & manipulation of install images (sets of distro rpms) that - are in /csminstall
      • -
    -
    • -
  • Add copycsmpkgs to Updatenode page.
    • -
  • Make the perf mon page extensible so users can add their - own conditions
    • -
  • Make the main page extensible so users can add their own - attributes to be shown in the node table.
    • -
  • Make the main page monitor the node Status and update it
    • -
  • Network management: -
      -
    • Query status, link speed, throughput of all network adapters on a node
      • -
    -
    • -
  • Implement a summary page
    • -
  • Software Maintenance page:  Allow distro CDs to be - made available as ISOs and mounted
    • -
  • Modify the web interface so it can start up before CSM is - installed, so it can be used to install CSM on the mgmt - svr.
    • -
  • Have this interface launched from the new CSM LWC console and from IBM - Director.
    • -
- -

Known Defects and Limitations

- -
    -
  • Perfmon graph page doesn't download gnuplot for SuSE - correctly.
    • -
  • When you use the browser's Back button to return to the - main page, the image checkboxes of the rack nodes are not - checked.
    • -
- -

The Change Log describing recent enhancements is in the -README file.

- - diff --git a/xCAT-web/support/about.php b/xCAT-web/support/about.php new file mode 100644 index 000000000..6b483df59 --- /dev/null +++ b/xCAT-web/support/about.php @@ -0,0 +1,20 @@ + +

xCAT Web Interface version: ???

+ +

Developers

+ +
    +
  • Vallard Benincosa
    • +
  • Bruce Potter
    • +
  • Quyen Nguyen
    • +
+ + diff --git a/xCAT-web/support/diagnose.php b/xCAT-web/support/diagnose.php new file mode 100644 index 000000000..20966fd88 --- /dev/null +++ b/xCAT-web/support/diagnose.php @@ -0,0 +1,11 @@ +'; +?> diff --git a/xCAT-web/support/suggest.php b/xCAT-web/support/suggest.php new file mode 100644 index 000000000..7f690eec3 --- /dev/null +++ b/xCAT-web/support/suggest.php @@ -0,0 +1,54 @@ + + +

Send Sugestions to the CSM Development Team

+ +

Suggestions, bug reports, bug fixes, etc., are always welcome. Please post them to the +xCAT mailing list. +Contributions are also welcome, such as minor new features, better +images, or even whole new pages. +See xCAT on SourceForge. Thanks!

+ +

Todo List

+ +

The following items are already on our todo list, in +approximately priority order:

+ +
    +
  • Update the spec file for this web interface to have all the necessary post installation scripts.
    • +
  • One button update of this web interface from the internet.
    • +
  • Restructure the files in lib/XCAT and js_xcat to make them simpler.
    • +
  • Have the task pane save the current task in the cookie and have each page set the current task.
    • +
  • Do frame view and rack layout pages.
    • +
  • Do several of the buttons within the machines views: +
      +
    • Attributes
      • +
    • Ping
      • +
    • Run Cmds
      • +
    • Copy Files
      • +
    • Create Group
      • +
    • Diagnose
      • +
    +
    • +
  • Do RMC configuration pages
    • +
  • Do Cluster Settings (site table) page
    • +
  • Start set up cluster wizard page.
    • +
  • Do a summary page that lists # of bad nodes, # of jobs, etc.
    • +
+ +

Known Defects and Limitations

+ +
    +
  • to be filled in...
    • +
+ +

The Change Log describing recent enhancements is in the xcat-web spec file.

+ + diff --git a/xCAT-web/softmaint/updategui.php b/xCAT-web/support/updategui.php similarity index 100% rename from xCAT-web/softmaint/updategui.php rename to xCAT-web/support/updategui.php