diff options
Diffstat (limited to 'conductor/conductor/controller/translator.py')
| -rw-r--r-- | conductor/conductor/controller/translator.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/conductor/conductor/controller/translator.py b/conductor/conductor/controller/translator.py index 85f63af..45e0ee2 100644 --- a/conductor/conductor/controller/translator.py +++ b/conductor/conductor/controller/translator.py @@ -47,7 +47,7 @@ INVENTORY_TYPES = ['cloud', 'service', 'transport', 'vfmodule'] DEFAULT_INVENTORY_PROVIDER = INVENTORY_PROVIDERS[0] CANDIDATE_KEYS = ['candidate_id', 'cost', 'inventory_type', 'location_id', 'location_type'] -DEMAND_KEYS = ['attributes', 'candidates', 'complex', 'conflict_identifier', +DEMAND_KEYS = ['filtering_attributes', 'passthrough_attributes', 'candidates', 'complex', 'conflict_identifier', 'customer_id', 'default_cost', 'excluded_candidates', 'existing_placement', 'flavor', 'inventory_provider', 'inventory_type', 'port_key', 'region', 'required_candidates', @@ -448,11 +448,11 @@ class Translator(object): # For service and vfmodule inventories, customer_id and # service_type MUST be specified if inventory_type == 'service' or inventory_type == 'vfmodule': - attributes = requirement.get('attributes') + filtering_attributes = requirement.get('filtering_attributes') - if attributes: - customer_id = attributes.get('customer-id') - global_customer_id = attributes.get('global-customer-id') + if filtering_attributes: + customer_id = filtering_attributes.get('customer-id') + global_customer_id = filtering_attributes.get('global-customer-id') if global_customer_id: customer_id = global_customer_id else: @@ -465,7 +465,7 @@ class Translator(object): "Customer ID not specified for " "demand {}".format(name) ) - if not attributes and not service_type: + if not filtering_attributes and not service_type: raise TranslatorException( "Service Type not specified for " "demand {}".format(name) |