Support flavors for catalog bundles with Orchestration

[davidtluong]

Adds functionality so that catalog bundles now have access to flavors.

Thank you @gmcculloug and @NickLaMuro for improving on my original if conditional for this.

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

[coveralls]

Pull Request Test Coverage Report for Build 3116

• 4 of 4 (100.0%) changed or added relevant lines in 1 file are covered.
• No unchanged relevant lines lost coverage.
• Overall coverage increased (+0.003%) to 96.93%

---

Totals
Change from base Build 3114:	0.003%
Covered Lines:	2936
Relevant Lines:	3029

---

💛 - Coveralls

[davidtluong]

So I noticed that the spec was failing unless unless service.try(:service_templates).nil? was added, so the method doesn't error out there's no service_templates object for the ServiceTemplate.

That being said, even though it passed, I would assume the spec file is still missing the test for checking my new functionality for catalog bundles, since it was non existent before. After taking a look at the spec file, it was beyond my understanding, so someone else would have to edit that file or teach me how to test my new functionality correctly. Either way is good with me, I'm always up for learning something new.

[gmcculloug]

Reduce the complexity a little:

service.service_templates.detect(&:orchestration_manager).try(:orchestration_manager) if service.respond_to?(:service_templates)

[davidtluong]

Ack, made the change.

[d-m-u]

Hey @rh-dluong sorry, it was just a little bit of a pain

    context 'bundled service' do
      before do
        service_template.add_resource!(service_template_child)
      end
       
      let(:service_template) do
        FactoryBot.create(:service_template_orchestration)
      end

      let(:service_template_child) do
        FactoryBot.create(:service_template_orchestration, :orchestration_manager => ems)
      end

      let(:default_desc) { "<select>" }
      let(:flavor1) { FactoryBot.create(:flavor, :name => 'flavor1') }
      let(:flavor2) { FactoryBot.create(:flavor, :name => 'flavor2') }
      let(:ems) { FactoryBot.create(:ems_openstack, :flavors => [flavor1, flavor2]) }

      let(:svc_model_flavor1) do
        MiqAeMethodService::MiqAeServiceFlavor.find(flavor1.id)
      end

      let(:svc_model_flavor2) do
        MiqAeMethodService::MiqAeServiceFlavor.find(flavor2.id)
      end

      let(:svc_model_orchestration_manager) do
        MiqAeMethodService::MiqAeServiceExtManagementSystem.find(ems.id)
      end

      let(:svc_model_service) do
        root_hash["service_template"] || root_hash["service"]
      end

      it "finds all the flavors and populates the list" do
        allow(ae_service.root).to receive(:attributes)
        .and_return("service_template" => svc_model_service)
        allow(svc_model_service).to receive(:orchestration_manager)
        .and_return(nil)
        allow(svc_model_orchestration_manager).to receive(:flavors)
        .and_return([svc_model_flavor1, svc_model_flavor2])
        described_class.new(ae_service).main

        expect(ae_service["values"]).to include(
          nil          => default_desc,
          flavor1.name => flavor1.name,
          flavor2.name => flavor2.name
        )
        expect(ae_service["default_value"]).to be_nil
      end
    end

[gmcculloug]

Nice job @d-m-u!

[d-m-u]

thanks @rh-dluong

[davidtluong]

Thanks @d-m-u for modifying the spec!

[miq-bot]

Checked commit davidtluong@e8c56cf with ruby 2.3.3, rubocop 0.69.0, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 0 offenses detected
Everything looks fine. ⭐