X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO-VIM-aws%2Fosm_rovim_aws%2Fvimconn_aws.py;h=db7e63e5016106441761668086eba4ca11ec81ee;hb=aca8cb5e63ebd11cc69373323d8df62b5d8cbfe2;hp=5a937d6a12fe1cedcef4cbd54afb06e62618e6c6;hpb=4e86d0ca6f191d698fff7e35aacff887ed7c616c;p=osm%2FRO.git

diff --git a/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py b/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
index 5a937d6a..db7e63e5 100644
--- a/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
+++ b/RO-VIM-aws/osm_rovim_aws/vimconn_aws.py
@@ -141,9 +141,9 @@ class vimconnector(vimconn.VimConnector):
                 try:
                     if flavor_data[0] == "@":  # read from a file
                         with open(flavor_data[1:], "r") as stream:
-                            self.flavor_info = yaml.load(stream, Loader=yaml.Loader)
+                            self.flavor_info = yaml.safe_load(stream)
                     else:
-                        self.flavor_info = yaml.load(flavor_data, Loader=yaml.Loader)
+                        self.flavor_info = yaml.safe_load(flavor_data)
                 except yaml.YAMLError as e:
                     self.flavor_info = None
 
@@ -204,19 +204,6 @@ class vimconnector(vimconn.VimConnector):
 
         raise vimconn.VimConnConnectionException(type(e).__name__ + ": " + str(e))
 
-    def get_availability_zones_list(self):
-        """Obtain AvailabilityZones from AWS"""
-        try:
-            self._reload_connection()
-            az_list = []
-
-            for az in self.conn.get_all_zones():
-                az_list.append(az.name)
-
-            return az_list
-        except Exception as e:
-            self.format_vimconn_exception(e)
-
     def get_tenant_list(self, filter_dict={}):
         """Obtain tenants of VIM
         filter_dict dictionary that can contain the following keys:
@@ -606,52 +593,6 @@ class vimconnector(vimconn.VimConnector):
         except Exception as e:
             self.format_vimconn_exception(e)
 
-    def get_flavor_id_from_data(self, flavor_dict):
-        """Obtain flavor id that match the flavor description
-        Params:
-            'flavor_dict': dictionary that contains:
-                'disk': main hard disk in GB
-                'ram': memory in MB
-                'vcpus': number of virtual cpus
-                #todo: complete parameters for EPA
-        Returns the flavor_id or raises a vimconnNotFoundException
-        """
-        self.logger.debug("Getting flavor id from data")
-
-        try:
-            flavor = None
-            for key, values in self.flavor_info.items():
-                if (values["ram"], values["cpus"], values["disk"]) == (
-                    flavor_dict["ram"],
-                    flavor_dict["vcpus"],
-                    flavor_dict["disk"],
-                ):
-                    flavor = (key, values)
-                    break
-                elif (values["ram"], values["cpus"], values["disk"]) >= (
-                    flavor_dict["ram"],
-                    flavor_dict["vcpus"],
-                    flavor_dict["disk"],
-                ):
-                    if not flavor:
-                        flavor = (key, values)
-                    else:
-                        if (flavor[1]["ram"], flavor[1]["cpus"], flavor[1]["disk"]) >= (
-                            values["ram"],
-                            values["cpus"],
-                            values["disk"],
-                        ):
-                            flavor = (key, values)
-
-            if flavor:
-                return flavor[0]
-
-            raise vimconn.VimConnNotFoundException(
-                "Cannot find flavor with this flavor ID/Name"
-            )
-        except Exception as e:
-            self.format_vimconn_exception(e)
-
     def new_image(self, image_dict):
         """Adds a tenant image to VIM
         Params: image_dict
@@ -865,7 +806,6 @@ class vimconnector(vimconn.VimConnector):
 
             else:
                 for index, subnet in enumerate(net_list):
-
                     net_intr = self.conn_vpc.create_network_interface(
                         subnet_id=subnet.get("net_id"),
                         groups=None,
@@ -948,7 +888,7 @@ class vimconnector(vimconn.VimConnector):
         except Exception as e:
             self.format_vimconn_exception(e)
 
-    def delete_vminstance(self, vm_id, created_items=None, volumes_2hold=None):
+    def delete_vminstance(self, vm_id, created_items=None, volumes_to_hold=None):
         """Removes a VM instance from VIM
         Returns the instance identifier"""
         try:
@@ -993,7 +933,6 @@ class vimconnector(vimconn.VimConnector):
         else:
             raise vimconn.VimConnException(
                 "Failed to get instance_id for reservation",
-                reservation,
                 http_code=vimconn.HTTP_Request_Timeout,
             )
 
@@ -1095,9 +1034,9 @@ class vimconnector(vimconn.VimConnector):
                                     + interface.private_ip_address
                                 )
                             else:
-                                interface_dict[
-                                    "ip_address"
-                                ] = interface.private_ip_address
+                                interface_dict["ip_address"] = (
+                                    interface.private_ip_address
+                                )
 
                             instance_dict["interfaces"].append(interface_dict)
                     except Exception as e: