openstack
/
karbor
Code Issues Proposed changes

Merge "Remove 'HeatTemplate'"

This commit is contained in:
Jenkins 2017-08-03 07:27:19 +00:00 committed by Gerrit Code Review
parent 9272ede718 f4c8f9ee2a
commit c36dd4894a
8 changed files with 52 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
karbor/services/protection/flows/restore.py
View File

@ -203,5 +203,8 @@ def get_flow(context, workflow_engine, checkpoint, provider, restore,
'context': context,
'checkpoint': checkpoint,
'restore': restore,
'operation_log': operation_log})
'new_resources': {},
'operation_log': operation_log
}
)
return flow_engine

4
karbor/services/protection/protection_plugins/image/image_protection_plugin.py
View File

@ -189,8 +189,6 @@ class RestoreOperation(protection_plugin.Operation):
def on_main(self, checkpoint, resource, context, parameters, **kwargs):
original_image_id = resource.id
heat_template = kwargs.get("heat_template")
name = parameters.get("restore_name", "karbor-restore-image")
LOG.info("Restoring image backup, image_id: %s.", original_image_id)
@ -246,7 +244,7 @@ class RestoreOperation(protection_plugin.Operation):
reason=" The checksum of restored image is invalid.",
resource_id=original_image_id,
resource_type=constants.IMAGE_RESOURCE_TYPE)
heat_template.put_parameter(original_image_id, image.id)
kwargs.get("new_resources")[original_image_id] = image.id
except Exception as e:
LOG.error("Restore image backup failed, image_id: %s.",
original_image_id)

52
karbor/services/protection/protection_plugins/network/neutron_protection_plugin.py
View File

@ -289,7 +289,7 @@ class RestoreOperation(protection_plugin.Operation):
success_statuses, failure_statuses,
ignore_statuses)
def _restore_networks(self, neutron_client, heat_template, nets_meta):
def _restore_networks(self, neutron_client, new_resources, nets_meta):
net_ids = set()
for _, net_data in nets_meta.items():
if net_data["router:external"]:
@ -303,14 +303,14 @@ class RestoreOperation(protection_plugin.Operation):
}
net_id = neutron_client.create_network(
{'network': props})['network']['id']
heat_template.put_parameter(net_data["name"], net_id)
new_resources[net_data["name"]] = net_id
net_ids.add(net_id)
is_success = self._check_complete(neutron_client, net_ids, 'network')
if not is_success:
raise Exception("Crate networks failed")
def _restore_subnets(self, neutron_client, heat_template,
def _restore_subnets(self, neutron_client, new_resources,
nets_meta, subs_meta):
for _, sub_data in subs_meta.items():
props = {
@ -323,16 +323,16 @@ class RestoreOperation(protection_plugin.Operation):
"host_routes": sub_data["host_routes"],
"name": sub_data["name"],
"ip_version": sub_data["ip_version"],
"network_id": heat_template.get_resource_reference(
"network_id": new_resources.get(
nets_meta[sub_data['network_id']]['name']),
"tenant_id": sub_data["tenant_id"],
}
subnet_id = neutron_client.create_subnet(
{'subnet': props})['subnet']['id']
heat_template.put_parameter(sub_data["name"], subnet_id)
new_resources[sub_data["name"]] = subnet_id
def _get_new_fixed_ips(self, heat_template, subs_meta, fixed_ips_meta):
def _get_new_fixed_ips(self, new_resources, subs_meta, fixed_ips_meta):
new_fixed_ips = []
for fixed_ip in fixed_ips_meta:
subnet = subs_meta.get(fixed_ip["subnet_id"])
@ -341,14 +341,14 @@ class RestoreOperation(protection_plugin.Operation):
props = {
"ip_address": fixed_ip["ip_address"],
"subnet_id": heat_template.get_resource_reference(
"subnet_id": new_resources.get(
subnet['name'])
}
new_fixed_ips.append(props)
return new_fixed_ips
def _restore_ports(self, neutron_client, heat_template,
def _restore_ports(self, neutron_client, new_resources,
nets_meta, subs_meta, ports_meta):
port_ids = set()
for _, port_data in ports_meta.items():
@ -363,12 +363,12 @@ class RestoreOperation(protection_plugin.Operation):
"device_owner": port_data["device_owner"],
"mac_address": port_data["mac_address"],
"name": port_data["name"],
"network_id": heat_template.get_resource_reference(
"network_id": new_resources.get(
nets_meta[port_data['network_id']]['name']),
"port_security_enabled": port_data["port_security_enabled"],
}
new_fixed_ips = self._get_new_fixed_ips(
heat_template, subs_meta, port_data["fixed_ips"])
new_resources, subs_meta, port_data["fixed_ips"])
if new_fixed_ips:
props["fixed_ips"] = new_fixed_ips
@ -385,12 +385,12 @@ class RestoreOperation(protection_plugin.Operation):
security_groups = port_data["security_groups"]
if security_groups:
props['security_groups'] = [
heat_template.get_resource_reference(sg)
new_resources.get(sg)
for sg in security_groups if sg != 'default'
]
port_id = neutron_client.create_port({'port': props})['port']['id']
heat_template.put_parameter(port_data["name"], port_id)
new_resources[port_data["name"]] = port_id
port_ids.add(port_id)
is_success = self._check_complete(neutron_client, port_ids, 'port')
@ -414,7 +414,7 @@ class RestoreOperation(protection_plugin.Operation):
gateway["enable_snat"] = gateway_info["enable_snat"]
return gateway
def _restore_routers(self, neutron_client, heat_template,
def _restore_routers(self, neutron_client, new_resources,
public_network_id, routers_meta):
router_ids = set()
for _, router_data in routers_meta.items():
@ -430,14 +430,14 @@ class RestoreOperation(protection_plugin.Operation):
# props["external_gateway_info"] = new_external_gateway
router_id = neutron_client.create_router(
{'router': props})['router']['id']
heat_template.put_parameter(router_data["name"], router_id)
new_resources[router_data["name"]] = router_id
router_ids.add(router_id)
is_success = self._check_complete(neutron_client, router_ids, 'router')
if not is_success:
raise Exception("Crate router failed")
def _restore_routerinterfaces(self, neutron_client, heat_template,
def _restore_routerinterfaces(self, neutron_client, new_resources,
subs_meta, routers_meta, ports_meta):
for _, port_data in ports_meta.items():
if port_data["device_owner"] != "network:router_interface":
@ -455,9 +455,9 @@ class RestoreOperation(protection_plugin.Operation):
continue
neutron_client.add_interface_router(
heat_template.get_resource_reference(router['name']),
new_resources.get(router['name']),
{
'subnet_id': heat_template.get_resource_reference(
'subnet_id': new_resources.get(
subnet['name'])
}
)
@ -546,7 +546,7 @@ class RestoreOperation(protection_plugin.Operation):
isinstance(ex, exceptions.OverQuotaClient)):
raise
def _restore_securitygroups(self, neutron_client, heat_template, sgs_meta):
def _restore_securitygroups(self, neutron_client, new_resources, sgs_meta):
for _, sg_data in sgs_meta.items():
# Skip the default securitygroups
if sg_data["name"] == "default":
@ -558,7 +558,7 @@ class RestoreOperation(protection_plugin.Operation):
}
sg_id = neutron_client.create_security_group(
{'security_group': props})['security_group']['id']
heat_template.put_parameter(sg_data["name"], sg_id)
new_resources[sg_data["name"]] = sg_id
rules = self._get_security_group_rules(
sg_data["security_group_rules"])
@ -570,7 +570,7 @@ class RestoreOperation(protection_plugin.Operation):
network_id = get_network_id(context)
public_network_id = parameters.get("public_network_id")
bank_section = checkpoint.get_resource_bank_section(network_id)
heat_template = kwargs['heat_template']
new_resources = kwargs['new_resources']
def _filter_resources(resources):
ids = []
@ -587,40 +587,40 @@ class RestoreOperation(protection_plugin.Operation):
# Config Net
nets_meta = resource_definition.get("network_metadata")
if nets_meta:
self._restore_networks(neutron_client, heat_template,
self._restore_networks(neutron_client, new_resources,
nets_meta)
# Config Securiy-group
sgs_meta = resource_definition.get("security-group_metadata")
if sgs_meta:
self._restore_securitygroups(neutron_client, heat_template,
self._restore_securitygroups(neutron_client, new_resources,
sgs_meta)
# Config Subnet
subs_meta = resource_definition.get("subnet_metadata")
_filter_resources(subs_meta)
if subs_meta:
self._restore_subnets(neutron_client, heat_template,
self._restore_subnets(neutron_client, new_resources,
nets_meta, subs_meta)
# Config Router
routers_meta = resource_definition.get("router_metadata")
if routers_meta:
self._restore_routers(neutron_client, heat_template,
self._restore_routers(neutron_client, new_resources,
public_network_id, routers_meta)
# Config Port
ports_meta = resource_definition.get("port_metadata")
_filter_resources(ports_meta)
if ports_meta:
self._restore_ports(neutron_client, heat_template, nets_meta,
self._restore_ports(neutron_client, new_resources, nets_meta,
subs_meta, ports_meta)
# Config RouterInterface
if all([i is not None
for i in [subs_meta, routers_meta, ports_meta]]):
self._restore_routerinterfaces(
neutron_client, heat_template,
neutron_client, new_resources,
subs_meta, routers_meta, ports_meta)
except Exception as e:

22
karbor/services/protection/protection_plugins/server/nova_protection_plugin.py
View File

@ -194,11 +194,11 @@ class RestoreOperation(protection_plugin.Operation):
original_server_id).get_object("metadata")
nova_client = ClientFactory.create_client("nova", context)
heat_template = kwargs.get("heat_template")
new_resources = kwargs.get("new_resources")
# restore server instance
new_server_id = self._restore_server_instance(
nova_client, heat_template, original_server_id,
nova_client, new_resources, original_server_id,
parameters.get("restore_name", "karbor-restore-server"),
resource_definition)
@ -211,13 +211,13 @@ class RestoreOperation(protection_plugin.Operation):
# restore volume attachment
self._restore_volume_attachment(
nova_client, ClientFactory.create_client("cinder", context),
heat_template, new_server_id, resource_definition)
new_resources, new_server_id, resource_definition)
# restore floating ip association
self._restore_floating_association(
nova_client, new_server_id, resource_definition)
heat_template.put_parameter(original_server_id, new_server_id)
new_resources[original_server_id] = new_server_id
update_method(constants.RESOURCE_STATUS_AVAILABLE)
@ -235,7 +235,7 @@ class RestoreOperation(protection_plugin.Operation):
resource_type=constants.SERVER_RESOURCE_TYPE
)
def _restore_server_instance(self, nova_client, heat_template,
def _restore_server_instance(self, nova_client, new_resources,
original_id, restore_name,
resource_definition):
server_metadata = resource_definition["server_metadata"]
@ -250,13 +250,13 @@ class RestoreOperation(protection_plugin.Operation):
boot_metadata = resource_definition["boot_metadata"]
boot_device_type = boot_metadata.get("boot_device_type")
if boot_device_type == "image":
properties["image"] = heat_template.get_resource_reference(
boot_metadata.get("boot_image_id"))
properties["image"] = new_resources.get(
boot_metadata["boot_image_id"])
elif boot_device_type == "volume":
properties["block_device_mapping_v2"] = [{
'uuid': heat_template.get_resource_reference(
boot_metadata.get("boot_volume_id")),
'uuid': new_resources.get(
boot_metadata["boot_volume_id"]),
'source_type': 'volume',
'destination_type': 'volume',
'boot_index': 0,
@ -299,14 +299,14 @@ class RestoreOperation(protection_plugin.Operation):
return server.id
def _restore_volume_attachment(self, nova_client, cinder_client,
heat_template, new_server_id,
new_resources, new_server_id,
resource_definition):
attach_metadata = resource_definition.get("attach_metadata", {})
for original_id, attach_metadata_item in attach_metadata.items():
if attach_metadata_item.get("bootable", None) == "true":
continue
volume_id = heat_template.get_resource_reference(original_id)
volume_id = new_resources.get(original_id)
try:
nova_client.volumes.create_server_volume(
server_id=new_server_id,

2
karbor/services/protection/protection_plugins/volume/cinder_protection_plugin.py
View File

@ -286,7 +286,7 @@ class RestoreOperation(protection_plugin.Operation):
is_success = self._check_create_complete(cinder_client, volume_id)
if is_success:
update_method(constants.RESOURCE_STATUS_AVAILABLE)
kwargs.get("heat_template").put_parameter(resource_id, volume_id)
kwargs.get("new_resources")[resource_id] = volume_id
else:
reason = 'Error creating volume'
update_method(constants.RESOURCE_STATUS_ERROR, reason)

2
karbor/services/protection/resource_flow.py
View File

@ -40,7 +40,7 @@ ResourceHooks = namedtuple('ResourceHooks', [
OPERATION_EXTRA_ARGS = {
constants.OPERATION_RESTORE: ['heat_template', 'restore'],
constants.OPERATION_RESTORE: ['restore', 'new_resources'],
}

3
karbor/tests/unit/protection/test_cinder_protection_plugin.py
View File

@ -22,7 +22,6 @@ from karbor.services.protection.protection_plugins.volume. \
cinder_protection_plugin import CinderBackupProtectionPlugin
from karbor.services.protection.protection_plugins.volume \
import volume_plugin_cinder_schemas as cinder_schemas
from karbor.services.protection.restore_heat import HeatTemplate
from karbor.tests import base
from karbor.tests.unit.protection import fakes
import mock
@ -364,7 +363,7 @@ class CinderProtectionPluginTest(base.TestCase):
mocks['volumes'].get.return_value.status = 'available'
mocks['restores'].restore = RestoreResponse(volume_id)
call_hooks(operation, checkpoint, resource, self.cntxt, parameters,
**{'restore': None, 'heat_template': HeatTemplate()})
**{'restore': None, 'new_resources': {}})
mocks['volumes'].update.assert_called_with(
volume_id,
**{'name': parameters['restore_name'],

23
karbor/tests/unit/protection/test_resource_flow.py
View File

@ -18,7 +18,6 @@ from karbor.resource import Resource
from karbor.services.protection.flows.workflow import TaskFlowEngine
from karbor.services.protection import graph
from karbor.services.protection import resource_flow
from karbor.services.protection import restore_heat
from karbor.tests import base
from karbor.tests.unit.protection import fakes
from oslo_config import cfg
@ -82,7 +81,7 @@ class ResourceFlowTest(base.TestCase):
for operation in constants.OPERATION_TYPES:
kwargs = {}
if operation == constants.OPERATION_RESTORE:
kwargs['heat_template'] = restore_heat.HeatTemplate()
kwargs['new_resources'] = {}
kwargs['restore'] = None
self._walk_operation(mock_protection, operation, **kwargs)
@ -98,7 +97,7 @@ class ResourceFlowTest(base.TestCase):
kwargs = {}
if operation == constants.OPERATION_RESTORE:
kwargs['heat_template'] = restore_heat.HeatTemplate()
kwargs['new_resources'] = {}
kwargs['restore'] = None
self._walk_operation(mock_protection, operation, **kwargs)
@ -135,24 +134,16 @@ class ResourceFlowTest(base.TestCase):
get_operation_attr
).return_value = fake_operation
kwargs = {
args = {
'checkpoint': 'A',
'context': 'B',
}
args = kwargs.copy()
kwargs = args.copy()
kwargs['operation_log'] = None
if operation == constants.OPERATION_RESTORE:
template = restore_heat.HeatTemplate()
args['kwargs'] = {
'heat_template': template,
'restore': None,
'operation_log': None
}
else:
args['kwargs'] = {
'operation_log': None
}
kwargs.update(args['kwargs'])
kwargs['new_resources'] = {}
kwargs['restore'] = None
self._walk_operation(mock_protection, operation,
parameters=parameters, **kwargs)