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

Extend container service model #14233

Merged
merged 3 commits into from
Mar 13, 2017

Conversation

supernoodz
Copy link
Contributor

Add useful container service model associations for use in Automate:

  • openshift_enterprise-container_manager (projects)
  • container_template (container_template_parameters and ext_management_system)

@simon3z
Copy link
Contributor

simon3z commented Mar 13, 2017

@kevensen can you review? IIRC this should be related to something you did recently.

@kevensen
Copy link
Contributor

@simon3z Indeed it is. LGTM.

@supernoodz
Copy link
Contributor Author

@simon3z and @kevensen these are additional associations which aren't included in #12863.

@simon3z
Copy link
Contributor

simon3z commented Mar 13, 2017

OK, LGTM 👍
@miq-bot assign gmcculloug

@gmcculloug are these helping @bzwei for his template provisioning? Should he review this?

@miq-bot miq-bot assigned gmcculloug and unassigned simon3z Mar 13, 2017
expose :container_template_parameters, :association => true
expose :ext_management_system, :association => true
expose :is_tagged_with?
expose :tags
Copy link
Member

Choose a reason for hiding this comment

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

I realized these tag methods got into a lot of the container models, but they need to be removed. You should be using the tag methods defined for at the base service model level here:
https://github.com/ManageIQ/manageiq/blob/master/lib/miq_automation_engine/engine/miq_ae_method_service/miq_ae_service_model_base.rb#L218

Will need to open a git issue to clean up the other service models that added these methods:
miq_ae_service_container.rb
miq_ae_service_container_build.rb
miq_ae_service_container_build_pod.rb
miq_ae_service_container_deployment_node.rb
miq_ae_service_container_group.rb
miq_ae_service_container_image.rb
miq_ae_service_container_image_registry.rb
miq_ae_service_container_node.rb
miq_ae_service_container_replicator.rb
miq_ae_service_container_route.rb
miq_ae_service_container_service.rb
miq_ae_service_container_volume.rb

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Tag methods removed.

@miq-bot
Copy link
Member

miq-bot commented Mar 13, 2017

Checked commits supernoodz/manageiq@c5ca4ea~...10682a3 with ruby 2.2.6, rubocop 0.47.1, and haml-lint 0.20.0
4 files checked, 0 offenses detected
Everything looks good. 🏆

@gmcculloug gmcculloug merged commit 9851870 into ManageIQ:master Mar 13, 2017
@gmcculloug gmcculloug added this to the Sprint 56 Ending Mar 13, 2017 milestone Mar 13, 2017
@simaishi
Copy link
Contributor

simaishi pushed a commit that referenced this pull request Apr 21, 2017
@simaishi
Copy link
Contributor

Euwe backport details:

$ git log -1
commit 6ced1c292cbd22a3b75c871733a13a2679e22a57
Author: Greg McCullough <gmccullo@redhat.com>
Date:   Mon Mar 13 13:27:52 2017 -0400

    Merge pull request #14233 from supernoodz/extend_container_service_model
    
    Extend container service model
    (cherry picked from commit 98518705b47e367eb9e600ca98767ea5a544a790)
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1444494

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.

None yet

7 participants