ec2_credential.py (keystone-19.0.0) | : | ec2_credential.py (keystone-19.0.1) | ||
---|---|---|---|---|
skipping to change at line 26 | skipping to change at line 26 | |||
from keystone.common.policies import base | from keystone.common.policies import base | |||
deprecated_ec2_get_credential = policy.DeprecatedRule( | deprecated_ec2_get_credential = policy.DeprecatedRule( | |||
name=base.IDENTITY % 'ec2_get_credential', | name=base.IDENTITY % 'ec2_get_credential', | |||
check_str=base.RULE_ADMIN_OR_CREDENTIAL_OWNER | check_str=base.RULE_ADMIN_OR_CREDENTIAL_OWNER | |||
) | ) | |||
deprecated_ec2_list_credentials = policy.DeprecatedRule( | deprecated_ec2_list_credentials = policy.DeprecatedRule( | |||
name=base.IDENTITY % 'ec2_list_credentials', | name=base.IDENTITY % 'ec2_list_credentials', | |||
check_str=base.RULE_ADMIN_OR_OWNER | check_str=base.RULE_ADMIN_OR_OWNER | |||
) | ) | |||
deprecated_ec2_create_credentials = policy.DeprecatedRule( | deprecated_ec2_create_credential = policy.DeprecatedRule( | |||
name=base.IDENTITY % 'ec2_create_credentials', | name=base.IDENTITY % 'ec2_create_credential', | |||
check_str=base.RULE_ADMIN_OR_OWNER | check_str=base.RULE_ADMIN_OR_OWNER | |||
) | ) | |||
deprecated_ec2_delete_credentials = policy.DeprecatedRule( | deprecated_ec2_delete_credential = policy.DeprecatedRule( | |||
name=base.IDENTITY % 'ec2_delete_credentials', | name=base.IDENTITY % 'ec2_delete_credential', | |||
check_str=base.RULE_ADMIN_OR_CREDENTIAL_OWNER | check_str=base.RULE_ADMIN_OR_CREDENTIAL_OWNER | |||
) | ) | |||
DEPRECATED_REASON = ( | DEPRECATED_REASON = ( | |||
"The EC2 credential API is now aware of system scope and default roles." | "The EC2 credential API is now aware of system scope and default roles." | |||
) | ) | |||
ec2_credential_policies = [ | ec2_credential_policies = [ | |||
policy.DocumentedRuleDefault( | policy.DocumentedRuleDefault( | |||
name=base.IDENTITY % 'ec2_get_credential', | name=base.IDENTITY % 'ec2_get_credential', | |||
skipping to change at line 70 | skipping to change at line 70 | |||
deprecated_reason=DEPRECATED_REASON, | deprecated_reason=DEPRECATED_REASON, | |||
deprecated_since=versionutils.deprecated.TRAIN | deprecated_since=versionutils.deprecated.TRAIN | |||
), | ), | |||
policy.DocumentedRuleDefault( | policy.DocumentedRuleDefault( | |||
name=base.IDENTITY % 'ec2_create_credential', | name=base.IDENTITY % 'ec2_create_credential', | |||
check_str=base.RULE_SYSTEM_ADMIN_OR_OWNER, | check_str=base.RULE_SYSTEM_ADMIN_OR_OWNER, | |||
scope_types=['system', 'project'], | scope_types=['system', 'project'], | |||
description='Create ec2 credential.', | description='Create ec2 credential.', | |||
operations=[{'path': '/v3/users/{user_id}/credentials/OS-EC2', | operations=[{'path': '/v3/users/{user_id}/credentials/OS-EC2', | |||
'method': 'POST'}], | 'method': 'POST'}], | |||
deprecated_rule=deprecated_ec2_create_credentials, | deprecated_rule=deprecated_ec2_create_credential, | |||
deprecated_reason=DEPRECATED_REASON, | deprecated_reason=DEPRECATED_REASON, | |||
deprecated_since=versionutils.deprecated.TRAIN | deprecated_since=versionutils.deprecated.TRAIN | |||
), | ), | |||
policy.DocumentedRuleDefault( | policy.DocumentedRuleDefault( | |||
name=base.IDENTITY % 'ec2_delete_credential', | name=base.IDENTITY % 'ec2_delete_credential', | |||
check_str=base.SYSTEM_ADMIN_OR_CRED_OWNER, | check_str=base.SYSTEM_ADMIN_OR_CRED_OWNER, | |||
scope_types=['system', 'project'], | scope_types=['system', 'project'], | |||
description='Delete ec2 credential.', | description='Delete ec2 credential.', | |||
operations=[{'path': ('/v3/users/{user_id}/credentials/OS-EC2/' | operations=[{'path': ('/v3/users/{user_id}/credentials/OS-EC2/' | |||
'{credential_id}'), | '{credential_id}'), | |||
'method': 'DELETE'}], | 'method': 'DELETE'}], | |||
deprecated_rule=deprecated_ec2_delete_credentials, | deprecated_rule=deprecated_ec2_delete_credential, | |||
deprecated_reason=DEPRECATED_REASON, | deprecated_reason=DEPRECATED_REASON, | |||
deprecated_since=versionutils.deprecated.TRAIN | deprecated_since=versionutils.deprecated.TRAIN | |||
) | ) | |||
] | ] | |||
def list_rules(): | def list_rules(): | |||
return ec2_credential_policies | return ec2_credential_policies | |||
End of changes. 4 change blocks. | ||||
6 lines changed or deleted | 6 lines changed or added |