x/terracotta
Code Issues Proposed changes

Replaced json.loads with common.parse_parameters

Browse Source
This commit is contained in:
Anton Beloglazov 2012-10-02 11:44:48 +10:00
parent 6815679aa2
commit 318ab094f2
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
neat/globals/manager.py
View File

@ -75,6 +75,7 @@ import re
from hashlib import sha1
from novaclient.v1_1 import client
import neat.common as common
from neat.config import *
from neat.db_utils import *
@ -286,7 +287,7 @@ def execute_underload(config, state, host):
float(config.get('network_migration_bandwidth')))
if 'vm_placement' not in state:
vm_placement_params = json.loads(
vm_placement_params = common.parse_parameters(
config.get('algorithm_vm_placement_params'))
vm_placement_state = None
vm_placement = config.get('algorithm_vm_placement_factory')(

8
neat/locals/manager.py
View File

@ -1,3 +1,4 @@
# Copyright 2012 Anton Beloglazov
#
# Licensed under the Apache License, Version 2.0 (the "License");
@ -102,7 +103,6 @@ local manager performs the following steps:
from contracts import contract
from neat.contracts_extra import *
import json
import numpy
import itertools
@ -218,7 +218,7 @@ def execute(config, state):
vm_ram, float(config['network_migration_bandwidth']))
if 'underload_detection' not in state:
underload_detection_params = json.loads(
underload_detection_params = common.parse_parameters(
config['algorithm_underload_detection_parameters'])
underload_detection_state = None
underload_detection = common.call_function_by_name(
@ -228,7 +228,7 @@ def execute(config, state):
underload_detection_params])
state['underload_detection'] = underload_detection
overload_detection_params = json.loads(
overload_detection_params = common.parse_parameters(
config['algorithm_overload_detection_parameters'])
overload_detection_state = None
overload_detection = common.call_function_by_name(
@ -238,7 +238,7 @@ def execute(config, state):
overload_detection_params])
state['overload_detection'] = overload_detection
vm_selection_params = json.loads(
vm_selection_params = common.parse_parameters(
config['algorithm_vm_selection_parameters'])
vm_selection_state = None
vm_selection = common.call_function_by_name(