X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fvimconn_openvim.py;h=f6d22376ff0f55a87f7fbb5023e878d932fd11de;hb=d6fac4d9af8bf4ede9640676add59a9ed4b53e9e;hp=417092f1d8e5accfa2957b9ab363973801a7bdf4;hpb=41a6981cd96a7e4ae15e881bc868873fbfaa3937;p=osm%2FRO.git diff --git a/osm_ro/vimconn_openvim.py b/osm_ro/vimconn_openvim.py index 417092f1..f6d22376 100644 --- a/osm_ro/vimconn_openvim.py +++ b/osm_ro/vimconn_openvim.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # @@ -600,6 +600,8 @@ class vimconnector(vimconn.vimconnector): for device in new_flavor_dict.get('extended', {}).get('devices', ()): if 'image name' in device: del device['image name'] + if 'name' in device: + del device['name'] numas = new_flavor_dict.get('extended', {}).get('numas') if numas: numa = numas[0] @@ -807,7 +809,7 @@ class vimconnector(vimconn.vimconnector): name: net_id: network uuid to connect vpci: virtual vcpi to assign - model: interface model, virtio, e2000, ... + model: interface model, virtio, e1000, ... mac_address: use: 'data', 'bridge', 'mgmt' type: 'virtual', 'PCI-PASSTHROUGH'('PF'), 'SR-IOV'('VF'), 'VFnotShared' @@ -844,7 +846,7 @@ class vimconnector(vimconn.vimconnector): if net.get("vpci"): net_dict["vpci"] = net["vpci"] if net.get("model"): - if net["model"] == "VIRTIO": + if net["model"] == "VIRTIO" or net["model"] == "paravirt": net_dict["model"] = "virtio" else: net_dict["model"] = net["model"]