projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix wrong usage of `isinstance`
[osm/RO.git]
/
osm_ro
/
vimconn_openvim.py
diff --git
a/osm_ro/vimconn_openvim.py
b/osm_ro/vimconn_openvim.py
index
417092f
..
f6d2237
100644
(file)
--- a/
osm_ro/vimconn_openvim.py
+++ b/
osm_ro/vimconn_openvim.py
@@
-1,7
+1,7
@@
# -*- coding: utf-8 -*-
##
# -*- coding: utf-8 -*-
##
-# Copyright 2015 Telef
ónica Investigació
n y Desarrollo, S.A.U.
+# Copyright 2015 Telef
onica Investigacio
n y Desarrollo, S.A.U.
# This file is part of openmano
# All Rights Reserved.
#
# 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']
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]
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
name:
net_id: network uuid to connect
vpci: virtual vcpi to assign
- model: interface model, virtio, e
2
000, ...
+ model: interface model, virtio, e
1
000, ...
mac_address:
use: 'data', 'bridge', 'mgmt'
type: 'virtual', 'PCI-PASSTHROUGH'('PF'), 'SR-IOV'('VF'), 'VFnotShared'
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.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"]
net_dict["model"] = "virtio"
else:
net_dict["model"] = net["model"]