From 1441c6ad3f83b5ca3e9cde5638673f62d95f32af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ne=C4=8Das?= Date: Tue, 6 Nov 2018 16:36:27 +0100 Subject: [PATCH] add old usages to network cluster (#47185) * add old usages to network cluster * set default value to old usages * rename cluster_network_service to cluster_network_entity --- lib/ansible/modules/cloud/ovirt/ovirt_network.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/ansible/modules/cloud/ovirt/ovirt_network.py b/lib/ansible/modules/cloud/ovirt/ovirt_network.py index aed2f8ace4..647f9e4d63 100644 --- a/lib/ansible/modules/cloud/ovirt/ovirt_network.py +++ b/lib/ansible/modules/cloud/ovirt/ovirt_network.py @@ -146,6 +146,7 @@ from ansible.module_utils.ovirt import ( search_by_name, get_id_by_name, get_dict_of_struct, + get_entity ) @@ -213,6 +214,10 @@ class ClusterNetworksModule(BaseModule): super(ClusterNetworksModule, self).__init__(*args, **kwargs) self._network_id = network_id self._cluster_network = cluster_network + self._old_usages = [] + self._cluster_network_entity = get_entity(self._service.network_service(network_id)) + if self._cluster_network_entity is not None: + self._old_usages = self._cluster_network_entity.usages def build_entity(self): return otypes.Network( @@ -220,11 +225,12 @@ class ClusterNetworksModule(BaseModule): name=self._module.params['name'], required=self._cluster_network.get('required'), display=self._cluster_network.get('display'), - usages=[ + usages=list(set([ otypes.NetworkUsage(usage) for usage in ['display', 'gluster', 'migration'] if self._cluster_network.get(usage, False) - ] if ( + ] + self._old_usages)) + if ( self._cluster_network.get('display') is not None or self._cluster_network.get('gluster') is not None or self._cluster_network.get('migration') is not None