X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO-VIM-openstack%2Fosm_rovim_openstack%2Fvimconn_openstack.py;h=00558dc686b9b8a1d4ea3856cf83d98145babab9;hb=refs%2Fchanges%2F95%2F12795%2F1;hp=3d5eb7740051bc1368e846868bb40f795626215f;hpb=2f4ab6c311722e3a060f5b34ed419be318916a1b;p=osm%2FRO.git diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py index 3d5eb774..00558dc6 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py @@ -754,7 +754,7 @@ class vimconnector(vimconn.VimConnector): self._reload_connection() network_dict = {"name": net_name, "admin_state_up": True} - if net_type in ("data", "ptp"): + if net_type in ("data", "ptp") or provider_network_profile: provider_physical_network = None if provider_network_profile and provider_network_profile.get( @@ -2305,14 +2305,13 @@ class vimconnector(vimconn.VimConnector): return self.neutron.show_floatingip(free_floating_ip) def _get_free_floating_ip( - self, server: object, floating_network: dict, created_items: dict + self, server: object, floating_network: dict ) -> Optional[str]: """Get the free floating IP address. Args: server (object): Server Object floating_network (dict): Floating network details - created_items (dict): All created items belongs to new VM instance Returns: free_floating_ip (str): Free floating ip addr @@ -2324,9 +2323,7 @@ class vimconnector(vimconn.VimConnector): # Randomize random.shuffle(floating_ips) - return self._find_floating_ip( - server, floating_ips, floating_network, created_items - ) + return self._find_floating_ip(server, floating_ips, floating_network) def _prepare_external_network_for_vminstance( self, @@ -2356,7 +2353,7 @@ class vimconnector(vimconn.VimConnector): while not assigned: free_floating_ip = self._get_free_floating_ip( - server, floating_network, created_items + server, floating_network ) if not free_floating_ip: