Skip to content

Commit

Permalink
Merge branch 'master' into issue_481_update_volume
Browse files Browse the repository at this point in the history
  • Loading branch information
VenkateshRavula committed Jun 15, 2020
2 parents 9a11ea1 + 8136dfe commit 8ae46a5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

#### Bug fixes & Enhancements
- [#481](https://github.com/HewlettPackard/oneview-ansible/issues/481) oneview_volume is not idempotent
- [#487](https://github.com/HewlettPackard/oneview-ansible/issues/487) Fails Server profile update in case of existing network_set

## v5.6.0

Expand Down
3 changes: 2 additions & 1 deletion library/module_utils/oneview.py
Original file line number Diff line number Diff line change
Expand Up @@ -1060,7 +1060,8 @@ def _replace_networks_name_by_uri(self, data):
for connection in connections:
if 'networkName' in connection:
name = connection.pop('networkName')
connection['networkUri'] = self._get_network_by_name(name)['uri']
if name is not None:
connection['networkUri'] = self._get_network_by_name(name)['uri']

def _replace_server_hardware_type_name_by_uri(self, data):
self._replace_name_by_uri(data, 'serverHardwareTypeName', self.SERVER_HARDWARE_TYPE_NOT_FOUND,
Expand Down

0 comments on commit 8ae46a5

Please sign in to comment.