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

[DARGA] Update armrest gem, update subscription handling and add region handling for Darga #13311

Merged
merged 1 commit into from
Mar 22, 2017
Merged

Conversation

djberg96
Copy link
Contributor

This updates the Darga branch to 0.5.x of the azure-armrest gem, putting it in line with the other branches. Not only does this make maintenance between branches easier going forward, it also enables USGov support, and potentially other regions.

Because subscription ID's are technically optional in Darga, some logic changes were required to accommodate changes within the armrest gem itself, as well as the addition of a region argument to the raw_connect method.

Addresses https://bugzilla.redhat.com/show_bug.cgi?id=1403366

Marked as a WIP for now, since I need to ensure metrics, events and provisioning work as expected.

@djberg96
Copy link
Contributor Author

@miq-bot add_label wip

@djberg96
Copy link
Contributor Author

@chessbyte @bdunne I have no idea what's going on with those failures. Is there something special I'm supposed to do when submitting a PR against a specific branch like this?

@bdunne
Copy link
Member

bdunne commented Jan 16, 2017

Kicking Travis

@bdunne bdunne closed this Jan 16, 2017
@bdunne bdunne reopened this Jan 16, 2017
@djberg96
Copy link
Contributor Author

@bdunne What's the word?

@bdunne
Copy link
Member

bdunne commented Jan 18, 2017

@djberg96 Looks like you have some test failures to address.

@miq-bot
Copy link
Member

miq-bot commented Jan 20, 2017

This pull request is not mergeable. Please rebase and repush.

@chessbyte chessbyte assigned simaishi and unassigned chessbyte Jan 23, 2017
@chessbyte chessbyte changed the title [WIP] Update armrest gem, update subscription handling and add region handling for Darga [DARGA][WIP] Update armrest gem, update subscription handling and add region handling for Darga Jan 23, 2017
@@ -3,7 +3,7 @@ raise "Ruby versions less than 2.2.2 are unsupported!" if RUBY_VERSION < "2.2.2"
# VMDB specific gems
#

gem "rails", "~>5.0.0.1"
gem "rails", "~>5.0.0", ">= 5.0.0.1"
Copy link
Member

Choose a reason for hiding this comment

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

I don't think you want this change.

the previous version was more restrictive. and the current build failure is due to lightening up that restriction

Copy link
Member

@chrisarcand chrisarcand Jan 23, 2017

Choose a reason for hiding this comment

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

Yeah this change allows 5.0.1 which is known not to work. We had agreed that Darga and Euwe should be restricted to 5.0.0 due to incompatibilities with virtual_attributes that we don't want to bother backporting.

@miq-bot miq-bot changed the title [DARGA][WIP] Update armrest gem, update subscription handling and add region handling for Darga [DARGA] [DARGA][WIP] Update armrest gem, update subscription handling and add region handling for Darga Jan 23, 2017
@chrisarcand chrisarcand changed the title [DARGA] [DARGA][WIP] Update armrest gem, update subscription handling and add region handling for Darga [WIP][DARGA] Update armrest gem, update subscription handling and add region handling for Darga Jan 23, 2017
@miq-bot miq-bot changed the title [WIP][DARGA] Update armrest gem, update subscription handling and add region handling for Darga [DARGA] [WIP][DARGA] Update armrest gem, update subscription handling and add region handling for Darga Jan 23, 2017
@bdunne bdunne changed the title [DARGA] [WIP][DARGA] Update armrest gem, update subscription handling and add region handling for Darga [DARGA] [WIP] Update armrest gem, update subscription handling and add region handling for Darga Jan 23, 2017
@djberg96
Copy link
Contributor Author

djberg96 commented Jan 25, 2017

Just a quick update, iit works, but I should note that usgov regions do not support events and metrics. This is a limitation from Azure, not of this library.

@djberg96
Copy link
Contributor Author

@miq-bot remove_label wip

@djberg96 djberg96 changed the title [DARGA] [WIP] Update armrest gem, update subscription handling and add region handling for Darga [DARGA] Update armrest gem, update subscription handling and add region handling for Darga Jan 25, 2017
@simaishi
Copy link
Contributor

@djberg96 can you please add a reference to equivalent 'master' PR(s)?

@djberg96
Copy link
Contributor Author

@simaishi #13670 and ManageIQ/manageiq-providers-azure#28.

This is a pain because of the repo splitting that's happened between darga, euwe (the azure provider) and master (gems-pending).

@simaishi
Copy link
Contributor

Thanks @djberg96 Will wait for an approval from @kbrock or @chrisarcand

…ion handling.

Bump armrest version to 0.5.2 and remove old blank subscription logic.

Scope Azure::Armrest::ApiException properly.

Update call to clear_caches.
@miq-bot
Copy link
Member

miq-bot commented Jan 26, 2017

Some comments on commit https://github.com/djberg96/manageiq/commit/c37d86c1ee70c83844e56170585ae5a6881d57c7

gems/pending/spec/recordings/miq_vm/miq_azure_vm_image_spec/miq_azure_vm_image_spec_rootTrees-2.yml

  • ⚠️ - 35417 - Detected pp. Remove all debugging statements.

@miq-bot
Copy link
Member

miq-bot commented Jan 26, 2017

Checked commit https://github.com/djberg96/manageiq/commit/c37d86c1ee70c83844e56170585ae5a6881d57c7 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
8 files checked, 0 offenses detected
Everything looks good. 👍

@chrisarcand
Copy link
Member

Thanks @djberg96 Will wait for an approval from @kbrock or @chrisarcand

I'm too unfamiliar to approve and merge this, sorry. I reviewed only the previous change that made Rails update to an unusable version in Darga.

@simaishi simaishi requested a review from blomquisg January 26, 2017 22:37
@djberg96
Copy link
Contributor Author

@blomquisg @bronaghs Look good? Can we merge?

Class.new do
def join; end
end.new
end
end

Choose a reason for hiding this comment

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

@djberg96 why is this no longer needed? What was it for?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It was for thread safety for VCR. But VCR added their own safety and keeping it caused problems. We set our own thread limit directly within the armrest gem.

Choose a reason for hiding this comment

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

Ok, thanks.

@bronaghs
Copy link

@bzwei - Might any of the PRs you authored between versions 0.2.11 and 0.5.2 of the azure-armrest gem be incompatible with the current darga branch? This one maybe:
ManageIQ/azure-armrest#244

@bzwei
Copy link
Contributor

bzwei commented Jan 27, 2017

@bronaghs I actually need 0.5.x for the PR

@bronaghs
Copy link

The code changes look good in this PR however I cannot verify there will be no compatibility issues but I expect QE will help with that.

@blomquisg - over to you.

@djberg96
Copy link
Contributor Author

@blomquisg Is it safe to merge now?

@miq-bot miq-bot changed the title [DARGA] Update armrest gem, update subscription handling and add region handling for Darga [WIP] [DARGA] Update armrest gem, update subscription handling and add region handling for Darga Mar 13, 2017
@miq-bot miq-bot added the wip label Mar 13, 2017
Copy link
Member

@blomquisg blomquisg left a comment

Choose a reason for hiding this comment

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

@simaishi This is good for darga branch now. Feel free to merge for Darga-6.

@simaishi simaishi removed the wip label Mar 22, 2017
@simaishi simaishi changed the title [WIP] [DARGA] Update armrest gem, update subscription handling and add region handling for Darga [DARGA] Update armrest gem, update subscription handling and add region handling for Darga Mar 22, 2017
@simaishi simaishi merged commit c2f2f8b into ManageIQ:darga Mar 22, 2017
@simaishi simaishi added this to the Sprint 57 Ending Mar 27, 2017 milestone Mar 22, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.