projects
/
osm
/
SO.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
force python3 lxml to version 3.4.0
[osm/SO.git]
/
rwcal
/
plugins
/
vala
/
rwcal_openstack
/
rwcal_openstack.py
diff --git
a/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
b/rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
index
f0095f1
..
ddf665a
100644
(file)
--- a/
rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
+++ b/
rwcal/plugins/vala/rwcal_openstack/rwcal_openstack.py
@@
-581,7
+581,7
@@
class RwcalOpenstackPlugin(GObject.Object, RwCal.Cloud):
if guest_epa.numa_node_policy.has_field('node'):
for node in guest_epa.numa_node_policy.node:
if node.has_field('vcpu') and node.vcpu:
if guest_epa.numa_node_policy.has_field('node'):
for node in guest_epa.numa_node_policy.node:
if node.has_field('vcpu') and node.vcpu:
- epa_specs['hw:numa_cpus.'+str(node.id)] = ','.join([str(j) for j in node.vcpu])
+ epa_specs['hw:numa_cpus.'+str(node.id)] = ','.join([str(j
.id
) for j in node.vcpu])
if node.memory_mb:
epa_specs['hw:numa_mem.'+str(node.id)] = str(node.memory_mb)
if node.memory_mb:
epa_specs['hw:numa_mem.'+str(node.id)] = str(node.memory_mb)
@@
-635,7
+635,7
@@
class RwcalOpenstackPlugin(GObject.Object, RwCal.Cloud):
cpu_features = []
espec_cpu_features = []
for feature in host_epa.cpu_feature:
cpu_features = []
espec_cpu_features = []
for feature in host_epa.cpu_feature:
- cpu_features.append(feature)
+ cpu_features.append(feature
.feature
)
espec_cpu_features = espec_utils.host.mano_to_extra_spec_cpu_features(cpu_features)
if espec_cpu_features is not None:
epa_specs['capabilities:cpu_info:features'] = espec_cpu_features
espec_cpu_features = espec_utils.host.mano_to_extra_spec_cpu_features(cpu_features)
if espec_cpu_features is not None:
epa_specs['capabilities:cpu_info:features'] = espec_cpu_features
@@
-771,7
+771,9
@@
class RwcalOpenstackPlugin(GObject.Object, RwCal.Cloud):
numa_node = getattr(flavor,'guest_epa').numa_node_policy.node.add()
numa_node.id = int(node_id)
numa_node = getattr(flavor,'guest_epa').numa_node_policy.node.add()
numa_node.id = int(node_id)
- numa_node.vcpu = [ int(x) for x in flavor_info['extra_specs'][attr].split(',') ]
+ for x in flavor_info['extra_specs'][attr].split(','):
+ numa_node_vcpu = numa_node.vcpu.add()
+ numa_node_vcpu.id = int(x)
elif attr.startswith('hw:numa_mem.'):
node_id = attr.split('.')[1]
elif attr.startswith('hw:numa_mem.'):
node_id = attr.split('.')[1]
@@
-1157,6
+1159,8
@@
class RwcalOpenstackPlugin(GObject.Object, RwCal.Cloud):
if ('fixed_ips' in port_info) and (len(port_info['fixed_ips']) >= 1):
if 'ip_address' in port_info['fixed_ips'][0]:
c_point.ip_address = port_info['fixed_ips'][0]['ip_address']
if ('fixed_ips' in port_info) and (len(port_info['fixed_ips']) >= 1):
if 'ip_address' in port_info['fixed_ips'][0]:
c_point.ip_address = port_info['fixed_ips'][0]['ip_address']
+ if 'mac_address' in port_info :
+ c_point.mac_addr = port_info['mac_address']
if port_info['status'] == 'ACTIVE':
c_point.state = 'active'
else:
if port_info['status'] == 'ACTIVE':
c_point.state = 'active'
else: