fixed invalid LDAP values

Author: akumch

DOCUMENTATION.md

@@ -1045,7 +1045,7 @@ Default return values
 | alert_table_refresh  |  No  |  | | LDAP alert table refresh in hours (0 = never). |
 | always_use_ssl  |  No  |  | | Always use SSL login. |
 | append_base_to_user_dn  |  No  |  | | Append base DN to principal user DN. |
-| auth_type  |  No  |  | Automatic<br/> Stored on iRMC<br/> Stored on LDAP<br/>  | Authorization type. |
+| auth_type  |  No  |  | ServerView LDAP<br/> Standard LDAP<br/>  | Authorization type. |
 | backup_port  |  No  |  | | Non-SL port of backup LDAP server. |
 | backup_server  |  No  |  | | Backup LDAP server. |
 | backup_ssl_port  |  No  |  | | SSL port of backup LDAP server. |
@@ -1111,7 +1111,7 @@ Default return values
 | alert_table_refresh | LDAP alert table refresh in hours | always | string | 0 |
 | always_use_ssl | always use SSL login | always | bool | False |
 | append_base_to_user_dn | append base DN to principal user DN | always | bool | False |
-| auth_type | authorization type | always | string | Automatic |
+| auth_type | authorization type | always | string | ServerView LDAP |
 | backup_port | non-SL port of backup LDAP server | always | string | 389 |
 | backup_server | backup LDAP server | always | string | ldap_backup.local |
 | backup_ssl_port | SSL port of backup LDAP server | always | string | 636 |

README.md

@@ -138,7 +138,7 @@ bare-metal-server provisioning tasks:
 ## License
 
 FUJITSU LIMITED
-Copyright 2018 FUJITSU LIMITED
+Copyright 2018-2019 FUJITSU LIMITED
 
 GNU General Public License v3.0+ (see [LICENSE.md](LICENSE.md) or https://www.gnu.org/licenses/gpl-3.0.txt)
 

library/irmc_ldap.py

@@ -72,7 +72,7 @@
     auth_type:
         description: Authorization type.
         required:    false
-        choices:     ['Stored on LDAP', 'Stored on iRMC']
+        choices:     ['ServerView LDAP', 'Standard LDAP']
     primary_server:
         description: Primary LDAP server.
         required:    false
@@ -190,7 +190,7 @@
         description: authorization type
         returned: always
         type: string
-        sample: Stored on LDAP
+        sample: ServerView LDAP
     backup_port:
         description: non-SL port of backup LDAP server
         returned: always
@@ -300,7 +300,7 @@
 
 ldap_dir = {"0": "MS Active Directory", "1": "Novell eDirectory", "2": "Sun ePlanet", "3": "OpenLDAP",
             "4": "OpenDS / OpenDJ"}
-ldap_auth = {"0": "Stored on LDAP", "1": "Stored on iRMC"}
+ldap_auth = {"0": "ServerView LDAP", "1": "Standard LDAP"}
 true_false = {"0": "False", "1": "True"}
 param_scci_map = [
     # Param, SCCI Name, SCCI Code, index, value dict
@@ -309,7 +309,7 @@
     ["local_login_disabled", "ConfBMCLDAPLocalLoginDisabled", 0x197B, 0, true_false],   # iRMC: Disable Local Login
     ["always_use_ssl", "ConfBMCLDAPBrowserLoginDisabled", 0x197C, 0, true_false],       # iRMC: always use SSL Login
     ["directory_type", "ConfBMCLDAPDirectoryType", 0x1974, 0, ldap_dir],                # iRMC: Directory Server Type
-    ["auth_type", "ConfLDAPAuthorizationType", 0x1AC0, 0, ldap_auth],               # iRMC: Authorization Type
+    ["auth_type", "ConfLDAPAuthorizationType", 0x1AC0, 0, ldap_auth],                   # iRMC: Authorization Type
     ["primary_server", "ConfBMCLDAPServerName", 0x1976, 0, None],                       # iRMC: Primary LDAP Server
     ["primary_port", "ConfBmcLDAPNonSecurePort", 0x1996, 0, None],                      # iRMC: Primary LDAP Port
     ["primary_ssl_port", "ConfBmcLDAPSecurePort", 0x1997, 0, None],                     # iRMC: Primary LDAP SSL Port
@@ -420,8 +420,7 @@ def main():
         directory_type=dict(required=False, type="str",
                             choices=["MS Active Directory", "Novell eDirectory", "Sun ePlanet", "OpenLDAP",
                                      "OpenDS / OpenDJ"]),
-        auth_type=dict(required=False, type="str",
-                       choices=["Stored on LDAP", "Stored on iRMC"]),
+        auth_type=dict(required=False, type="str", choices=["ServerView LDAP", "Standard LDAP"]),
         primary_server=dict(required=False, type="str"),
         primary_port=dict(required=False, type="int"),
         primary_ssl_port=dict(required=False, type="int"),