middleware-topology-ui: specs for messaging entity

SasaV-Kolosek · Aug 31, 2016 · b2fd170 · b2fd170
1 parent 2f58e52
commit b2fd170
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 6 deletions.
diff --git a/app/services/middleware_topology_service.rb b/app/services/middleware_topology_service.rb
@@ -20,7 +20,7 @@ def build_topology
         :MiddlewareServers => {
           :MiddlewareDeployments => nil,
           :MiddlewareDatasources => nil,
-          :MiddlewareMessagings => nil,
+          :MiddlewareMessagings  => nil,
           :lives_on              => {:Host => nil}
         }}}
 

diff --git a/spec/javascripts/controllers/middleware/middleware_topology_controller_spec.js b/spec/javascripts/controllers/middleware/middleware_topology_controller_spec.js
@@ -79,6 +79,17 @@ describe('middlewareTopologyController', function () {
     }
   };
 
+  var mw_messaging = {
+    id: "MiddlewareMessaging1",
+    item: {
+      "name": "JMS Topic [HawkularMetricData]",
+      "kind": "MiddlewareMessaging",
+      "miq_id": 1,
+      "status": "Unknown",
+      "display_kind": "MiddlewareMessaging"
+    }
+  };
+
   beforeEach(module('mwTopologyApp'));
 
   beforeEach(inject(function (_$httpBackend_, $rootScope, _$controller_, $location) {
@@ -108,14 +119,15 @@ describe('middlewareTopologyController', function () {
 
   describe('kinds contains all expected mw kinds', function () {
     it('in all main objects', function () {
-      expect(Object.keys(scope.kinds).length).toBe(7);
+      expect(Object.keys(scope.kinds).length).toBe(8);
       expect(scope.kinds["MiddlewareManager"]).toBeDefined();
       expect(scope.kinds["MiddlewareServer"]).toBeDefined();
       expect(scope.kinds["MiddlewareDeployment"]).toBeDefined();
       expect(scope.kinds["MiddlewareDatasource"]).toBeDefined();
       expect(scope.kinds["Vm"]).toBeDefined();
       expect(scope.kinds["MiddlewareDomain"]).toBeDefined();
       expect(scope.kinds["MiddlewareServerGroup"]).toBeDefined();
+      expect(scope.kinds["MiddlewareMessaging"]).toBeDefined();
     });
   });
 
@@ -129,6 +141,7 @@ describe('middlewareTopologyController', function () {
       expect($controller.getIcon(vm).fontfamily).toEqual("PatternFlyIcons-webfont");
       expect($controller.getIcon(mw_domain).fontfamily).toEqual("FontAwesome");
       expect($controller.getIcon(mw_server_group).fontfamily).toEqual("FontAwesome");
+      expect($controller.getIcon(mw_messaging).fontfamily).toEqual("FontAwesome");
     });
   });
 
@@ -141,6 +154,7 @@ describe('middlewareTopologyController', function () {
       expect($controller.getCircleDimensions(vm)).toEqual({ x: 0, y: 9, height: 40, width: 40, r: 21 });
       expect($controller.getCircleDimensions(mw_domain)).toEqual({x: -9, y: -9, height: 18, width: 18, r: 17});
       expect($controller.getCircleDimensions(mw_server_group)).toEqual({x: -9, y: -9, height: 18, width: 18, r: 17});
+      expect($controller.getCircleDimensions(mw_messaging)).toEqual({x: -9, y: -9, height: 18, width: 18, r: 17});
     });
   });
 
@@ -153,6 +167,7 @@ describe('middlewareTopologyController', function () {
       expect($controller.getIcon(vm).type).toEqual("glyph");
       expect($controller.getIcon(mw_domain).type).toEqual("glyph");
       expect($controller.getIcon(mw_server_group).type).toEqual("glyph");
+      expect($controller.getIcon(mw_messaging).type).toEqual("glyph");
     });
   });
 

diff --git a/spec/javascripts/fixtures/json/middleware_topology_response.json b/spec/javascripts/fixtures/json/middleware_topology_response.json
@@ -119,7 +119,8 @@
       "MiddlewareManager": true,
       "Vm": true,
       "MiddlewareServer": true,
-      "MiddlewareServerGroup": true
+      "MiddlewareServerGroup": true,
+      "MiddlewareMessaging": true
     },
     "icons": {
       "ContainerReplicator": {
@@ -187,6 +188,11 @@
         "icon": "",
         "fontfamily": "FontAwesome"
       },
+      "MiddlewareMessaging": {
+        "type": "glyph",
+        "icon": "",
+        "fontfamily": "FontAwesome"
+      },
       "MiddlewareServerGroup": {
         "type": "glyph",
         "icon": "",

diff --git a/spec/services/middleware_topology_service_spec.rb b/spec/services/middleware_topology_service_spec.rb
@@ -8,7 +8,7 @@
   describe "#build_kinds" do
     it "creates the expected number of entity types" do
       supported_kinds = [:MiddlewareServer, :MiddlewareDeployment, :MiddlewareDatasource, :MiddlewareManager, :Vm,
-                         :MiddlewareDomain, :MiddlewareServerGroup]
+                         :MiddlewareDomain, :MiddlewareServerGroup, :MiddlewareMessaging]
       expect(middleware_topology_service.build_kinds.keys).to match_array(supported_kinds)
     end
   end
@@ -45,6 +45,13 @@
                                                       :name                  => "ExampleDS",
                                                       :nativeid              => "Local~/subsystem=datasources/"\
                                                             "data-source=ExampleDS")
+
+      md_messaging = MiddlewareMessaging.create(:ext_management_system => ems_hawkular,
+                                                :middleware_server     => middleware_server,
+                                                :ems_ref               => long_id_2,
+                                                :name                  => "JMS Topic [HawkularMetricData]",
+                                                :nativeid              => "Local~/subsystem=messaging-"\
+                                                      "activemq/server=default/jms-topic=HawkularMetricData")
       expect(subject[:items]).to eq(
         "MiddlewareManager" + ems_hawkular.compressed_id.to_s              => {:name         => ems_hawkular.name,
                                                                                :status       => "Unknown",
@@ -77,9 +84,15 @@
                                                                                :kind         => "MiddlewareDatasource",
                                                                                :display_kind => "MiddlewareDatasource",
                                                                                :miq_id       => mddlwr_datasource.id},
+
+        "MiddlewareMessaging" + md_messaging.compressed_id.to_s            => {:name         => md_messaging.name,
+                                                                               :status       => "Unknown",
+                                                                               :kind         => "MiddlewareMessaging",
+                                                                               :display_kind => "MiddlewareMessaging",
+                                                                               :miq_id       => md_messaging.id},
       )
 
-      expect(subject[:relations].size).to eq(4)
+      expect(subject[:relations].size).to eq(5)
       expect(subject[:relations]).to include(
         {:source => "MiddlewareManager" + ems_hawkular.compressed_id.to_s,
          :target => "MiddlewareServer" + middleware_server.compressed_id.to_s},
@@ -88,7 +101,9 @@
         {:source => "MiddlewareServer" + middleware_server.compressed_id.to_s,
          :target => "MiddlewareDeployment" + middleware_deployment2.compressed_id.to_s},
         {:source => "MiddlewareServer" + middleware_server.compressed_id.to_s,
-         :target => "MiddlewareDatasource" + mddlwr_datasource.compressed_id.to_s}
+         :target => "MiddlewareDatasource" + mddlwr_datasource.compressed_id.to_s},
+        {:source => "MiddlewareServer" + middleware_server.compressed_id.to_s,
+         :target => "MiddlewareMessaging" + md_messaging.compressed_id.to_s}
       )
     end
   end