projects
/
osm
/
RO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bug 575 Fix token refresh for VCD VIMconnector
[osm/RO.git]
/
osm_ro
/
vimconn_openvim.py
diff --git
a/osm_ro/vimconn_openvim.py
b/osm_ro/vimconn_openvim.py
index
b34fdf0
..
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,12
+846,14
@@
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"]
if net.get("mac_address"):
net_dict["mac_address"] = net["mac_address"]
net_dict["model"] = "virtio"
else:
net_dict["model"] = net["model"]
if net.get("mac_address"):
net_dict["mac_address"] = net["mac_address"]
+ if net.get("ip_address"):
+ net_dict["ip_address"] = net["ip_address"]
virtio_net_list.append(net_dict)
payload_dict={ "name": name[:64],
"description": description,
virtio_net_list.append(net_dict)
payload_dict={ "name": name[:64],
"description": description,
@@
-952,7
+956,7
@@
class vimconnector(vimconn.vimconnector):
vm={}
#print "VIMConnector refresh_tenant_vms and nets: Getting tenant VM instance information from VIM"
try:
vm={}
#print "VIMConnector refresh_tenant_vms and nets: Getting tenant VM instance information from VIM"
try:
- url = self.url
+'/'+self.tenant+'/servers/'
+ vm_id
+ url = self.url
+ '/' + self.tenant + '/servers/'
+ vm_id
self.logger.info("Getting vm GET %s", url)
vim_response = requests.get(url, headers = self.headers_req)
self._check_http_request_response(vim_response)
self.logger.info("Getting vm GET %s", url)
vim_response = requests.get(url, headers = self.headers_req)
self._check_http_request_response(vim_response)
@@
-969,7
+973,7
@@
class vimconnector(vimconn.vimconnector):
#get interfaces info
try:
management_ip = False
#get interfaces info
try:
management_ip = False
- url2 = self.url
+'/ports?device_id='
+ quote(vm_id)
+ url2 = self.url
+ '/ports?device_id='
+ quote(vm_id)
self.logger.info("Getting PORTS GET %s", url2)
vim_response2 = requests.get(url2, headers = self.headers_req)
self._check_http_request_response(vim_response2)
self.logger.info("Getting PORTS GET %s", url2)
vim_response2 = requests.get(url2, headers = self.headers_req)
self._check_http_request_response(vim_response2)
@@
-978,7
+982,7
@@
class vimconnector(vimconn.vimconnector):
vm["interfaces"]=[]
for port in client_data.get("ports"):
interface={}
vm["interfaces"]=[]
for port in client_data.get("ports"):
interface={}
- interface['vim_info']
= yaml.safe_dump(port)
+ interface['vim_info'] = yaml.safe_dump(port)
interface["mac_address"] = port.get("mac_address")
interface["vim_net_id"] = port.get("network_id")
interface["vim_interface_id"] = port["id"]
interface["mac_address"] = port.get("mac_address")
interface["vim_net_id"] = port.get("network_id")
interface["vim_interface_id"] = port["id"]