Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fallback for empty addresses #167

Closed
wants to merge 39 commits into from

Conversation

Carthaca
Copy link
Collaborator

introducing a guard

tlesmann and others added 30 commits April 27, 2016 17:29
Fixed a bug where the project.name was returned as tenant instead of the project itself (as in v2)
Conflicts:
	Rakefile
	fog-openstack.gemspec
	lib/fog/openstack.rb
	lib/fog/openstack/image_v1.rb
	lib/fog/openstack/models/compute/availability_zone.rb
	lib/fog/openstack/models/compute/server.rb
	lib/fog/openstack/models/identity_v3/users.rb
	lib/fog/openstack/models/image_v2/image.rb
	lib/fog/openstack/models/volume/snapshot.rb
	lib/fog/openstack/models/volume/snapshots.rb
	lib/fog/openstack/models/volume/volume.rb
	lib/fog/openstack/models/volume_v1/snapshot.rb
	lib/fog/openstack/models/volume_v1/volume.rb
	lib/fog/openstack/models/volume_v2/snapshot.rb
	lib/fog/openstack/models/volume_v2/volume.rb
	lib/fog/openstack/network.rb
	lib/fog/openstack/requests/compute/create_snapshot.rb
	lib/fog/openstack/requests/compute/delete_flavor_metadata.rb
	lib/fog/openstack/requests/compute/get_key_pair.rb
	lib/fog/openstack/requests/compute/list_availability_zones.rb
	lib/fog/openstack/requests/compute/update_flavor_metadata.rb
	lib/fog/openstack/requests/volume/action.rb
	lib/fog/openstack/requests/volume/create_snapshot.rb
	lib/fog/openstack/requests/volume/delete_metadata.rb
	lib/fog/openstack/requests/volume/delete_snapshot_metadata.rb
	lib/fog/openstack/requests/volume/replace_metadata.rb
	lib/fog/openstack/requests/volume/update_metadata.rb
	lib/fog/openstack/requests/volume/update_snapshot.rb
	lib/fog/openstack/requests/volume/update_snapshot_metadata.rb
	lib/fog/openstack/requests/volume/update_volume.rb
	lib/fog/openstack/volume_v1.rb
	lib/fog/openstack/volume_v2.rb
	spec/fog/identity_v3/authv3_a.yml
	spec/fog/identity_v3/authv3_b.yml
	spec/fog/identity_v3/authv3_c.yml
	spec/fog/identity_v3/authv3_token.yml
	spec/fog/identity_v3/authv3_unscoped.yml
	spec/fog/identity_v3/authv3_unscoped_reauth.yml
	spec/fog/identity_v3/common_setup.yml
	spec/fog/identity_v3/idv3_credential_crud.yml
	spec/fog/identity_v3/idv3_domain_roles_mutation.yml
	spec/fog/identity_v3/idv3_endpoint.yml
	spec/fog/identity_v3/idv3_endpoints_crud.yml
	spec/fog/identity_v3/idv3_project.yml
	spec/fog/identity_v3/idv3_project_hier_crud_list.yml
	spec/fog/identity_v3/idv3_role.yml
	spec/fog/identity_v3/idv3_service.yml
	spec/fog/identity_v3/idv3_services_crud.yml
	spec/fog/identity_v3/idv3_token.yml
	spec/fog/identity_v3/idv3_user_crud.yml
	spec/fog/identity_v3/idv3_users.yml
	spec/fog/image_v1/common_setup.yml
	spec/fog/image_v1/list_images.yml
	spec/fog/image_v1_spec.rb
	spec/fog/image_v2/common_setup.yml
	spec/fog/image_v2/image_v2_create_id.yml
	spec/fog/image_v2/image_v2_crud.yml
	spec/fog/image_v2/image_v2_member_crudl.yml
	spec/fog/image_v2/image_v2_tags.yml
	spec/fog/network/common_setup.yml
	spec/fog/network_spec.rb
	spec/fog/volume/common_setup.yml
	spec/fog/volume/volume_crud.yml
	spec/fog/volume/volume_extend.yml
	spec/fog/volume/volume_transfer_and_accept.yml
	spec/fog/volume/volume_transfer_and_delete.yml
	spec/fog/volume/volume_type_read.yml
	spec/fog/volume_spec.rb
	spec/fog/volume_v1/common_setup.yml
	spec/fog/volume_v1/volume_crud.yml
	spec/fog/volume_v1/volume_extend.yml
	spec/fog/volume_v1/volume_transfer_and_accept.yml
	spec/fog/volume_v1/volume_type_read.yml
	spec/fog/volume_v2/common_setup.yml
	spec/fog/volume_v2/volume_crud.yml
	spec/fog/volume_v2/volume_extend.yml
	spec/fog/volume_v2/volume_transfer_and_accept.yml
	spec/fog/volume_v2/volume_transfer_and_delete.yml
	spec/fog/volume_v2/volume_type_read.yml
	spec/identity_v3_spec.rb
	spec/image_v2_spec.rb
	spec/image_v2_upload_spec.rb
First try to validate given token. If not successful, use old re-authenticate logic for compatibility reasons.
The validation should keep the numbers of issued tokens in keystone much smaller, because a token will be reused instead of a new one is created.
# Fallback to standard authenticate to be compatible
if service
management_url = service['endpoints'].find { |e| e['interface']==endpoint_type }['url']
identity_url = identity_service['endpoints'].find { |e| e['interface']=='public' }['url'] if identity_service

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Surrounding space missing for operator ==.

@coveralls
Copy link

Coverage Status

Changes Unknown when pulling fb61a4b on sapcc:empty_public_ip_addresses into * on fog:master*.

1 similar comment
@coveralls
Copy link

coveralls commented Aug 17, 2016

Coverage Status

Changes Unknown when pulling fb61a4b on sapcc:empty_public_ip_addresses into * on fog:master*.

@Carthaca
Copy link
Collaborator Author

will do a new PR with a cherrypick

@Carthaca Carthaca closed this Aug 17, 2016
@Carthaca Carthaca deleted the empty_public_ip_addresses branch August 17, 2016 07:24
@Carthaca
Copy link
Collaborator Author

see #179

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants