Skip to content

Commit 7066b40

Browse files
Menneni, Shreyamboglesby
authored andcommitted
Pull request #33: NSOL-5924 catch error via logger
Merge in SIE-BB/netapp-dataops-toolkit from bug/logger-errors-cifsshare to release-v3.0.0 * commit 'cbb501a5a0a5884d7b40754c46233b4ae89e7e97': NSOL-5924 catch error via logger
2 parents 4a0bdb0 + cbb501a commit 7066b40

1 file changed

Lines changed: 14 additions & 0 deletions

File tree

netapp_dataops_traditional/netapp_dataops/traditional/protocols/cifs_share_operations.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,15 +114,21 @@ def create_cifs_share(
114114
# Verify SVM exists
115115
svm_object = NetAppSvm.find(name=svm)
116116
if not svm_object:
117+
if print_output:
118+
logger.error("Error: SVM '%s' not found", svm)
117119
raise InvalidCifsShareParameterError("SVM %s not found" % svm)
118120

119121
# Get volume and retrieve its NAS path
120122
volume = NetAppVolume.find(name=volume_name, svm=svm)
121123
if not volume:
124+
if print_output:
125+
logger.error("Error: Volume '%s' not found on SVM '%s'", volume_name, svm)
122126
raise InvalidCifsShareParameterError("Volume %s not found on SVM %s" % (volume_name, svm))
123127

124128
volume.get(fields="nas.path")
125129
if not hasattr(volume, 'nas') or not hasattr(volume.nas, 'path'):
130+
if print_output:
131+
logger.error("Error: Volume '%s' does not have a NAS path configured", volume_name)
126132
raise InvalidCifsShareParameterError("Volume %s does not have a NAS path configured" % volume_name)
127133

128134
path = volume.nas.path
@@ -133,6 +139,8 @@ def create_cifs_share(
133139
# Check if CIFS share already exists
134140
existing_share = NetAppCifsShare.find(name=name, svm=svm)
135141
if existing_share:
142+
if print_output:
143+
logger.error("Error: CIFS share '%s' already exists on SVM '%s'", name, svm)
136144
raise InvalidCifsShareParameterError("CIFS share %s already exists on SVM %s" % (name, svm))
137145

138146
# Create the CIFS share object
@@ -235,6 +243,8 @@ def list_cifs_shares(
235243
# Verify SVM exists
236244
svm_object = NetAppSvm.find(name=svm)
237245
if not svm_object:
246+
if print_output:
247+
logger.error("Error: SVM '%s' not found", svm)
238248
raise InvalidCifsShareParameterError("SVM %s not found" % svm)
239249
query['svm.name'] = svm
240250

@@ -372,12 +382,16 @@ def get_cifs_share(
372382
# Verify SVM exists
373383
svm_object = NetAppSvm.find(name=svm)
374384
if not svm_object:
385+
if print_output:
386+
logger.error("Error: SVM '%s' not found", svm)
375387
raise InvalidCifsShareParameterError("SVM %s not found" % svm)
376388

377389
# Find the specific CIFS share
378390
cifs_share = NetAppCifsShare.find(name=name, svm=svm)
379391

380392
if not cifs_share:
393+
if print_output:
394+
logger.error("Error: CIFS share '%s' not found on SVM '%s'", name, svm)
381395
raise InvalidCifsShareParameterError("CIFS share %s not found on SVM %s" % (name, svm))
382396

383397
# Get detailed information by retrieving the full object

0 commit comments

Comments
 (0)