openstack
/
fuel-main
Code Issues Proposed changes

Fix tests

This commit is contained in:
vic 2012-09-21 15:21:50 +04:00
parent 4da63464e7
commit 6136cea8e6
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devops/devops/driver/libvirt.py
View File

@ -347,8 +347,8 @@ class Libvirt:
continue
self._virsh(
['send-key', node.id].append(
map(lambda x: str(x), key_codes)))
['send-key', node.id] +
map(lambda x: str(x), key_codes))
def _create_disk(self, name, capacity='1', pool='default', format='qcow2'):
self._virsh(

10
devops/devops/model.py
View File

@ -134,6 +134,16 @@ class Node(ManagedObject):
return None
return x[0]
@property
def ip_address_by_network(self):
name2ip_addresses = {}
for interface in self.interfaces:
if len(interface.ip_addresses) == 0:
name2ip_addresses[interface.network.name] = None
else:
name2ip_addresses[interface.network.name] = interface.ip_addresses[0]
return name2ip_addresses
@ManagedObject.driver.setter
def driver(self, driver):
ManagedObject.driver.fset(self, driver)