openstack
/
freezer
Code Issues Proposed changes

Fix restore nova nova_network validation 

Change-Id: I281259c598f20f7fd9b1b515c81525fbc19ff6e7
This commit is contained in:
yangyapeng 2016-09-18 12:57:40 +00:00 committed by Pierre Mathieu
parent 83eff55604
commit ef9397db90
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.rst
View File

@ -346,7 +346,7 @@ data in the future.
Execute a cinder backup::
$ freezer-agent --cinder-vol-id 3ad7a62f-217a-48cd-a861-43ec0a04a78b
$ freezer-agent --mode cinder --cinder-vol-id 3ad7a62f-217a-48cd-a861-43ec0a04a78b
Execute a MySQL backup with Cinder::
@ -364,7 +364,7 @@ of that instance will be sufficient to restore your data in future.
Execute a nova backup::
$ freezer-agent --nova-inst-id 3ad7a62f-217a-48cd-a861-43ec0a04a78b
$ freezer-agent --mode nova --nova-inst-id 3ad7a62f-217a-48cd-a861-43ec0a04a78b
Execute a MySQL backup with Nova::

32
freezer/openstack/restore.py
View File

@ -141,24 +141,32 @@ class RestoreOs(object):
:param nova_network: id of network
:return:
"""
# TODO(yangyapeng): remove nova_network check use nova api,
# nova api list network is not accurate.
# Change validation use neutron api instead of nova api in
# a project, find all available network in restore nova.
# implementation it after tenant backup add get_neutron in
# openstack oslient.
nova = self.client_manager.get_nova()
network_list = nova.networks.findall()
if len(network_list) > 1 and (nova_network is None):
raise Exception("The parameter --nova-restore-network is required")
get_nova_network = nova.networks.get(nova_network)
if nova_network and (get_nova_network not in network_list):
raise Exception("The network %s is invalid" % nova_network)
(info, image) = self._create_image(instance_id, restore_from_timestamp)
flavor = nova.flavors.get(info['x-object-meta-flavor-id'])
LOG.info("Creating an instance")
instance = None
if nova_network is None:
instance = nova.servers.create(info['x-object-meta-name'], image,
flavor)
else:
instance = nova.servers.create(info['x-object-meta-name'], image,
flavor,
if nova_network:
nics_id = [nic.id for nic in nova.networks.findall()]
if nova_network not in nics_id:
raise Exception("The network %s is invalid" % nova_network)
instance = nova.servers.create(info['x-object-meta-name'],
image, flavor,
nics=[{'net-id': nova_network}])
else:
try:
instance = nova.servers.create(info['x-object-meta-name'],
image, flavor)
except Exception as e:
LOG.warn(e)
raise Exception("The parameter --nova-restore-network "
"is required")
# loop and wait till the server is up then remove the image
# let's wait 100 second
LOG.info('Delete instance image from glance {0}'.format(image))