Skip to content

Commit 97b4959

Browse files
doubletao318doubletao318
authored
Merge pull request #1 from Huawei/DME_Storage_1.0.0_CP3
DME Storage 1.0.0 CP3
2 parents 643912f + b39e0c8 commit 97b4959

File tree

149 files changed

+15753
-2341
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

149 files changed

+15753
-2341
lines changed

‎config/global.yml

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ GLOBAL:
2727
recoveryPolicy: 1 # 1/automatic, 2/manual
2828
syncSpeed: 2 # 1/low, 2/medium, 3/high, 4/highest
2929
syncType: 3 # 1/manual, 2/wait after last sync begin, 3/wait after last sync ends
30-
interval: 60 # synchronize interval in seconds (10 ~ 86400)
30+
interval: 30 # synchronize interval in seconds (10 ~ 86400)
3131
compress: False # enable compress for async replication: true, false
3232
timeout: 10 # synchronize remote I/O timeout threshold in seconds, default: 10, options: 10~30, or set to 255 to disable timeout
3333
syncRetries: 3600 # 5 hours
@@ -83,19 +83,13 @@ DMDATASERVICE: # DeviceManager Data service configuratio
8383
DEFAULT:
8484
noneName: "NONE"
8585
noneValue: "__NONE__"
86-
suffixDigits: 3
86+
suffixDigits: 4
8787

8888
LOGGING:
89-
format: '[%(asctime)s] %(levelname)-5s - %(message)s'
89+
format: '%(asctime)s - %(levelname)s - %(filename)s[:%(lineno)d] - %(message)s'
9090
datefmt: '%Y-%m-%d %H:%M:%S'
9191
level: 'DEBUG'
92-
levelno:
93-
CRITICAL: 50
94-
ERROR: 40
95-
WARNING: 30
96-
INFO: 20
97-
DEBUG: 10
98-
NOTSET: 0
92+
path: "/var/lib/rundeck/logs/data_service"
9993

10094
DJSERVICE:
10195
API:

‎playbook/storage/oceanstor/get_lgs_by_host.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- name: Delete LUN Group
2+
hosts: localhost
3+
vars_files:
4+
- ../../../config/global.yml
5+
gather_facts: no
6+
become: no
7+
tasks:
8+
- import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/login_storage.yml"
9+
- include_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/get_lgs_by_host.yml"

‎playbook/storage/oceanstor/get_luns_by_pg.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- name: Delete LUN Group
2+
hosts: localhost
3+
vars_files:
4+
- ../../../config/global.yml
5+
gather_facts: no
6+
become: no
7+
tasks:
8+
- import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/login_storage.yml"
9+
- import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/get_luns_by_pg.yml"

‎playbook/storage/oceanstor/get_snapshots_by_cg.yml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- name: Delete LUN Group
2+
hosts: localhost
3+
vars_files:
4+
- ../../../config/global.yml
5+
gather_facts: no
6+
become: no
7+
tasks:
8+
- import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/login_storage.yml"
9+
- import_tasks: "{{GLOBAL.baseDir}}/task/storage/oceanstor/get_snapshots_by_cg.yml"

‎rundeck/jobs/project001/01_create_host.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969
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}"
7070
description: Select to confirm primary host result <BR><BR><h2>Protection Settings</h2>
7171
- name: Session_Name
72-
description: Input Session Name used for CGs (optional, max 16 chars, '_' not permitted, default is Primary Host Name)
72+
description: Input Session Name used for CGs (optional, max 13 chars, '_' not permitted, default is Primary Host Name)
7373
- enforced: true
7474
name: Enable_HyperMetro
7575
value: 'N'

‎rundeck/jobs/project001/03_modify_host_info.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
name: Session_Name
6868
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}
6969
- name: Modify_Session_Name
70-
description: Input New Session Name (start with {Country}0, max 19 chars, '_' not permitted) <BR><BR><h2>Performance Class</h2>
70+
description: Input New Session Name (start with {Country}0, max 16 chars, '_' not permitted) <BR><BR><h2>Performance Class</h2>
7171
- enforced: true
7272
name: Class_1
7373
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}

‎rundeck/jobs/project001/05_create_cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
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"
6363
description: Select to confirm primary cluster result <BR><BR><h2>Protection Settings</h2>
6464
- name: Session_Name
65-
description: Input Session Name used for grouping (optional, max 16 chars, '_' not permitted, default is Primary Cluster Name)
65+
description: Input Session Name used for grouping (optional, max 13 chars, '_' not permitted, default is Primary Cluster Name)
6666
- enforced: true
6767
name: Enable_HyperMetro
6868
value: 'N'

‎rundeck/jobs/project001/07_modify_cluster_info.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
name: Session_Name
7171
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}
7272
- name: Modify_Session_Name
73-
description: Input New Session Name (start with {Country}0, max 19 chars, '_' not permitted) <BR><BR><h2>Performance Class</h2>
73+
description: Input New Session Name (start with {Country}0, max 16 chars, '_' not permitted) <BR><BR><h2>Performance Class</h2>
7474
- enforced: true
7575
name: Class_1
7676
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 @@
225225
Modify_DR_Cluster_Description: ${option.Modify_DR_Cluster_Description}
226226
Class_2: ${option.Class_2}
227227
Modify_Class_2: ${option.Modify_Class_2}
228-
Check_Result_3: ${option.Check_Result_2}
228+
Check_Result_3: ${option.Check_Result_3}
229229
230230
DR_Test_Cluster: ${option.DR_Test_Cluster}
231231
Class_3: ${option.Class_3}
232232
Modify_Class_3: ${option.Modify_Class_3}
233-
Check_Result_4: ${option.Check_Result_3}
233+
Check_Result_4: ${option.Check_Result_4}
234234
235235
Protection_Group: ${option.Protection_Group}
236236
Metro_CG: ${option.Metro_CG}

‎rundeck/jobs/project001/09_create_luns_for_host.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
- delimiter: '|'
5656
multivalued: true
5757
name: LUN_Description
58-
description: Add LUN Description (optional, max 200 chars for all items, '|' and '_' not permitted)
58+
description: Add LUN Description (optional, max 255 chars for all items, '|' and '_' not permitted)
5959
- enforced: true
6060
name: Pool
6161
valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/storagepool?nameAttr=NAME&valueAttr=ID
@@ -221,6 +221,8 @@
221221
WBE_CODE: ${option.WBE_CODE}
222222
TICKET_NUMBER: ${option.TICKET_NUMBER}
223223
Country: ${option.Country}
224+
Job_User: ${job.user.name}
225+
224226
Host: ${option.Host}
225227
Storage: ${option.Storage}
226228
Storage_Room: ${option.Storage_Room}

‎rundeck/jobs/project001/10_map_luns_to_host.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,8 @@
220220
WBE_CODE: ${option.WBE_CODE}
221221
TICKET_NUMBER: ${option.TICKET_NUMBER}
222222
Country: ${option.Country}
223+
Job_User: ${job.user.name}
224+
223225
Host: ${option.Host}
224226
Storage: ${option.Storage}
225227
Storage_Room: ${option.Storage_Room}

‎rundeck/jobs/project001/11_unmap_luns_from_host.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@
182182
183183
WBE_CODE: ${option.WBE_CODE}
184184
TICKET_NUMBER: ${option.TICKET_NUMBER}
185+
Country: ${option.Country}
186+
Job_User: ${job.user.name}
187+
185188
Host: ${option.Host}
186189
Storage: ${option.Storage}
187190
Storage_Room: ${option.Storage_Room}

‎rundeck/jobs/project001/13_create_luns_for_cluster.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
- delimiter: '|'
5959
multivalued: true
6060
name: LUN_Description
61-
description: Add LUN Description (optional, max 200 chars for all items, '|' and '_' not permitted)
61+
description: Add LUN Description (optional, max 255 chars for all items, '|' and '_' not permitted)
6262
- enforced: true
6363
name: Pool
6464
valuesUrl: http://localhost:26337/deviceManager/rest/${option.Storage.value}/data/v1/search/storagepool?nameAttr=NAME&valueAttr=ID
@@ -224,6 +224,8 @@
224224
WBE_CODE: ${option.WBE_CODE}
225225
TICKET_NUMBER: ${option.TICKET_NUMBER}
226226
Country: ${option.Country}
227+
Job_User: ${job.user.name}
228+
227229
Cluster: ${option.Cluster}
228230
Storage: ${option.Storage}
229231
Storage_Room: ${option.Storage_Room}

‎rundeck/jobs/project001/14_map_luns_to_cluster.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,8 @@
223223
WBE_CODE: ${option.WBE_CODE}
224224
TICKET_NUMBER: ${option.TICKET_NUMBER}
225225
Country: ${option.Country}
226+
Job_User: ${job.user.name}
227+
226228
Cluster: ${option.Cluster}
227229
Storage: ${option.Storage}
228230
Storage_Room: ${option.Storage_Room}

‎rundeck/jobs/project001/15_unmap_luns_from_cluster.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@
185185
186186
WBE_CODE: ${option.WBE_CODE}
187187
TICKET_NUMBER: ${option.TICKET_NUMBER}
188+
Country: ${option.Country}
189+
Job_User: ${job.user.name}
190+
188191
Cluster: ${option.Cluster}
189192
Storage: ${option.Storage}
190193
Storage_Room: ${option.Storage_Room}

‎rundeck/jobs/project001/16_delete_lun.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@
6262
6363
WBE_CODE: ${option.WBE_CODE}
6464
TICKET_NUMBER: ${option.TICKET_NUMBER}
65+
Country: ${option.Country}
66+
Job_User: ${job.user.name}
67+
6568
Select_LUN: ${option.Select_LUN}
6669
Upload_LUN: ${file.Upload_LUN}
6770
Delimiter: "${option.Delimiter}"

‎rundeck/jobs/project001/17_change_class.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@
5555
ansible-extra-vars: |-
5656
WBE_CODE: ${option.WBE_CODE}
5757
TICKET_NUMBER: ${option.TICKET_NUMBER}
58+
Country: ${option.Country}
59+
Job_User: ${job.user.name}
60+
5861
Select_LUN: ${option.Select_LUN}
5962
Upload_LUN: ${file.Upload_LUN}
6063
Delimiter: "${option.Delimiter}"

‎rundeck/jobs/project001/18_remove_class.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,9 @@
5757
ansible-extra-vars: |-
5858
WBE_CODE: ${option.WBE_CODE}
5959
TICKET_NUMBER: ${option.TICKET_NUMBER}
60+
Country: ${option.Country}
61+
Job_User: ${job.user.name}
62+
6063
Select_LUN: ${option.Select_LUN}
6164
Upload_LUN: ${file.Upload_LUN}
6265
Delimiter: "${option.Delimiter}"

‎rundeck/jobs/project001/21_create_luns.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
type: file
5050
- name: Delimiter
5151
value: ','
52-
- description: Maximum 28 characters, LUN naming convension is {COUNTRY:2} _ {OS:3} _ {HOST:16} _ {CHAIN:1} _ {PROTECT:1}{TYPE:1}{Suffix:3}
52+
- description: Maximum 28 characters, LUN naming convension is {COUNTRY:2} _ {OS:3} _ {HOST:16} _ {CHAIN:1} _ {PROTECT:1}{TYPE:1}{Suffix:4}
5353
name: LUN_Prefix
5454
- name: Start_Suffix
5555
value: 0
@@ -60,7 +60,7 @@
6060
- delimiter: '|'
6161
multivalued: true
6262
name: LUN_Description
63-
description: Add LUN Description (optional, max 200 chars for all items, '|' and '_' not permitted)
63+
description: Add LUN Description (optional, max 255 chars for all items, '|' and '_' not permitted)
6464
scheduleEnabled: true
6565
sequence:
6666
commands:
@@ -73,6 +73,8 @@
7373
7474
WBE_CODE: ${option.WBE_CODE}
7575
TICKET_NUMBER: ${option.TICKET_NUMBER}
76+
Job_User: ${job.user.name}
77+
7678
Site: ${option.Site}
7779
Room: ${option.Room}
7880
Storage: ${option.Storage}

‎rundeck/jobs/project001/23_resize_luns_for_host.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,9 @@
173173
174174
WBE_CODE: ${option.WBE_CODE}
175175
TICKET_NUMBER: ${option.TICKET_NUMBER}
176+
Country: ${option.Country}
177+
Job_User: ${job.user.name}
178+
176179
Host: ${option.Host}
177180
Storage: ${option.Storage}
178181
Storage_Room: ${option.Storage_Room}

‎rundeck/jobs/project001/24_resize_luns_for_cluster.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@
176176
177177
WBE_CODE: ${option.WBE_CODE}
178178
TICKET_NUMBER: ${option.TICKET_NUMBER}
179+
Country: ${option.Country}
180+
Job_User: ${job.user.name}
181+
179182
Cluster: ${option.Cluster}
180183
Storage: ${option.Storage}
181184
Storage_Room: ${option.Storage_Room}

‎rundeck/jobs/project001/25_create_snapshots_for_host.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
- delimiter: '|'
7171
multivalued: true
7272
name: Snapshot_Description
73-
description: Add Snapshot Description (optional, max 200 chars for all items, '|' and '_' not permitted)
73+
description: Add Snapshot Description (optional, max 255 chars for all items, '|' and '_' not permitted)
7474
- enforced: true
7575
name: Class_1
7676
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 @@
106106
WBE_CODE: ${option.WBE_CODE}
107107
TICKET_NUMBER: ${option.TICKET_NUMBER}
108108
Country: ${option.Country}
109+
Job_User: ${job.user.name}
110+
109111
Target_Host: ${option.Target_Host}
110112
Target_LUN_Group: ${option.Target_LUN_Group}
111113
Target_HyperMetro: ${option.Target_HyperMetro}

‎rundeck/jobs/project001/26_change_snapshots_for_host.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,8 @@
107107
WBE_CODE: ${option.WBE_CODE}
108108
TICKET_NUMBER: ${option.TICKET_NUMBER}
109109
Country: ${option.Country}
110+
Job_User: ${job.user.name}
111+
110112
Target_Host: ${option.Target_Host}
111113
Target_LUN_Group: ${option.Target_LUN_Group}
112114
Storage: ${option.Storage}

‎rundeck/jobs/project001/27_create_snapshots_for_cluster.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
- delimiter: '|'
7777
multivalued: true
7878
name: Snapshot_Description
79-
description: Add Snapshot Description (optional, max 200 chars for all items, '|' and '_' not permitted)
79+
description: Add Snapshot Description (optional, max 255 chars for all items, '|' and '_' not permitted)
8080
- enforced: true
8181
name: Class_1
8282
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 @@
112112
WBE_CODE: ${option.WBE_CODE}
113113
TICKET_NUMBER: ${option.TICKET_NUMBER}
114114
Country: ${option.Country}
115+
Job_User: ${job.user.name}
116+
115117
Target_Cluster: ${option.Target_Cluster}
116118
Target_LUN_Group: ${option.Target_LUN_Group}
117119
Target_HyperMetro: ${option.Target_HyperMetro}

‎rundeck/jobs/project001/28_change_snapshots_for_cluster.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,8 @@
110110
WBE_CODE: ${option.WBE_CODE}
111111
TICKET_NUMBER: ${option.TICKET_NUMBER}
112112
Country: ${option.Country}
113+
Job_User: ${job.user.name}
114+
113115
Target_Cluster: ${option.Target_Cluster}
114116
Target_LUN_Group: ${option.Target_LUN_Group}
115117
Storage: ${option.Storage}

‎rundeck/jobs/project001/29_dr_test_for_host.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
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}
8686
- enforced: true
8787
name: DR_CG
88-
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
88+
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}
8989
- enforced: true
9090
name: DR_Test_CG_ID
9191
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 @@
104104
105105
WBE_CODE: ${option.WBE_CODE}
106106
TICKET_NUMBER: ${option.TICKET_NUMBER}
107+
Country: ${option.Country}
108+
Job_User: ${job.user.name}
109+
107110
DR_Host: ${option.DR_Host}
108111
DR_Test_Host: ${option.DR_Test_Host}
109112
DR_Storage: ${option.DR_Storage}

‎rundeck/jobs/project001/30_dr_test_clean_for_host.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@
8080
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}
8181
- enforced: true
8282
name: DR_CG
83-
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
83+
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}
8484
- enforced: true
8585
name: DR_Test_CG_ID
8686
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 @@
102102
103103
WBE_CODE: ${option.WBE_CODE}
104104
TICKET_NUMBER: ${option.TICKET_NUMBER}
105+
Country: ${option.Country}
106+
Job_User: ${job.user.name}
107+
105108
DR_Host: ${option.DR_Host}
106109
DR_Test_Host: ${option.DR_Test_Host}
107110
DR_Storage: ${option.DR_Storage}

‎rundeck/jobs/project001/31_dr_test_for_cluster.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
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}
8989
- enforced: true
9090
name: DR_CG
91-
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
91+
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}
9292
- enforced: true
9393
name: DR_Test_CG_ID
9494
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 @@
107107
108108
WBE_CODE: ${option.WBE_CODE}
109109
TICKET_NUMBER: ${option.TICKET_NUMBER}
110+
Country: ${option.Country}
111+
Job_User: ${job.user.name}
112+
110113
DR_Cluster: ${option.DR_Cluster}
111114
DR_Test_Cluster: ${option.DR_Test_Cluster}
112115
DR_Storage: ${option.DR_Storage}

‎rundeck/jobs/project001/32_dr_test_clean_for_cluster.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
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}
8484
- enforced: true
8585
name: DR_CG
86-
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
86+
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}
8787
- enforced: true
8888
name: DR_Test_CG_ID
8989
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 @@
105105
106106
WBE_CODE: ${option.WBE_CODE}
107107
TICKET_NUMBER: ${option.TICKET_NUMBER}
108+
Country: ${option.Country}
109+
Job_User: ${job.user.name}
110+
108111
DR_Cluster: ${option.DR_Cluster}
109112
DR_Test_Cluster: ${option.DR_Test_Cluster}
110113
DR_Storage: ${option.DR_Storage}

0 commit comments

Comments
 (0)