X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=blobdiff_plain;f=RO-VIM-openstack%2Fosm_rovim_openstack%2Fvimconn_openstack.py;h=4869da163bb1868d6a4eb158cf878d1d9df5fbad;hp=5e74e966f7f5357510882e3deba9b8574ac2c757;hb=648ee3dda65699ddfdd01d9f363fb2e37e99930c;hpb=f524da829bab13ada25d1ffe430a55442d30f46c diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py index 5e74e966..4869da16 100644 --- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py +++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py @@ -1177,6 +1177,8 @@ class vimconnector(vimconn.VimConnector): flavor_dict["ram"], flavor_dict["vcpus"], flavor_dict["disk"], + flavor_dict.get("ephemeral", 0), + flavor_dict.get("swap", 0), ) # numa=None extended = flavor_dict.get("extended", {}) @@ -1196,7 +1198,13 @@ class vimconnector(vimconn.VimConnector): continue # TODO - flavor_data = (flavor.ram, flavor.vcpus, flavor.disk) + flavor_data = ( + flavor.ram, + flavor.vcpus, + flavor.disk, + flavor.ephemeral, + flavor.swap, + ) if flavor_data == flavor_target: return flavor.id elif ( @@ -1351,6 +1359,7 @@ class vimconnector(vimconn.VimConnector): vcpus=vcpus, disk=flavor_data.get("disk", 0), ephemeral=flavor_data.get("ephemeral", 0), + swap=flavor_data.get("swap", 0), is_public=flavor_data.get("is_public", True), ) # add metadata