Merge pull request #175 from rajan-mis/module_change

Change the name of the modules from ibm_ss_* to ibm_spectrumscale_*

Author: rajan-mis

roles/core/cluster/tasks/removenode.yml

@@ -31,7 +31,7 @@
           delete_nodes: "{{ groups['scale_remove_nodes'] | list }}"
 
     - name: Delete an IBM Spectrum Scale Node from Cluster
-      ibm_ss_node:
+      ibm_spectrumscale_node:
         state: absent
         name: "{{ delete_nodes | join(',') }}"
       register: scale_delete_node

roles/custom_module/library/ibm_ss_cluster.py roles/custom_module/library/ibm_spectrumscale_cluster.py

@@ -26,7 +26,7 @@
 
 DOCUMENTATION = '''
 ---
-module: ibm_ss_cluster
+module: ibm_spectrumscale_cluster
 short_description: IBM Spectrum Scale Cluster Management
 version_added: "0.0"
 
@@ -61,19 +61,19 @@
 EXAMPLES = '''
 # Retrive information about an existing IBM Spectrum Scale cluster
 - name: Retrieve IBM Spectrum Scale Cluster information
-  ibm_ss_cluster:
+  ibm_spectrumscale_cluster:
     op: list
 
 # Create a new IBM Spectrum Scale Cluster
 - name: Create an IBM Spectrum Scale Cluster
-  ibm_ss_cluster:
+  ibm_spectrumscale_cluster:
     state: present
     stanza: "/tmp/stanza"
     name: "node1.domain.com"
 
 # Delete an existing IBM Spectrum Scale Cluster
 - name: Delete an IBM Spectrum Scale Cluster
-  ibm_ss_cluster:
+  ibm_spectrumscale_cluster:
     state: absent
     name: "node1.domain.com"
 '''
@@ -107,21 +107,21 @@
 from ansible.module_utils.basic import AnsibleModule
 
 try: 
-    from ansible.module_utils.ibm_ss_utils import RC_SUCCESS, SpectrumScaleLogger
+    from ansible.module_utils.ibm_spectrumscale_utils import RC_SUCCESS, SpectrumScaleLogger
 except:
-    from ibm_ss_utils import RC_SUCCESS, SpectrumScaleLogger
+    from ibm_spectrumscale_utils import RC_SUCCESS, SpectrumScaleLogger
 
 try: 
-    from ansible.module_utils.ibm_ss_cluster_utils import SpectrumScaleCluster
+    from ansible.module_utils.ibm_spectrumscale_cluster_utils import SpectrumScaleCluster
 except:
-    from ibm_ss_cluster_utils import SpectrumScaleCluster
+    from ibm_spectrumscale_cluster_utils import SpectrumScaleCluster
 
 
 def main():
     logger = SpectrumScaleLogger.get_logger()
 
     logger.debug("------------------------------------")
-    logger.debug("Function Entry: ibm_ss_cluster.main()")
+    logger.debug("Function Entry: ibm_spectrumscale_cluster.main()")
     logger.debug("------------------------------------")
 
     # Setup the module argument specifications
@@ -212,7 +212,7 @@ def main():
             state_changed = True
 
     logger.debug("------------------------------------")
-    logger.debug("Function Exit: ibm_ss_cluster.main()")
+    logger.debug("Function Exit: ibm_spectrumscale_cluster.main()")
     logger.debug("------------------------------------")
 
     SpectrumScaleLogger.shutdown()

roles/custom_module/library/ibm_ss_filesystem.py roles/custom_module/library/ibm_spectrumscale_filesystem.py

@@ -26,7 +26,7 @@
 
 DOCUMENTATION = '''
 ---
-module: ibm_ss_filesystem
+module: ibm_spectrumscale_filesystem
 short_description: IBM Spectrum Scale Filesystem Management
 version_added: "0.0"
 
@@ -85,19 +85,19 @@
 EXAMPLES = '''
 # Retrive information about an existing IBM Spectrum Scale filesystem
 - name: Retrieve IBM Spectrum Scale filesystem information
-  ibm_ss_filesystem:
+  ibm_spectrumscale_filesystem:
     op: get
 
 # Create a new IBM Spectrum Scale Filesystem
 - name: Create an IBM Spectrum Scale filesystem
-  ibm_ss_filesystem:
+  ibm_spectrumscale_filesystem:
     state: present
     stanza: "/tmp/filesystem-stanza"
     name: "FS1"
 
 # Delete an existing IBM Spectrum Scale Filesystem
 - name: Delete an IBM Spectrum Scale filesystem
-  ibm_ss_filesystem:
+  ibm_spectrumscale_filesystem:
     state: absent
     name: "FS1"
 '''
@@ -130,21 +130,21 @@
 from ansible.module_utils.basic import AnsibleModule
 
 try: 
-    from ansible.module_utils.ibm_ss_utils import RC_SUCCESS, SpectrumScaleLogger
+    from ansible.module_utils.ibm_spectrumscale_utils import RC_SUCCESS, SpectrumScaleLogger
 except:
-    from ibm_ss_utils import RC_SUCCESS, SpectrumScaleLogger
+    from ibm_spectrumscale_utils import RC_SUCCESS, SpectrumScaleLogger
 
 try:
-    from ansible.module_utils.ibm_ss_filesystem_utils import SpectrumScaleFS
+    from ansible.module_utils.ibm_spectrumscale_filesystem_utils import SpectrumScaleFS
 except:
-    from ibm_ss_filesystem_utils import SpectrumScaleFS
+    from ibm_spectrumscale_filesystem_utils import SpectrumScaleFS
 
 
 def main():
     logger = SpectrumScaleLogger.get_logger()
 
     logger.debug("---------------------------------------")
-    logger.debug("Function Entry: ibm_ss_filesystem.main()")
+    logger.debug("Function Entry: ibm_spectrumscale_filesystem.main()")
     logger.debug("---------------------------------------")
 
     # Setup the module argument specifications
@@ -277,7 +277,7 @@ def main():
             state_changed = True
 
     logger.debug("---------------------------------------")
-    logger.debug("Function Exit: ibm_ss_filesystem.main()")
+    logger.debug("Function Exit: ibm_spectrumscale_filesystem.main()")
     logger.debug("---------------------------------------")
 
     logger = SpectrumScaleLogger.shutdown()

roles/custom_module/library/ibm_ss_node.py roles/custom_module/library/ibm_spectrumscale_node.py

@@ -26,7 +26,7 @@
 
 DOCUMENTATION = '''
 ---
-module: ibm_ss_node
+module: ibm_spectrumscale_node
 short_description: IBM Spectrum Scale Node Management
 version_added: "0.1"
 
@@ -61,19 +61,19 @@
 EXAMPLES = '''
 # Retrive information about an existing IBM Spectrum Scale Node(s)
 - name: Retrieve IBM Spectrum Scale Node information
-  ibm_ss_node:
+  ibm_spectrumscale_node:
     op: list
 
 # Adds a Node to the IBM Spectrum Scale Cluster
 - name: Add node to IBM Spectrum Scale Cluster
-  ibm_ss_node:
+  ibm_spectrumscale_node:
     state: present
     nodefile: "/tmp/nodefile"
     name: "node1.domain.com"
 
 # Delete an existing IBM Spectrum Node from the Cluster
 - name: Delete an IBM Spectrum Scale Node from Cluster
-  ibm_ss_node:
+  ibm_spectrumscale_node:
     state: absent
     name: "node1.domain.com"
 '''
@@ -110,44 +110,44 @@
 from ansible.module_utils.basic import AnsibleModule
 
 try:
-    from ansible.module_utils.ibm_ss_utils import runCmd, RC_SUCCESS, \
+    from ansible.module_utils.ibm_spectrumscale_utils import runCmd, RC_SUCCESS, \
                                                   parse_aggregate_cmd_output, \
                                                   SpectrumScaleLogger, \
                                                   SpectrumScaleException
 except:
-    from ibm_ss_utils import runCmd, RC_SUCCESS, parse_aggregate_cmd_output, \
+    from ibm_spectrumscale_utils import runCmd, RC_SUCCESS, parse_aggregate_cmd_output, \
                              SpectrumScaleLogger, SpectrumScaleException
 
 try:
-    from ansible.module_utils.ibm_ss_disk_utils import SpectrumScaleDisk
+    from ansible.module_utils.ibm_spectrumscale_disk_utils import SpectrumScaleDisk
 except:
-    from ibm_ss_disk_utils import SpectrumScaleDisk
+    from ibm_spectrumscale_disk_utils import SpectrumScaleDisk
 
 try:
-    from ansible.module_utils.ibm_ss_df_utils import SpectrumScaleDf
+    from ansible.module_utils.ibm_spectrumscale_df_utils import SpectrumScaleDf
 except:
-    from ibm_ss_df_utils import SpectrumScaleDf
+    from ibm_spectrumscale_df_utils import SpectrumScaleDf
 
 try:
-    from ansible.module_utils.ibm_ss_nsd_utils import SpectrumScaleNSD
+    from ansible.module_utils.ibm_spectrumscale_nsd_utils import SpectrumScaleNSD
 except:
-    from ibm_ss_nsd_utils import SpectrumScaleNSD
+    from ibm_spectrumscale_nsd_utils import SpectrumScaleNSD
 
 try:
-    from ansible.module_utils.ibm_ss_filesystem_utils import SpectrumScaleFS
+    from ansible.module_utils.ibm_spectrumscale_filesystem_utils import SpectrumScaleFS
 except:
-    from ibm_ss_filesystem_utils import SpectrumScaleFS
+    from ibm_spectrumscale_filesystem_utils import SpectrumScaleFS
 
 try:
-    from ansible.module_utils.ibm_ss_cluster_utils import SpectrumScaleCluster, \
+    from ansible.module_utils.ibm_spectrumscale_cluster_utils import SpectrumScaleCluster, \
                                                           SpectrumScaleNode
 except:
-    from ibm_ss_cluster_utils import SpectrumScaleCluster, SpectrumScaleNode
+    from ibm_spectrumscale_cluster_utils import SpectrumScaleCluster, SpectrumScaleNode
 
 try:
-    from ansible.module_utils.ibm_ss_zimon_utils import get_zimon_collectors
+    from ansible.module_utils.ibm_spectrumscale_zimon_utils import get_zimon_collectors
 except:
-    from ibm_ss_zimon_utils import get_zimon_collectors
+    from ibm_spectrumscale_zimon_utils import get_zimon_collectors
 
 ###############################################################################
 ##                                                                           ##
@@ -787,7 +787,7 @@ def main():
     logger = SpectrumScaleLogger.get_logger()
 
     logger.debug("----------------------------------")
-    logger.debug("Function Entry: ibm_ss_node.main()")
+    logger.debug("Function Entry: ibm_spectrumscale_node.main()")
     logger.debug("----------------------------------")
 
     # Setup the module argument specifications
@@ -897,7 +897,7 @@ def main():
                          result=result_json, stderr=str(st))
 
     logger.debug("---------------------------------")
-    logger.debug("Function Exit: ibm_ss_node.main()")
+    logger.debug("Function Exit: ibm_spectrumscale_node.main()")
     logger.debug("---------------------------------")
 
     SpectrumScaleLogger.shutdown()

roles/custom_module/module_utils/ibm_ss_cluster_utils.py roles/custom_module/module_utils/ibm_spectrumscale_cluster_utils.py

@@ -19,7 +19,7 @@
 import os
 import json
 import time
-from ibm_ss_utils import runCmd, parse_aggregate_cmd_output, \
+from ibm_spectrumscale_utils import runCmd, parse_aggregate_cmd_output, \
                          parse_unique_records, GPFS_CMD_PATH, \
                          RC_SUCCESS, SpectrumScaleException
 

roles/custom_module/module_utils/ibm_ss_df_utils.py roles/custom_module/module_utils/ibm_spectrumscale_df_utils.py

@@ -19,7 +19,7 @@
 
 import os
 import json
-from ibm_ss_utils import runCmd, parse_aggregate_cmd_output, \
+from ibm_spectrumscale_utils import runCmd, parse_aggregate_cmd_output, \
                          parse_unique_records, GPFS_CMD_PATH, \
                          RC_SUCCESS, SpectrumScaleException
 

roles/custom_module/module_utils/ibm_ss_disk_utils.py roles/custom_module/module_utils/ibm_spectrumscale_disk_utils.py

@@ -19,7 +19,7 @@
 import os
 import sys
 import json
-from ibm_ss_utils import runCmd, parse_unique_records, GPFS_CMD_PATH, \
+from ibm_spectrumscale_utils import runCmd, parse_unique_records, GPFS_CMD_PATH, \
                          RC_SUCCESS, SpectrumScaleException
 
 class SpectrumScaleDisk:

roles/custom_module/module_utils/ibm_ss_filesystem_utils.py roles/custom_module/module_utils/ibm_spectrumscale_filesystem_utils.py

@@ -18,7 +18,7 @@
 
 import os
 import json
-from ibm_ss_utils import runCmd, parse_simple_cmd_output, GPFS_CMD_PATH, \
+from ibm_spectrumscale_utils import runCmd, parse_simple_cmd_output, GPFS_CMD_PATH, \
                          RC_SUCCESS, SpectrumScaleException
 
 class SpectrumScaleFS:

roles/custom_module/module_utils/ibm_ss_nsd_utils.py roles/custom_module/module_utils/ibm_spectrumscale_nsd_utils.py

@@ -19,7 +19,7 @@
 
 import os
 import json
-from ibm_ss_utils import runCmd, parse_unique_records, GPFS_CMD_PATH, \
+from ibm_spectrumscale_utils import runCmd, parse_unique_records, GPFS_CMD_PATH, \
                          RC_SUCCESS, SpectrumScaleException
 
 class SpectrumScaleNSD:

roles/custom_module/module_utils/ibm_ss_utils.py roles/custom_module/module_utils/ibm_spectrumscale_utils.py

@@ -21,7 +21,7 @@
 import re
 import json
 import time
-from ibm_ss_utils import runCmd, GPFS_CMD_PATH, RC_SUCCESS, \
+from ibm_spectrumscale_utils import runCmd, GPFS_CMD_PATH, RC_SUCCESS, \
                          SpectrumScaleException
 
 def get_zimon_collectors():

roles/custom_module/module_utils/ibm_ss_zimon_utils.py roles/custom_module/module_utils/ibm_spectrumscale_zimon_utils.py

@@ -20,7 +20,7 @@
   gather_facts: no
   tasks: 
   - name: Query cluster information
-    ibm_ss_cluster:
+    ibm_spectrumscale_cluster:
       op: 'get'
     register: cluster_info_out
     run_once: true

roles/custom_module/test/cluster/playbooks/cluster-get-test.yaml

@@ -19,7 +19,7 @@
   hosts: controller
   tasks:
   - name: Run Filesystem Module
-    ibm_ss_filesystem:
+    ibm_spectrumscale_filesystem:
       op: 'get'
     register: module_out
 

roles/custom_module/test/filesystem/playbooks/filesystem-test.yaml

@@ -25,7 +25,7 @@
       dest: /tmp/NodeFile
 
   - name: Add Node(s) to cluster
-    ibm_ss_node:
+    ibm_spectrumscale_node:
       state: "present"
       name: "{{ groups['test_add_nodes'][0] }}"
       nodefile: "/tmp/NodeFile"

roles/custom_module/test/node/playbooks/node-add-test.yaml

@@ -20,7 +20,7 @@
   gather_facts: no
   tasks: 
   - name: Query all nodes in the cluster
-    ibm_ss_node:
+    ibm_spectrumscale_node:
       op: "get"
     register: nodes_info
 
@@ -29,7 +29,7 @@
       msg: "{{ nodes_info }}"
 
   - name: Query a single node in the cluster
-    ibm_ss_node:
+    ibm_spectrumscale_node:
       op: "get"
       name: "node1.domain.com"
     register: node_1_info