Sync bitbucket and GitHub

ansible-collections · Apr 22, 2021 · 16e33bd · 16e33bd
1 parent 3ae7a59
commit 16e33bd
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 1 deletion.
diff --git a/ansible_collections/netapp/cloudmanager/CHANGELOG.rst b/ansible_collections/netapp/cloudmanager/CHANGELOG.rst
@@ -16,6 +16,11 @@ Minor Changes
 - na_cloudmanager_cvo_azure - Return newly created AZURE working_environment_id.
 - na_cloudmanager_cvo_gcp - Return newly created GCP working_environment_id.
 
+Bugfixes
+--------
+
+- na_cloudmanager_cvo_aws - Fix incorrect placement of platformSerialNumber in the resulting json structure
+
 v21.4.0
 =======
 

diff --git a/ansible_collections/netapp/cloudmanager/README.md b/ansible_collections/netapp/cloudmanager/README.md
@@ -37,6 +37,9 @@ https://github.com/ansible-collections/netapp/wiki
   - na_cloudmanager_cvo_azure: Return newly created AZURE working_environment_id
   - na_cloudmanager_cvo_gcp: Return newly created GCP working_environment_id
 
+## Bug Fixes
+  - na_cloudmanager_cvo_aws: Fix incorrect placement of platformSerialNumber in the resulting json structure
+
 ## 21.4.0
 
 ### Module documentation changes

diff --git a/ansible_collections/netapp/cloudmanager/changelogs/changelog.yaml b/ansible_collections/netapp/cloudmanager/changelogs/changelog.yaml
@@ -39,6 +39,9 @@ releases:
     release_date: '2021-04-07'
   21.5.0:
     changes:
+      bugfixes:
+      - na_cloudmanager_cvo_aws - Fix incorrect placement of platformSerialNumber
+        in the resulting json structure
       minor_changes:
       - na_cloudmanager_connector_aws - Return newly created Azure client ID in cloud
         manager, instance ID and account ID. New option ``proxy_certificates``.
@@ -48,4 +51,5 @@ releases:
     fragments:
     - DEVOPS-3803.yaml
     - DEVOPS-3844.yaml
+    - DEVOPS-3922.yaml
     release_date: '2021-04-21'
diff --git a/ansible_collections/netapp/cloudmanager/changelogs/fragments/DEVOPS-3922.yaml b/ansible_collections/netapp/cloudmanager/changelogs/fragments/DEVOPS-3922.yaml
@@ -0,0 +1,2 @@
+bugfixes:
+  - na_cloudmanager_cvo_aws - Fix incorrect placement of platformSerialNumber in the resulting json structure
diff --git a/ansible_collections/netapp/cloudmanager/plugins/modules/na_cloudmanager_cvo_aws.py b/ansible_collections/netapp/cloudmanager/plugins/modules/na_cloudmanager_cvo_aws.py
@@ -590,7 +590,7 @@ def create_cvo_aws(self):
                          "tierLevel": self.parameters['tier_level']})
 
         if self.parameters.get('platform_serial_number') is not None:
-            json.update({"platformSerialNumber": self.parameters['platform_serial_number']})
+            json['vsaMetadata'].update({"platformSerialNumber": self.parameters['platform_serial_number']})
 
         if self.parameters.get('writing_speed_state') is not None:
             json.update({"writingSpeedState": self.parameters['writing_speed_state']})
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		bugfixes:
		- na_cloudmanager_cvo_aws - Fix incorrect placement of platformSerialNumber in the resulting json structure