Merge pull request #234 from HewlettPackard/api/1200/volume_attachment

Api/1200/volume attachment
HewlettPackard · Mar 3, 2020 · 260ae0e · 260ae0e
2 parents 1c282f5 + c098b8a
commit 260ae0e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - Storage volume template
 - Uplink set
 - Volume
+- Volume attachment
 
 ### Image Streamer support
 - Deployment plan

diff --git a/endpoints-support.md b/endpoints-support.md
@@ -224,6 +224,13 @@
 |<sub>/rest/storage-systems/{id}/managedPorts/{portId}</sub>                              | GET      | :white_check_mark:   | :white_check_mark:   | :heavy_minus_sign:   | :heavy_minus_sign:   |:heavy_minus_sign:   |:heavy_minus_sign:   |:heavy_minus_sign:   |
 |<sub>/rest/storage-systems/{id}/reachable-ports</sub>                                    | GET      | :heavy_minus_sign:   | :heavy_minus_sign:   | :heavy_multiplication_x:  |  :heavy_multiplication_x:   | :heavy_multiplication_x: | :heavy_multiplication_x:  | :heavy_multiplication_x:|
 |<sub>/rest/storage-systems/{id}/templates</sub>                                          | GET      | :heavy_minus_sign:   | :heavy_minus_sign:   | :heavy_multiplication_x:   | :heavy_multiplication_x: | :heavy_multiplication_x:   | :heavy_multiplication_x: | :heavy_multiplication_x: |
+|     **Storage Volume Attachments**                                                                                                                |
+|<sub>/rest/storage-volume-attachments</sub>                                              | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |:white_check_mark:   |:white_check_mark:   |:white_check_mark:   |
+|<sub>/rest/storage-volume-attachments/{id}</sub>                                         | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |:white_check_mark:   |:white_check_mark:   |:white_check_mark:   |:white_check_mark:   |
+|<sub>/rest/storage-volume-attachments/repair</sub>                                       | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |:white_check_mark:   |:white_check_mark:   |:white_check_mark:   |:white_check_mark:   |
+|<sub>/rest/storage-volume-attachments/repair</sub>                                       | POST     | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |:white_check_mark:   |:white_check_mark:   |:white_check_mark:   |:white_check_mark:   |
+|<sub>/rest/storage-volume-attachments/{attachmentId}/paths</sub>                         | GET      | :white_check_mark:   | :white_check_mark:   | :heavy_minus_sign:   |:heavy_minus_sign:   |:heavy_minus_sign:   |:heavy_minus_sign:   |:heavy_minus_sign:   |
+|<sub>/rest/storage-volume-attachments/{attachmentId)/paths/{id}</sub>                    | GET      | :white_check_mark:   | :white_check_mark:   | :heavy_minus_sign:   |:heavy_minus_sign:   |:heavy_minus_sign:   |:heavy_minus_sign:   |:heavy_minus_sign:   |
 |     **Storage Volume Templates**                                                                                                                  |
 |<sub>/rest/storage-volume-templates</sub>                                                | GET      | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |:white_check_mark:   |:white_check_mark:   |:white_check_mark:   |
 |<sub>/rest/storage-volume-templates</sub>                                                | POST     | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   | :white_check_mark:   |:white_check_mark:   |:white_check_mark:   |:white_check_mark:   |

diff --git a/lib/puppet/provider/oneview_volume_attachment/c7000.rb b/lib/puppet/provider/oneview_volume_attachment/c7000.rb
@@ -1,5 +1,5 @@
 ################################################################################
-# (C) Copyright 2016-2017 Hewlett Packard Enterprise Development LP
+# (C) Copyright 2016-2020 Hewlett Packard Enterprise Development LP
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # You may not use this file except in compliance with the License.
@@ -43,8 +43,9 @@ def found
   end
 
   def get_extra_unmanaged_volumes
-    extra_unmanaged_volumes = @resource_type.get_extra_unmanaged_volumes(@client)['members']
-    raise "\n\nNo Unmanaged volumes were found on the appliance.\n\n" if extra_unmanaged_volumes.empty?
+    unmanaged_volumes_out = @resource_type.get_extra_unmanaged_volumes(@client)
+    raise "\n\nNo Unmanaged volumes were found on the appliance.\n\n" if unmanaged_volumes_out.empty?
+    extra_unmanaged_volumes = unmanaged_volumes_out['members']
     Puppet.notice "\n\nUnmanaged volumes:\n\n"
     extra_unmanaged_volumes.each do |unmanaged_volume|
       Puppet.notice "\n- #{unmanaged_volume['ownerUri']}\n"