x/group-based-policy
Code Issues Proposed changes

Merge "NFP - Added support for user config with big data"

Browse Source
This commit is contained in:
Jenkins
2016-12-24 01:20:17 +00:00
committed by Gerrit Code Review
parent 1a79149ec5 9f157a143e
commit c639d73bd9
5 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gbpservice/neutron/tests/unit/nfp/orchestrator/modules/test_service_orchestrator.py
View File

@@ -236,6 +236,8 @@ class ServiceOrchestratorTestCase(NSOModuleTestCase):
self.assertIsNotNone(network_function)
db_network_function = self.nfp_db.get_network_function(
self.session, network_function['id'])
service_config = db_network_function.pop('service_config')
self.assertIsNone(service_config)
self.assertEqual(network_function, db_network_function)
def test_validate_create_service_input(self):

5
gbpservice/nfp/common/constants.py
View File

@@ -116,5 +116,8 @@ CHECK_USER_CONFIG_COMPLETE_MAXRETRY = 20
PULL_NOTIFICATIONS_SPACING = 10
#nfp_node_deriver_config
SERVICE_CREATE_TIMEOUT = 600
SERVICE_CREATE_TIMEOUT = 900
SERVICE_DELETE_TIMEOUT = 300
# heat stack creation timeout
STACK_ACTION_WAIT_TIME = 300

9
gbpservice/nfp/core/controller.py
View File

@@ -242,8 +242,13 @@ class NfpController(nfp_launcher.NfpLauncher, NfpService):
return event
def pipe_send(self, pipe, event):
self.compress(event)
pipe.send(event)
try:
self.compress(event)
pipe.send(event)
except Exception as e:
message = "Failed to send data via pipe, Reason: %s" % e
LOG.error(message)
raise e
def _fork(self, args):
proc = PROCESS(target=self.child, args=args)

2
gbpservice/nfp/orchestrator/config_drivers/heat_driver.py
View File

@@ -54,7 +54,7 @@ HEAT_DRIVER_OPTS = [
help=_("Heat API server address to instantiate services "
"specified in the service chain.")),
cfg.IntOpt('stack_action_wait_time',
default=120,
default=nfp_constants.STACK_ACTION_WAIT_TIME,
help=_("Seconds to wait for pending stack operation "
"to complete")),
cfg.BoolOpt('is_service_admin_owned',

11
gbpservice/nfp/orchestrator/modules/service_orchestrator.py
View File

@@ -763,7 +763,7 @@ class ServiceOrchestrator(nfp_api.NfpEventHandler):
'service_chain_node']['name'][:6],
network_function_info[
'service_chain_instance']['name'][:6])
service_config_str = network_function_info.get('service_config')
service_config_str = network_function_info.pop('service_config')
network_function = {
'name': name,
'description': '',
@@ -776,6 +776,7 @@ class ServiceOrchestrator(nfp_api.NfpEventHandler):
}
network_function = self.db_handler.create_network_function(
self.db_session, network_function)
network_function.pop('service_config')
nfp_logging.store_logging_context(
meta_id=network_function['id'],
@@ -842,6 +843,9 @@ class ServiceOrchestrator(nfp_api.NfpEventHandler):
auth_token=context.auth_token)
network_function_details = self.get_network_function_details(
network_function_id)
service_config = (
network_function_details['network_function'].pop(
'service_config'))
service_profile_id = network_function_details[
'network_function']['service_profile_id']
base_mode_support, resource_data = (
@@ -886,7 +890,6 @@ class ServiceOrchestrator(nfp_api.NfpEventHandler):
binding_key=network_function_id))
GRAPH[dnf_event].append(ducf_event)
else:
service_config = network_function['service_config']
self.delete_network_function_user_config(network_function_id,
service_config)
if not base_mode_support:
@@ -1052,8 +1055,8 @@ class ServiceOrchestrator(nfp_api.NfpEventHandler):
network_function_instance['status'] = nfp_constants.ACTIVE
network_function_instance[
'network_function_device_id'] = network_function_device['id']
service_config = network_function['service_config']
# get service_config from nf
service_config = nfp_context['service_chain_node'].get('config')
nfp_context['event_desc'] = event.desc.to_dict()
nfp_context['key'] = event.key
nfp_context['id'] = event.id