Add EAP and Wildfly to allowed types for MW topology #2724

karelhala · 2017-11-14T13:54:39Z

Fixes missing EAP and Wildfly item in topology

When there are any providers with EAP or Wildfly server monitored, they were not displayed in topology view. This PR fixes such issue

UI changes

Before

After

Waiting on core

Add two new types to MW server factories manageiq#16478

BZ

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

karelhala · 2017-11-14T13:56:18Z

@miq-bot add_label bug,gaprindashvili/yes, middleware
@abonas can you please assign this to someone to review it? Thank you.

abonas · 2017-11-14T14:17:38Z

@miq-bot add_label topology

abonas · 2017-11-14T14:23:41Z

the PR LGTM. one thing I'm wondering about though - is MiddlewareServer now still needed here after moving to more concrete eap/wildfly types (and displaying them specifically) that derive from MiddlewareServer?

abonas · 2017-11-14T14:24:11Z

should any unitests be adjusted to those specific types? afaik we have some jasmin tests with example json files and other sample inputs that should be updated

karelhala · 2017-11-14T15:13:55Z

@abonas well the server which has hawkular running on is of MiddlewareServer type, so this one would not be visible in topology.

Sure unit tests should include these new classes as well, I'll add them right away.

karelhala · 2017-11-15T14:20:29Z

Travis fail is relevant to ManageIQ/manageiq#16478

abonas · 2017-11-16T13:57:54Z

shouldn't this and this be also updated?

abonas · 2017-11-19T10:15:41Z

@karelhala have you seen my comment above regarding other potential tests that should be updated?

karelhala · 2017-11-20T15:43:56Z

@abonas sorry, I missed your last comment. I'll check it out, since PR ManageIQ/manageiq#16478 is closed I can now focus on fixing tests.

abonas · 2017-11-21T13:07:01Z

@karelhala what's the status of this PR? thanks.

abonas · 2017-11-21T13:07:25Z

@miq-bot assign @martinpovolny

karelhala · 2017-11-22T08:35:10Z

@abonas I am fixing the tests right now.

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

abonas · 2017-11-26T10:46:09Z

spec/javascripts/fixtures/json/middleware_topology_response.json

@@ -79,6 +95,14 @@
        "source": "MiddlewareManager1",
        "target": "MiddlewareServer1"


is this link still relevant in the current architecture with eap/wildfly? I mean will we get it on real env? Won't we get only wildfly/eap objects in the json, no?

Well I am not against removing these, however we still use MiddlewareServer for Hawkular server. So Whenever I spin hawkular standalone the server inside it will be of type MiddlewareServer. I tested this with hawkinit and it was still present.
However if you'd were to run hawkular provider on wildfly/eap solely by installing some packages and such (kinda hard to do) it will be of type wildfly/eap.

ok, as long as it appears then it should be present. the point here is to make sure this reflects a real env.

abonas · 2017-11-26T10:48:52Z

spec/services/middleware_topology_service_spec.rb

+                                                                       :kind         => "MiddlewareServerEap",
+                                                                       :display_kind => "MiddlewareServerEap",
+                                                                       :miq_id       => mw_server_eap.id,
+                                                                       :icon         => match(/vendor-wildfly/),


isn't the icon vendor-eap here?

abonas · 2017-11-26T10:50:02Z

spec/services/middleware_topology_service_spec.rb

-         :target => "MiddlewareMessaging" + mw_messaging.compressed_id.to_s}
+        {
+          :source => "MiddlewareManager" + ems_hawkular.compressed_id.to_s,
+          :target => "MiddlewareServer" + mw_server.compressed_id.to_s


I think this is not relevant atm, we'll get only eap/wildfly types

abonas · 2017-11-26T10:50:34Z

spec/services/middleware_topology_service_spec.rb

+          :target => "MiddlewareServerWildfly" + mw_server_wildfly.compressed_id.to_s
+        },
+        {
+          :source => "MiddlewareServer" + mw_server.compressed_id.to_s,


like above, I think all MiddlewareServer is not going to appear anymore, unless I got it wrong

abonas · 2017-11-29T19:29:43Z

spec/services/middleware_topology_service_spec.rb

+                                                                       :kind         => "MiddlewareServerEap",
+                                                                       :display_kind => "MiddlewareServerEap",
+                                                                       :miq_id       => mw_server_eap.id,
+                                                                       :icon         => match(/vendor-jboss-eap/),


is this the same as above?
https://github.com/ManageIQ/manageiq-ui-classic/pull/2724/files#diff-f32f59cd3f168fe8e6bb029d5b543f20R34
here it's vendor-jboss-eap and there it's just vendor-eap

Yes, you are correct!

abonas · 2017-11-29T19:30:23Z

lgtm except for the question about regarding the icon diff in names

abonas · 2017-11-30T08:58:14Z

tests are failing but it looks like an env issue? can you rerun them?

karelhala · 2017-11-30T11:08:39Z

Rerunning travis

miq-bot · 2017-11-30T12:14:04Z

Checked commits karelhala/manageiq-ui-classic@25a0da6~...5962eae with ruby 2.3.3, rubocop 0.47.1, haml-lint 0.20.0, and yamllint 1.10.0
2 files checked, 1 offense detected

spec/services/middleware_topology_service_spec.rb

❗ - Line 103, Col 9 - Style/AlignHash - Align the elements of a hash literal if they span more than one line.

abonas · 2017-11-30T13:09:59Z

@martinpovolny merge please?

Add EAP and Wildfly to allowed types for MW topology (cherry picked from commit 7e2227a)

simaishi · 2017-12-04T22:00:06Z

Gaprindashvili backport details:

$ git log -1
commit 49d901950fd7feb8b7e8de3cd70aa79b2af19493
Author: Martin Povolny <mpovolny@redhat.com>
Date:   Mon Dec 4 15:08:00 2017 +0100

    Merge pull request #2724 from karelhala/eapWildflyTopology
    
    Add EAP and Wildfly to allowed types for MW topology
    (cherry picked from commit 7e2227a4ac3c6c9c25ad722035330cb8d734a700)

miq-bot added bug gaprindashvili/yes middleware labels Nov 14, 2017

miq-bot added the topology label Nov 14, 2017

karelhala mentioned this pull request Nov 15, 2017

Add two new types to MW server factories ManageIQ/manageiq#16478

Merged

karelhala force-pushed the eapWildflyTopology branch 2 times, most recently from 77bccd7 to dd79cad Compare November 15, 2017 10:18

karelhala force-pushed the eapWildflyTopology branch from dd79cad to c1d9428 Compare November 20, 2017 16:25

miq-bot assigned martinpovolny Nov 21, 2017

karelhala force-pushed the eapWildflyTopology branch from c1d9428 to 020e1ad Compare November 21, 2017 16:05

Add EAP and Wildfly to allowed types for MW topology

25a0da6

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

karelhala force-pushed the eapWildflyTopology branch 3 times, most recently from 803f23d to ca5c6d1 Compare November 24, 2017 15:07

abonas suggested changes Nov 26, 2017

View reviewed changes

karelhala force-pushed the eapWildflyTopology branch 3 times, most recently from a5a25af to 561db64 Compare November 29, 2017 15:46

karelhala force-pushed the eapWildflyTopology branch 3 times, most recently from ac6d0f5 to 654a938 Compare November 29, 2017 17:33

abonas reviewed Nov 29, 2017

View reviewed changes

karelhala force-pushed the eapWildflyTopology branch from 654a938 to b5d2ae6 Compare November 30, 2017 07:05

karelhala closed this Nov 30, 2017

karelhala reopened this Nov 30, 2017

Update MW topology tests to include two new server types

5962eae

karelhala force-pushed the eapWildflyTopology branch from b5d2ae6 to 5962eae Compare November 30, 2017 12:11

abonas approved these changes Nov 30, 2017

View reviewed changes

martinpovolny merged commit 7e2227a into ManageIQ:master Dec 4, 2017

martinpovolny added this to the Sprint 75 Ending Dec 11, 2017 milestone Dec 4, 2017

simaishi pushed a commit that referenced this pull request Dec 4, 2017

Merge pull request #2724 from karelhala/eapWildflyTopology

49d9019

Add EAP and Wildfly to allowed types for MW topology (cherry picked from commit 7e2227a)

simaishi added gaprindashvili/backported and removed gaprindashvili/yes labels Dec 4, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add EAP and Wildfly to allowed types for MW topology #2724

Add EAP and Wildfly to allowed types for MW topology #2724

karelhala commented Nov 14, 2017 •

edited

Loading

karelhala commented Nov 14, 2017

abonas commented Nov 14, 2017

abonas commented Nov 14, 2017

abonas commented Nov 14, 2017

karelhala commented Nov 14, 2017

karelhala commented Nov 15, 2017

abonas commented Nov 16, 2017

abonas commented Nov 19, 2017

karelhala commented Nov 20, 2017

abonas commented Nov 21, 2017

abonas commented Nov 21, 2017

karelhala commented Nov 22, 2017

abonas Nov 26, 2017

karelhala Nov 28, 2017

abonas Nov 28, 2017

abonas Nov 26, 2017

abonas Nov 26, 2017

abonas Nov 26, 2017

abonas Nov 29, 2017

karelhala Nov 30, 2017

abonas commented Nov 29, 2017

abonas commented Nov 30, 2017

karelhala commented Nov 30, 2017

miq-bot commented Nov 30, 2017

abonas commented Nov 30, 2017

simaishi commented Dec 4, 2017

		@@ -79,6 +95,14 @@
		"source": "MiddlewareManager1",
		"target": "MiddlewareServer1"

Add EAP and Wildfly to allowed types for MW topology #2724

Add EAP and Wildfly to allowed types for MW topology #2724

Conversation

karelhala commented Nov 14, 2017 • edited Loading

Fixes missing EAP and Wildfly item in topology

UI changes

Before

After

Waiting on core

BZ

karelhala commented Nov 14, 2017

abonas commented Nov 14, 2017

abonas commented Nov 14, 2017

abonas commented Nov 14, 2017

karelhala commented Nov 14, 2017

karelhala commented Nov 15, 2017

abonas commented Nov 16, 2017

abonas commented Nov 19, 2017

karelhala commented Nov 20, 2017

abonas commented Nov 21, 2017

abonas commented Nov 21, 2017

karelhala commented Nov 22, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

abonas commented Nov 29, 2017

abonas commented Nov 30, 2017

karelhala commented Nov 30, 2017

miq-bot commented Nov 30, 2017

abonas commented Nov 30, 2017

simaishi commented Dec 4, 2017

karelhala commented Nov 14, 2017 •

edited

Loading