openstack
/
fuel-devops
Code Issues Proposed changes

The next intermediate state

This commit is contained in:
vic 2013-01-22 16:17:38 +04:00
parent 12b442428e
commit e641646dac
4 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/one.py
View File

@ -11,7 +11,7 @@ def one(manager):
internal = manager.network_create(
environment=environment, name='internal', pool=internal_pool)
external = manager.network_create(
environment=environment, name='external', pool=external_pool)
environment=environment, name='external', pool=external_pool, forward='nat')
private = manager.network_create(
environment=environment, name='private', pool=private_pool)
node = manager.node_create(name='test_node', environment=environment)

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

@ -251,7 +251,7 @@ class LibvirtDriver(object):
:rtype : None
"""
xml = self.xml_builder.build_snapshot_xml(name, description)
self.conn.lookupByUUIDString(node.uuid).snapshotCreateXML(xml)
self.conn.lookupByUUIDString(node.uuid).snapshotCreateXML(xml, 0)
def _get_snapshot(self, domain, name):
"""
@ -259,7 +259,7 @@ class LibvirtDriver(object):
:rtype : libvirt.virDomainSnapshot
"""
if name is None:
return domain.snapshotCurrent()
return domain.snapshotCurrent(0)
else:
return domain.snapshotLookupByName(name, 0)

9
src/devops/driver/libvirt/libvirt_xml_builder.py
View File

@ -1,4 +1,3 @@
from collections import deque
from ipaddr import IPNetwork, IPAddress
from xmlbuilder import XMLBuilder
@ -30,7 +29,7 @@ class LibvirtXMLBuilder(object):
if not (network.ip_network is None):
ip_network = IPNetwork(network.ip_network)
with network_xml.ip(
address=str(ip_network.network),
address=str(ip_network[1]),
prefix=str(ip_network.prefixlen)):
if network.has_pxe_server:
network_xml.tftp(root=network.tftp_root_dir)
@ -61,9 +60,9 @@ class LibvirtXMLBuilder(object):
with volume_xml.target:
volume_xml.format(type=volume.format)
if volume.backing_store is not None:
with volume_xml.backing_store:
with volume_xml.backingStore:
volume_xml.path(self.driver.volume_path(volume.backing_store))
volume_xml.format(volume.backing_store.format)
volume_xml.format(type=volume.backing_store.format)
return str(volume_xml)
def build_snapshot_xml(self, name=None, description=None):
@ -77,6 +76,7 @@ class LibvirtXMLBuilder(object):
xml_builder.name(name)
if not (description is None):
xml_builder.description(description)
return str(xml_builder)
def _build_disk_device(self, device_xml, disk_device):
with device_xml.disk(type=disk_device.type, device=disk_device.device):
@ -117,5 +117,4 @@ class LibvirtXMLBuilder(object):
self._build_disk_device(node_xml, disk_device)
for interface in node.interfaces:
self._build_interface_device(node_xml, interface)
return str(node_xml)

4
src/devops/models.py
View File

@ -243,10 +243,10 @@ class Node(ExternalModel):
self.driver.node_resume(self)
def snapshot(self, name=None):
self.driver.node_create_snapshot(name)
self.driver.node_create_snapshot(node=self, name=name)
def revert(self, name=None):
self.driver.node_revert_snapshot(name)
self.driver.node_revert_snapshot(node=self, name=name)
class Volume(ExternalModel):