Merge pull request #1 from Huawei/DME_Storage_1.0.0_CP3

DME Storage 1.0.0 CP3
Huawei · Apr 13, 2021 · 97b4959 · 97b4959
2 parents 643912f + b39e0c8
commit 97b4959
Show file tree

Hide file tree

Showing 149 changed files with 15,753 additions and 2,341 deletions.
diff --git a/config/global.yml b/config/global.yml
@@ -27,7 +27,7 @@ GLOBAL:
     recoveryPolicy: 1     # 1/automatic, 2/manual
     syncSpeed: 2          # 1/low, 2/medium, 3/high, 4/highest
     syncType: 3           # 1/manual, 2/wait after last sync begin, 3/wait after last sync ends
-    interval: 60          # synchronize interval in seconds (10 ~ 86400)
+    interval: 30          # synchronize interval in seconds (10 ~ 86400)
     compress: False       # enable compress for async replication: true, false
     timeout: 10           # synchronize remote I/O timeout threshold in seconds, default: 10, options: 10~30, or set to 255 to disable timeout
     syncRetries: 3600     # 5 hours
@@ -83,19 +83,13 @@ DMDATASERVICE:                         # DeviceManager Data service configuratio
 DEFAULT:
   noneName: "NONE"
   noneValue: "__NONE__"
-  suffixDigits: 3
+  suffixDigits: 4
 
 LOGGING:
-  format:  '[%(asctime)s] %(levelname)-5s - %(message)s'
+  format:  '%(asctime)s - %(levelname)s - %(filename)s[:%(lineno)d] - %(message)s'
   datefmt: '%Y-%m-%d %H:%M:%S'
   level:   'DEBUG'
-  levelno:
-    CRITICAL: 50
-    ERROR: 40
-    WARNING: 30
-    INFO: 20
-    DEBUG: 10
-    NOTSET: 0
+  path: "/var/lib/rundeck/logs/data_service"
 
 DJSERVICE:
   API:

diff --git a/playbook/storage/oceanstor/get_lgs_by_host.yml b/playbook/storage/oceanstor/get_lgs_by_host.yml
@@ -0,0 +1,9 @@
+- name: Delete LUN Group
+  hosts: localhost
+  vars_files:
+    - ../../../config/global.yml
+  gather_facts: no
+  become: no
+  tasks:
+    - import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/login_storage.yml"
+    - include_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/get_lgs_by_host.yml"
diff --git a/playbook/storage/oceanstor/get_luns_by_pg.yml b/playbook/storage/oceanstor/get_luns_by_pg.yml
@@ -0,0 +1,9 @@
+- name: Delete LUN Group
+  hosts: localhost
+  vars_files:
+    - ../../../config/global.yml
+  gather_facts: no
+  become: no
+  tasks:
+    - import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/login_storage.yml"
+    - import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/get_luns_by_pg.yml"
diff --git a/playbook/storage/oceanstor/get_snapshots_by_cg.yml b/playbook/storage/oceanstor/get_snapshots_by_cg.yml
@@ -0,0 +1,9 @@
+- name: Delete LUN Group
+  hosts: localhost
+  vars_files:
+    - ../../../config/global.yml
+  gather_facts: no
+  become: no
+  tasks:
+    - import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/login_storage.yml"
+    - import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/get_snapshots_by_cg.yml"
diff --git a/rundeck/jobs/project001/01_create_host.yaml b/rundeck/jobs/project001/01_create_host.yaml
@@ -69,7 +69,7 @@
     valuesUrl: http://localhost:26336/rest/data/v1/echo?host=1.%20Create%20host:%20"${option.Country.value}_${option.OS_Type.value}_${option.Host_Name.value}_1"%20on%20storage:%20"${option.Storage.value}"&wwn=2.%20Add%20WWNs%20"${option.Host_WWN.value}"%20to%20host:%20"${option.Country.value}_${option.OS_Type.value}_${option.Host_Name.value}_1"&cluster=3.%20Add%20host%20"${option.Country.value}_${option.OS_Type.value}_${option.Host_Name.value}_1"%20to%20cluster:%20"${option.Cluster_Name.value}"
     description: Select to confirm primary host result <BR><BR><h2>Protection Settings</h2>
   - name: Session_Name
-    description: Input Session Name used for CGs (optional, max 16 chars, '_' not permitted, default is Primary Host Name)
+    description: Input Session Name used for CGs (optional, max 13 chars, '_' not permitted, default is Primary Host Name)
   - enforced: true
     name: Enable_HyperMetro
     value: 'N'

diff --git a/rundeck/jobs/project001/03_modify_host_info.yaml b/rundeck/jobs/project001/03_modify_host_info.yaml
@@ -67,7 +67,7 @@
     name: Session_Name
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/lungroup?range=[0-100]&nameAttr=DESCRIPTION:1&nameSplit=_&valueAttr=DESCRIPTION:1&valueSplit=_&filter=NAME::${option.LUN_Group.value}
   - name: Modify_Session_Name
-    description: Input New Session Name (start with {Country}0, max 19 chars, '_' not permitted) <BR><BR><h2>Performance Class</h2>
+    description: Input New Session Name (start with {Country}0, max 16 chars, '_' not permitted) <BR><BR><h2>Performance Class</h2>
   - enforced: true
     name: Class_1
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/lungroup?range=[0-100]&nameAttr=DESCRIPTION:0:2:3&valueAttr=DESCRIPTION:0:2:3&filter=NAME::${option.LUN_Group.value}

diff --git a/rundeck/jobs/project001/05_create_cluster.yaml b/rundeck/jobs/project001/05_create_cluster.yaml
@@ -62,7 +62,7 @@
     valuesUrl: http://localhost:26336/rest/data/v1/echo?cluster=1.%20Create%20cluster:%20"${option.Country.value}_${option.OS_Type.value}_${option.Cluster_Name.value}_1"%20on%20storage:%20"${option.Storage.value}"&hosts=2.%20Add%20hosts%20"${option.Hosts.value}"%20to%20cluster:%20"${option.Country.value}_${option.OS_Type.value}_${option.Cluster_Name.value}_1"
     description: Select to confirm primary cluster result <BR><BR><h2>Protection Settings</h2>
   - name: Session_Name
-    description: Input Session Name used for grouping (optional, max 16 chars, '_' not permitted, default is Primary Cluster Name)
+    description: Input Session Name used for grouping (optional, max 13 chars, '_' not permitted, default is Primary Cluster Name)
   - enforced: true
     name: Enable_HyperMetro
     value: 'N'

diff --git a/rundeck/jobs/project001/07_modify_cluster_info.yaml b/rundeck/jobs/project001/07_modify_cluster_info.yaml
@@ -70,7 +70,7 @@
     name: Session_Name
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/lungroup?range=[0-100]&nameAttr=DESCRIPTION:1&nameSplit=_&valueAttr=DESCRIPTION:1&valueSplit=_&filter=NAME::${option.LUN_Group.value}
   - name: Modify_Session_Name
-    description: Input New Session Name (start with {Country}0, max 19 chars, '_' not permitted) <BR><BR><h2>Performance Class</h2>
+    description: Input New Session Name (start with {Country}0, max 16 chars, '_' not permitted) <BR><BR><h2>Performance Class</h2>
   - enforced: true
     name: Class_1
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/lungroup?range=[0-100]&nameAttr=DESCRIPTION:0:2:3&valueAttr=DESCRIPTION:0:2:3&filter=NAME::${option.LUN_Group.value}
@@ -225,12 +225,12 @@
           Modify_DR_Cluster_Description: ${option.Modify_DR_Cluster_Description}
           Class_2: ${option.Class_2}
           Modify_Class_2: ${option.Modify_Class_2}
-          Check_Result_3: ${option.Check_Result_2}
+          Check_Result_3: ${option.Check_Result_3}
 
           DR_Test_Cluster: ${option.DR_Test_Cluster}
           Class_3: ${option.Class_3}
           Modify_Class_3: ${option.Modify_Class_3}
-          Check_Result_4: ${option.Check_Result_3}
+          Check_Result_4: ${option.Check_Result_4}
 
           Protection_Group: ${option.Protection_Group}
           Metro_CG: ${option.Metro_CG}

diff --git a/rundeck/jobs/project001/09_create_luns_for_host.yaml b/rundeck/jobs/project001/09_create_luns_for_host.yaml
@@ -55,7 +55,7 @@
   - delimiter: '|'
     multivalued: true
     name: LUN_Description
-    description: Add LUN Description (optional, max 200 chars for all items, '|' and '_' not permitted)
+    description: Add LUN Description (optional, max 255 chars for all items, '|' and '_' not permitted)
   - enforced: true
     name: Pool
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/storagepool?nameAttr=NAME&valueAttr=ID
@@ -221,6 +221,8 @@
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
           Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Host: ${option.Host}
           Storage: ${option.Storage}
           Storage_Room: ${option.Storage_Room}

diff --git a/rundeck/jobs/project001/10_map_luns_to_host.yaml b/rundeck/jobs/project001/10_map_luns_to_host.yaml
@@ -220,6 +220,8 @@
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
           Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Host: ${option.Host}
           Storage: ${option.Storage}
           Storage_Room: ${option.Storage_Room}

diff --git a/rundeck/jobs/project001/11_unmap_luns_from_host.yaml b/rundeck/jobs/project001/11_unmap_luns_from_host.yaml
@@ -182,6 +182,9 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Host: ${option.Host}
           Storage: ${option.Storage}
           Storage_Room: ${option.Storage_Room}

diff --git a/rundeck/jobs/project001/13_create_luns_for_cluster.yaml b/rundeck/jobs/project001/13_create_luns_for_cluster.yaml
@@ -58,7 +58,7 @@
   - delimiter: '|'
     multivalued: true
     name: LUN_Description
-    description: Add LUN Description (optional, max 200 chars for all items, '|' and '_' not permitted)
+    description: Add LUN Description (optional, max 255 chars for all items, '|' and '_' not permitted)
   - enforced: true
     name: Pool
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/storagepool?nameAttr=NAME&valueAttr=ID
@@ -224,6 +224,8 @@
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
           Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Cluster: ${option.Cluster}
           Storage: ${option.Storage}
           Storage_Room: ${option.Storage_Room}

diff --git a/rundeck/jobs/project001/14_map_luns_to_cluster.yaml b/rundeck/jobs/project001/14_map_luns_to_cluster.yaml
@@ -223,6 +223,8 @@
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
           Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Cluster: ${option.Cluster}
           Storage: ${option.Storage}
           Storage_Room: ${option.Storage_Room}

diff --git a/rundeck/jobs/project001/15_unmap_luns_from_cluster.yaml b/rundeck/jobs/project001/15_unmap_luns_from_cluster.yaml
@@ -185,6 +185,9 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Cluster: ${option.Cluster}
           Storage: ${option.Storage}
           Storage_Room: ${option.Storage_Room}

diff --git a/rundeck/jobs/project001/16_delete_lun.yaml b/rundeck/jobs/project001/16_delete_lun.yaml
@@ -62,6 +62,9 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Select_LUN: ${option.Select_LUN}
           Upload_LUN: ${file.Upload_LUN}
           Delimiter: "${option.Delimiter}"

diff --git a/rundeck/jobs/project001/17_change_class.yaml b/rundeck/jobs/project001/17_change_class.yaml
@@ -55,6 +55,9 @@
         ansible-extra-vars: |-
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Select_LUN: ${option.Select_LUN}
           Upload_LUN: ${file.Upload_LUN}
           Delimiter: "${option.Delimiter}"

diff --git a/rundeck/jobs/project001/18_remove_class.yaml b/rundeck/jobs/project001/18_remove_class.yaml
@@ -57,6 +57,9 @@
         ansible-extra-vars: |-
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Select_LUN: ${option.Select_LUN}
           Upload_LUN: ${file.Upload_LUN}
           Delimiter: "${option.Delimiter}"

diff --git a/rundeck/jobs/project001/21_create_luns.yaml b/rundeck/jobs/project001/21_create_luns.yaml
@@ -49,7 +49,7 @@
     type: file
   - name: Delimiter
     value: ','
-  - description: Maximum 28 characters, LUN naming convension is {COUNTRY:2} _ {OS:3} _ {HOST:16} _ {CHAIN:1} _ {PROTECT:1}{TYPE:1}{Suffix:3}
+  - description: Maximum 28 characters, LUN naming convension is {COUNTRY:2} _ {OS:3} _ {HOST:16} _ {CHAIN:1} _ {PROTECT:1}{TYPE:1}{Suffix:4}
     name: LUN_Prefix
   - name: Start_Suffix
     value: 0
@@ -60,7 +60,7 @@
   - delimiter: '|'
     multivalued: true
     name: LUN_Description
-    description: Add LUN Description (optional, max 200 chars for all items, '|' and '_' not permitted)
+    description: Add LUN Description (optional, max 255 chars for all items, '|' and '_' not permitted)
   scheduleEnabled: true
   sequence:
     commands:
@@ -73,6 +73,8 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Job_User: ${job.user.name}
+
           Site: ${option.Site}
           Room: ${option.Room}
           Storage: ${option.Storage}

diff --git a/rundeck/jobs/project001/23_resize_luns_for_host.yaml b/rundeck/jobs/project001/23_resize_luns_for_host.yaml
@@ -173,6 +173,9 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Host: ${option.Host}
           Storage: ${option.Storage}
           Storage_Room: ${option.Storage_Room}

diff --git a/rundeck/jobs/project001/24_resize_luns_for_cluster.yaml b/rundeck/jobs/project001/24_resize_luns_for_cluster.yaml
@@ -176,6 +176,9 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Cluster: ${option.Cluster}
           Storage: ${option.Storage}
           Storage_Room: ${option.Storage_Room}

diff --git a/rundeck/jobs/project001/25_create_snapshots_for_host.yaml b/rundeck/jobs/project001/25_create_snapshots_for_host.yaml
@@ -70,7 +70,7 @@
   - delimiter: '|'
     multivalued: true
     name: Snapshot_Description
-    description: Add Snapshot Description (optional, max 200 chars for all items, '|' and '_' not permitted)
+    description: Add Snapshot Description (optional, max 255 chars for all items, '|' and '_' not permitted)
   - enforced: true
     name: Class_1
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/lungroup?range=[0-100]&nameAttr=DESCRIPTION:0:2:3&valueAttr=DESCRIPTION:0:2:3&filter=NAME::${option.Target_LUN_Group.value}
@@ -106,6 +106,8 @@
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
           Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Target_Host: ${option.Target_Host}
           Target_LUN_Group: ${option.Target_LUN_Group}
           Target_HyperMetro: ${option.Target_HyperMetro}

diff --git a/rundeck/jobs/project001/26_change_snapshots_for_host.yaml b/rundeck/jobs/project001/26_change_snapshots_for_host.yaml
@@ -107,6 +107,8 @@
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
           Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Target_Host: ${option.Target_Host}
           Target_LUN_Group: ${option.Target_LUN_Group}
           Storage: ${option.Storage}

diff --git a/rundeck/jobs/project001/27_create_snapshots_for_cluster.yaml b/rundeck/jobs/project001/27_create_snapshots_for_cluster.yaml
@@ -76,7 +76,7 @@
   - delimiter: '|'
     multivalued: true
     name: Snapshot_Description
-    description: Add Snapshot Description (optional, max 200 chars for all items, '|' and '_' not permitted)
+    description: Add Snapshot Description (optional, max 255 chars for all items, '|' and '_' not permitted)
   - enforced: true
     name: Class_1
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/lungroup?range=[0-100]&nameAttr=DESCRIPTION:0:2:3&valueAttr=DESCRIPTION:0:2:3&filter=NAME::${option.Target_LUN_Group.value}
@@ -112,6 +112,8 @@
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
           Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Target_Cluster: ${option.Target_Cluster}
           Target_LUN_Group: ${option.Target_LUN_Group}
           Target_HyperMetro: ${option.Target_HyperMetro}

diff --git a/rundeck/jobs/project001/28_change_snapshots_for_cluster.yaml b/rundeck/jobs/project001/28_change_snapshots_for_cluster.yaml
@@ -110,6 +110,8 @@
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
           Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           Target_Cluster: ${option.Target_Cluster}
           Target_LUN_Group: ${option.Target_LUN_Group}
           Storage: ${option.Storage}

diff --git a/rundeck/jobs/project001/29_dr_test_for_host.yaml b/rundeck/jobs/project001/29_dr_test_for_host.yaml
@@ -85,7 +85,7 @@
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/protectgroup?nameAttr=protectGroupName&valueAttr=protectGroupName&range=[0-100]&filter=lunGroupId::${option.DR_LUN_Group_ID.value}
   - enforced: true
     name: DR_CG
-    valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/CONSISTENTGROUP?nameAttr=NAME&valueAttr=NAME&range=[0-100]&filter=localPgName::${option.DR_Protection_Group.value}%20and%20RUNNINGSTATUS::1
+    valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/CONSISTENTGROUP?nameAttr=NAME&valueAttr=NAME&range=[0-100]&filter=localPgName::${option.DR_Protection_Group.value}
   - enforced: true
     name: DR_Test_CG_ID
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/snapshot_consistency_group?nameAttr=ID&valueAttr=ID&filter=NAME::${option.DR_Test_CG.value}
@@ -104,6 +104,9 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           DR_Host: ${option.DR_Host}
           DR_Test_Host: ${option.DR_Test_Host}
           DR_Storage: ${option.DR_Storage}

diff --git a/rundeck/jobs/project001/30_dr_test_clean_for_host.yaml b/rundeck/jobs/project001/30_dr_test_clean_for_host.yaml
@@ -80,7 +80,7 @@
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/protectgroup?nameAttr=protectGroupName&valueAttr=protectGroupName&range=[0-100]&filter=lunGroupId::${option.DR_LUN_Group_ID.value}
   - enforced: true
     name: DR_CG
-    valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/CONSISTENTGROUP?nameAttr=NAME&valueAttr=NAME&range=[0-100]&filter=localPgName::${option.DR_Protection_Group.value}%20and%20RUNNINGSTATUS::1
+    valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/CONSISTENTGROUP?nameAttr=NAME&valueAttr=NAME&range=[0-100]&filter=localPgName::${option.DR_Protection_Group.value}
   - enforced: true
     name: DR_Test_CG_ID
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/snapshot_consistency_group?nameAttr=ID&valueAttr=ID&filter=NAME::${option.DR_Test_CG.value}
@@ -102,6 +102,9 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           DR_Host: ${option.DR_Host}
           DR_Test_Host: ${option.DR_Test_Host}
           DR_Storage: ${option.DR_Storage}

diff --git a/rundeck/jobs/project001/31_dr_test_for_cluster.yaml b/rundeck/jobs/project001/31_dr_test_for_cluster.yaml
@@ -88,7 +88,7 @@
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/protectgroup?nameAttr=protectGroupName&valueAttr=protectGroupName&range=[0-100]&filter=lunGroupId::${option.DR_LUN_Group_ID.value}
   - enforced: true
     name: DR_CG
-    valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/CONSISTENTGROUP?nameAttr=NAME&valueAttr=NAME&range=[0-100]&filter=localPgName::${option.DR_Protection_Group.value}%20and%20RUNNINGSTATUS::1
+    valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/CONSISTENTGROUP?nameAttr=NAME&valueAttr=NAME&range=[0-100]&filter=localPgName::${option.DR_Protection_Group.value}
   - enforced: true
     name: DR_Test_CG_ID
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/snapshot_consistency_group?nameAttr=ID&valueAttr=ID&filter=NAME::${option.DR_Test_CG.value}
@@ -107,6 +107,9 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           DR_Cluster: ${option.DR_Cluster}
           DR_Test_Cluster: ${option.DR_Test_Cluster}
           DR_Storage: ${option.DR_Storage}

diff --git a/rundeck/jobs/project001/32_dr_test_clean_for_cluster.yaml b/rundeck/jobs/project001/32_dr_test_clean_for_cluster.yaml
@@ -83,7 +83,7 @@
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/protectgroup?nameAttr=protectGroupName&valueAttr=protectGroupName&range=[0-100]&filter=lunGroupId::${option.DR_LUN_Group_ID.value}
   - enforced: true
     name: DR_CG
-    valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/CONSISTENTGROUP?nameAttr=NAME&valueAttr=NAME&range=[0-100]&filter=localPgName::${option.DR_Protection_Group.value}%20and%20RUNNINGSTATUS::1
+    valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/CONSISTENTGROUP?nameAttr=NAME&valueAttr=NAME&range=[0-100]&filter=localPgName::${option.DR_Protection_Group.value}
   - enforced: true
     name: DR_Test_CG_ID
     valuesUrl: http://localhost:26337/deviceManager/rest/${option.DR_Storage.value}/data/v1/search/snapshot_consistency_group?nameAttr=ID&valueAttr=ID&filter=NAME::${option.DR_Test_CG.value}
@@ -105,6 +105,9 @@
 
           WBE_CODE: ${option.WBE_CODE}
           TICKET_NUMBER: ${option.TICKET_NUMBER}
+          Country: ${option.Country}
+          Job_User: ${job.user.name}
+
           DR_Cluster: ${option.DR_Cluster}
           DR_Test_Cluster: ${option.DR_Test_Cluster}
           DR_Storage: ${option.DR_Storage}