Skip to content

Allow equivalent plans when replacing #772

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.

Sign up for GitHub

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

Jump to bottom
Merged
asfgit merged 1 commit into from
Jul 21, 2017
Merged

Allow equivalent plans when replacing #772

asfgit merged 1 commit into from
Jul 21, 2017

Conversation

@ahgittin
Copy link
Contributor

@ahgittin ahgittin commented Jul 21, 2017

Needed because our routines sometimes rewrite the plan

@ahgittin
Copy link
Contributor Author

ahgittin commented Jul 21, 2017

Follow-up to #746 making it slightly more forgiving when replacing, should fix issues when dealing with complex catalogs/blueprints

@ahgittin ahgittin force-pushed the osgi-allow-equivalent-plans branch from 3f4188b to 56e3eec Compare July 21, 2017 13:00
geomacy
geomacy approved these changes Jul 21, 2017
View reviewed changes
Copy link
Contributor

@geomacy geomacy left a comment

Choose a reason for hiding this comment

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

LGTM; will merge when test build succeeds

@geomacy
Copy link
Contributor

geomacy commented Jul 21, 2017

test failure is real, in CatalogResourceTest

@geomacy
Copy link
Contributor

geomacy commented Jul 21, 2017 •
edited
Loading

It's just an update needed to the test expectations - there are now more tags than before on the result:

    "equivalent-plan(A8FA402166F072F19CFE88AEA200B001)",
    "equivalent-plan(A74550A5F94D4AD144AC5EB816DE6C45)",
    {
      "traits": [
        ...
      ]
    }

@ahgittin
record a checksum so that on plan rewrite we don't block reinstallation
bb9d1f8 
with test case that fails without the equivalent plan checks, but works with them
@ahgittin ahgittin force-pushed the osgi-allow-equivalent-plans branch from 56e3eec to bb9d1f8 Compare July 21, 2017 22:22
@ahgittin
Copy link
Contributor Author

ahgittin commented Jul 21, 2017

thanks @geomacy - fixed and merged

@asfgit asfgit merged commit bb9d1f8 into apache:master Jul 21, 2017
asfgit pushed a commit that referenced this pull request Jul 21, 2017
@ahgittin
This closes #772
9795c47
Graeme-Miller pushed a commit to Graeme-Miller/brooklyn-server that referenced this pull request Aug 29, 2017
Revert "This closes apache#772"
c24c909 
This reverts commit 9795c47, reversing
changes made to c694439.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@geomacy geomacy geomacy approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ahgittin @geomacy @asfgit