From: Stephen Soltesz Date: Mon, 4 May 2009 21:33:10 +0000 (+0000) Subject: add steps to build and install Monitor docs into plc X-Git-Tag: MyPLC-4.3-7~2 X-Git-Url: http://git.onelab.eu/?p=myplc.git;a=commitdiff_plain;h=f2d5c8abbba4b6320b7b2d3546294ce62e3c6486 add steps to build and install Monitor docs into plc add default PCU types with names that match monitor-pcucontrol models. --- diff --git a/db-config b/db-config index 27fcee7..4a1a22d 100755 --- a/db-config +++ b/db-config @@ -928,124 +928,69 @@ message, please reply so that we may investigate the problem. #################### PCUs ### Setup Initial PCU information - pcu_types = [{'model': 'AP79xx', - 'name': 'APC AP79xx', - 'pcu_protocol_types': [{ 'port': 80, - 'protocol': 'APC79xxHttp', - 'supported': False}, - { 'port': 23, - 'protocol': 'APC79xx', - 'supported': True}, - { 'port': 22, - 'protocol': 'APC79xx', - 'supported': True}], - }, - {'model': 'Masterswitch', - 'name': 'APC Masterswitch', - 'pcu_protocol_types': [{ 'port': 80, - 'protocol': 'APCMasterHttp', - 'supported': False}, - { 'port': 23, - 'protocol': 'APCMaster', - 'supported': True}, - { 'port': 22, - 'protocol': 'APCMaster', - 'supported': True}], - }, - {'model': 'DS4-RPC', - 'name': 'BayTech DS4-RPC', - 'pcu_protocol_types': [{ 'port': 80, - 'protocol': 'BayTechHttp', - 'supported': False}, - { 'port': 23, - 'protocol': 'BayTech', - 'supported': True}, - { 'port': 22, - 'protocol': 'BayTech', - 'supported': True}], - }, - {'model': 'IP-41x_IP-81x', - 'name': 'Dataprobe IP-41x & IP-81x', - 'pcu_protocol_types': [ { 'port': 23, - 'protocol': 'IPALTelnet', - 'supported': True}, - { 'port': 80, - 'protocol': 'IPALHttp', - 'supported': False}], - }, - {'model': 'DRAC3', - 'name': 'Dell RAC Version 3', - 'pcu_protocol_types': [], - }, - {'model': 'DRAC4', - 'name': 'Dell RAC Version 4', - 'pcu_protocol_types': [{ 'port': 443, - 'protocol': 'DRACRacAdm', - 'supported': True}, - { 'port': 80, - 'protocol': 'DRACRacAdm', - 'supported': False}, - { 'port': 22, - 'protocol': 'DRAC', - 'supported': True}], - }, - {'model': 'ePowerSwitch', - 'name': 'ePowerSwitch 1/4/8x', - 'pcu_protocol_types': [{ 'port': 80, - 'protocol': 'ePowerSwitch', - 'supported': True}], - }, - {'model': 'ilo2', - 'name': 'HP iLO2 (Integrated Lights-Out)', - 'pcu_protocol_types': [{ 'port': 443, - 'protocol': 'HPiLOHttps', - 'supported': True}, - { 'port': 22, - 'protocol': 'HPiLO', - 'supported': True}], - }, - {'model': 'ilo1', - 'name': 'HP iLO version 1', - 'pcu_protocol_types': [], - }, - {'model': 'PM211-MIP', - 'name': 'Infratec PM221-MIP', - 'pcu_protocol_types': [], - }, - {'model': 'AMT2.5', - 'name': 'Intel AMT v2.5 (Active Management Technology)', - 'pcu_protocol_types': [], - }, - {'model': 'AMT3.0', - 'name': 'Intel AMT v3.0 (Active Management Technology)', - 'pcu_protocol_types': [], - }, - {'model': 'WTI_IPS-4', - 'name': 'Western Telematic (WTI IPS-4)', - 'pcu_protocol_types': [], - }, - {'model': 'unknown', - 'name': 'Unknown Vendor or Model', - 'pcu_protocol_types': [{ 'port': 443, - 'protocol': 'UnknownPCU', - 'supported': False}, - { 'port': 80, - 'protocol': 'UnknownPCU', - 'supported': False}, - { 'port': 23, - 'protocol': 'UnknownPCU', - 'supported': False}, - { 'port': 22, - 'protocol': 'UnknownPCU', - 'supported': False}], - }] + pcu_types = [ + {'model': 'APCControl12p3', + 'name': 'APC AP79xx or Masterswitch (sequence 1-2-port-3)', }, + {'model': 'APCControl1p4', + 'name': 'APC AP79xx or Masterswitch (sequence 1-port-4)', }, + {'model': 'APCControl121p3', + 'name': 'APC AP79xx or Masterswitch (sequence 1-2-1-port-3)', }, + {'model': 'APCControl121p1', + 'name': 'APC AP79xx or Masterswitch (sequence 1-2-1-port-1)', }, + {'model': 'APCControl13p13', + 'name': 'APC AP79xx or Masterswitch (sequence 1-3-port-1-3)', }, + + {'model': 'BayTechRPC3NC', + 'name': 'BayTech with prompt RPC3-NC>', }, + {'model': 'BayTechRPC16', + 'name': 'BayTech with prompt RPC-16>', }, + {'model': 'BayTech', + 'name': 'BayTech with prompt DS-RPC>', }, + {'model': 'BayTechCtrlC', + 'name': 'BayTech Ctrl-C, 5, then with prompt DS-RPC>', }, + {'model': 'BayTechCtrlCUnibe', + 'name': 'BayTech Ctrl-C, 3, then with prompt DS-RPC>', }, + + {'model': 'BlackBoxPSMaverick', + 'name': 'BlackBoxPSMaverick Web based controller'}, + + {'model': 'IPAL', + 'name': 'IPAL - Dataprobe IP-41x & IP-81x', }, + {'model': 'DRAC', + 'name': 'DRAC - Dell RAC Version 3 or 4', }, + {'model': 'ePowerSwitchNew', + 'name': 'ePowerSwitch Newer Models 1/4/8x', }, + {'model': 'ePowerSwitchOld', + 'name': 'ePowerSwitch Older Models 1/4/8x', }, + + {'model': 'HPiLO', + 'name': 'HP iLO v1 or v2 (Integrated Lights-Out)', }, + + {'model': 'IntelAMT', + 'name': 'Intel AMT v2.5 or v3.0 (Active Management Technology)', }, + + {'model': 'IPMI', + 'name': 'OpenIPMI - Intelligent Platform Management Interface', }, + + {'model': 'PM211MIP', + 'name': 'Infratec PM221-MIP', }, + + {'model': 'WTIIPS4', + 'name': 'Western Telematic (WTI IPS-4)', }, + + {'model': 'ManualPCU', + 'name': 'Manual Administrator Operation (choose if model unknown)', }, + ] # Get all model names pcu_models = [type['model'] for type in GetPCUTypes()] for type in pcu_types: - protocol_types = type['pcu_protocol_types'] - # Take this value out of the struct. - del type['pcu_protocol_types'] + if 'pcu_protocol_types' in type: + protocol_types = type['pcu_protocol_types'] + # Take this value out of the struct. + del type['pcu_protocol_types'] + else: + protocol_types = [] if type['model'] not in pcu_models: # Add the name/model info into DB id = AddPCUType(type) diff --git a/myplc-docs.spec b/myplc-docs.spec index bf45a4e..7c20ab1 100644 --- a/myplc-docs.spec +++ b/myplc-docs.spec @@ -54,11 +54,19 @@ rm -f doc/NMAPI.html make -C doc NMAPI.html popd +pushd Monitor +# beware that making the pdf file somehow overwrites the html +make -C docs Monitor.pdf +rm -f docs/Monitor.html +make -C docs Monitor.html +popd + %install for ext in pdf html; do install -D -m 444 PLCAPI/doc/PLCAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/PLCAPI.$ext install -D -m 444 NodeManager/doc/NMAPI.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.$ext + install -D -m 444 Monitor/docs/Monitor.$ext $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.$ext done ./MyPLC/docbook2drupal.sh "PLC API Documentation (%{pldistro})" \ @@ -67,6 +75,9 @@ done ./MyPLC/docbook2drupal.sh "Node Manager API Documentation (%{pldistro})" \ $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.html \ $RPM_BUILD_ROOT/var/www/html/planetlab/doc/NMAPI.php +./MyPLC/docbook2drupal.sh "Monitor API Documentation (%{pldistro})" \ + $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.html \ + $RPM_BUILD_ROOT/var/www/html/planetlab/doc/Monitor.php %clean rm -rf $RPM_BUILD_ROOT