openstack/tacker
Code Issues Proposed changes

Merge "Fix resource type miss in vnfd scale template"

Browse Source
This commit is contained in:
Jenkins 2016-11-14 23:27:20 +00:00 committed by Gerrit Code Review
commit 2c182a6ae9
8 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/devref/alarm_monitoring_usage_guide.rst
View File

@ -60,7 +60,7 @@ alarming monitoring and auto-scaling was also supported by Alarm monitor in Tack
policies: policies:
- SP1: - SP1:
type: tosca.policy.tacker.Scaling type: tosca.policies.tacker.Scaling
properties: properties:
increment: 1 increment: 1
cooldown: 120 cooldown: 120

2
samples/tosca-templates/vnfd/tosca-vnfd-alarm-scale.yaml
View File

@ -38,7 +38,7 @@ topology_template:
policies: policies:
- SP1: - SP1:
type: tosca.policy.tacker.Scaling type: tosca.policies.tacker.Scaling
properties: properties:
increment: 1 increment: 1
cooldown: 120 cooldown: 120

2
samples/tosca-templates/vnfd/tosca-vnfd-scale.yaml
View File

@ -55,7 +55,7 @@ topology_template:
policies: policies:
- SP1: - SP1:
type: tosca.policy.tacker.Scaling type: tosca.policies.tacker.Scaling
properties: properties:
increment: 1 increment: 1
cooldown: 120 cooldown: 120

2
tacker/plugins/common/constants.py
View File

@ -48,7 +48,7 @@ ACTIVE_PENDING_STATUSES = (
PENDING_UPDATE PENDING_UPDATE
) )
POLICY_SCALING = 'tosca.policy.tacker.Scaling' POLICY_SCALING = 'tosca.policies.tacker.Scaling'
POLICY_SCALING_ACTIONS = (ACTION_SCALE_OUT, POLICY_SCALING_ACTIONS = (ACTION_SCALE_OUT,
ACTION_SCALE_IN) = ('out', 'in') ACTION_SCALE_IN) = ('out', 'in')
POLICY_ACTIONS = {POLICY_SCALING: POLICY_SCALING_ACTIONS} POLICY_ACTIONS = {POLICY_SCALING: POLICY_SCALING_ACTIONS}

2
tacker/tests/etc/samples/sample-tosca-scale-all.yaml
View File

@ -40,7 +40,7 @@ topology_template:
policies: policies:
- SP1: - SP1:
type: tosca.policy.tacker.Scaling type: tosca.policies.tacker.Scaling
properties: properties:
increment: 1 increment: 1
cooldown: 60 cooldown: 60

2
tacker/tests/unit/vm/infra_drivers/openstack/data/test_tosca_vnfd_alarm_scale.yaml
View File

@ -38,7 +38,7 @@ topology_template:
policies: policies:
- SP1: - SP1:
type: tosca.policy.tacker.Scaling type: tosca.policies.tacker.Scaling
properties: properties:
increment: 1 increment: 1
cooldown: 120 cooldown: 120

2
tacker/tests/unit/vm/infra_drivers/openstack/data/tosca_scale.yaml
View File

@ -34,7 +34,7 @@ topology_template:
policies: policies:
- SP1: - SP1:
type: tosca.policy.tacker.Scaling type: tosca.policies.tacker.Scaling
properties: properties:
increment: 1 increment: 1
cooldown: 60 cooldown: 60

6
tacker/vnfm/infra_drivers/openstack/openstack.py
View File

@ -374,11 +374,11 @@ class OpenStack(abstract_driver.DeviceAbstractDriver,
# policies: # policies:
# - SP1: # - SP1:
# type: tosca.policy.tacker.Scaling # type: tosca.policies.tacker.Scaling
if 'policies' in vnfd_dict: if 'policies' in vnfd_dict:
for policy_dict in vnfd_dict['policies']: for policy_dict in vnfd_dict['policies']:
name, policy = list(policy_dict.items())[0] name, policy = list(policy_dict.items())[0]
if policy['type'] == 'tosca.policy.tacker.Scaling': if policy['type'] == 'tosca.policies.tacker.Scaling':
_convert_to_heat_scaling_policy(policy['properties'], _convert_to_heat_scaling_policy(policy['properties'],
name) name)
# TODO(kanagaraj-manickam) only one policy is supported # TODO(kanagaraj-manickam) only one policy is supported
@ -429,7 +429,7 @@ class OpenStack(abstract_driver.DeviceAbstractDriver,
for policies in topology_tpl_dict['policies']: for policies in topology_tpl_dict['policies']:
policy_name, policy_dt = list(policies.items())[0] policy_name, policy_dt = list(policies.items())[0]
if policy_dt['type'] == \ if policy_dt['type'] == \
'tosca.policy.tacker.Scaling': 'tosca.policies.tacker.Scaling':
# Fixed metadata. it will be fixed # Fixed metadata. it will be fixed
# once targets are supported # once targets are supported
metadata_dict = dict() metadata_dict = dict()