foreman_teamdynamix 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f56e77569cc341af5ed7f645a9b09bbfd3643697
-  data.tar.gz: 387ee535b3172e53dd88e333a8e1a220991b4823
+  metadata.gz: ce914cf3650810a7b8b11a7da6d8fce4300c07e4
+  data.tar.gz: 6644dfc9e975f38d77999d98048eb36e9d47b7ad
 SHA512:
-  metadata.gz: 0c78e5ba2688f98e86b524781b52bbc8a2f868c53ceaeb3f544ae1a79350d9e1de82598dcda357241019d3a01dc226302a9fe6bc96af38cc0cf9829c3a3a39fb
-  data.tar.gz: 3ea41c1e3799f75b263d5aa5738bbd411a9c7f790df42a29f2667304f6e5c4b7606e082acc4932998321bb63e78d34c5f30c7039051ab174810a119b48789b57
+  metadata.gz: dca0adc273e5c3704a8758db94c02907277e5e572f177d0dc660f22229612f664567da98f1919156e40f3c99d01f1bb312066bacf74fa0a8706e4b42496a096e
+  data.tar.gz: 474ccd4916aafa8714afeed5fffcc6aa26005a6446d8c5856a1ad102b9dbddb78db4f86bac994e087f6447aeaf7d9f1609e2d7cae3b14a5d210c09cc8996138f

data/README.md

@@ -23,7 +23,7 @@ Example Configuration
 ---
 :teamdynamix:
   :api:
-    :url: 'https://miamioh.teamdynamix.com/SBTDWebApi/api'
+    :url: https://miamioh.teamdynamix.com/SBTDWebApi/api
     :appId: 741
     :username: 'xxxxxx'
     :password: 'xxxxxx'
@@ -43,6 +43,7 @@ Example Configuration
     :delete:
       :StatusId: 642
   :fields:
+    :url: https://miamioh.teamdynamix.com/SBTDNext/Apps
     Asset ID: ID
     Owner: OwningCustomerName
     Parent Asset: ParentID
@@ -62,7 +63,7 @@ Example Configuration
 
 [:fields]
 * The keys are the display title and the values are the methods that are actually called to produce the value.
-* A link to the asset in Teamdynamix is displayed by default, as first field labelled as URI.
+* A link to the asset in Teamdynamix is displayed, if url is specified, as first field labeled as URI.
 * Nested attributes i.e custom attributes can be configured as mentioned in example configuration.
 * If an attribute or nested attribute does not exist or is not found, it would simply not be displayed.
 

data/app/helpers/concerns/foreman_teamdynamix/hosts_helper_extensions.rb

@@ -15,8 +15,8 @@ module ForemanTeamdynamix
 
       get_teamdynamix_asset(@host.teamdynamix_asset_uid)
 
-      # always display a link to the asset
-      fields = [asset_uri]
+      # display a link to the asset if url set
+      fields = asset_uri(td_pane_fields)
 
       td_pane_fields.each do |field_name, asset_attr|
         asset_attr_val = @asset.key?(asset_attr) ? @asset[asset_attr] : get_nested_attrib_val(asset_attr)
@@ -29,10 +29,13 @@ module ForemanTeamdynamix
 
     private
 
-    def asset_uri
-      api_url = SETTINGS[:teamdynamix][:api][:url]
-      uri = api_url.split('api').first + @asset['Uri']
-      [_('URI'), link_to(@asset['Uri'], uri, target: '_blank')]
+    def asset_uri(td_pane_fields)
+      if (fields_url = td_pane_fields.delete(:url))
+        uri = "#{fields_url}/#{@asset['AppID']}/Assets/AssetDet?AssetID=#{@asset['ID']}"
+        [[_('URI'), link_to(@asset['SerialNumber'], uri, target: '_blank')]]
+      else
+        []
+      end
     end
 
     def get_teamdynamix_asset(asset_id)

data/app/services/teamdynamix_api.rb

@@ -20,7 +20,7 @@ class TeamdynamixApi
 
   # returns TeamDynamix.Api.Assets.Asset
   def get_asset(asset_id)
-    uri = URI.parse(API_URL + "/#{APP_ID}/assets/#{asset_id}")
+    uri = URI.parse("#{API_URL}/#{APP_ID}/assets/#{asset_id}")
     rest(:get, uri)
   end
 
@@ -31,23 +31,23 @@ class TeamdynamixApi
   end
 
   def create_asset(host)
-    uri = URI.parse(API_URL + "/#{APP_ID}/assets")
+    uri = URI.parse("#{API_URL}/#{APP_ID}/assets")
     rest(:post, uri, create_asset_payload(host))
   end
 
   def update_asset(host)
-    uri = URI.parse(API_URL + "/#{APP_ID}/assets/#{host.teamdynamix_asset_uid}")
+    uri = URI.parse("#{API_URL}/#{APP_ID}/assets/#{host.teamdynamix_asset_uid}")
     rest(:post, uri, update_asset_payload(host))
   end
 
   def retire_asset(asset_id)
-    uri = URI.parse(API_URL + "/#{APP_ID}/assets/#{asset_id}")
+    uri = URI.parse("#{API_URL}/#{APP_ID}/assets/#{asset_id}")
     rest(:post, uri, retire_asset_payload(asset_id))
   end
 
   # Gets a list of assets matching the specified criteria. (IEnumerable(Of TeamDynamix.Api.Assets.Asset))
   def search_asset(search_params)
-    uri = URI.parse(API_URL + "/#{APP_ID}/assets/search")
+    uri = URI.parse("#{API_URL}/#{APP_ID}/assets/search")
     rest(:post, uri, search_params)
   end
 
@@ -65,7 +65,7 @@ class TeamdynamixApi
       req = Net::HTTP::Get.new(uri)
     end
     # set headers
-    req.add_field('Authorization', 'Bearer ' + @auth_token)
+    req.add_field('Authorization', "Bearer #{@auth_token}")
     # send request
     res = http.start do |http_handler|
       http_handler.request(req)
@@ -75,7 +75,7 @@ class TeamdynamixApi
   end
 
   def request_token
-    uri = URI.parse(API_URL + '/auth')
+    uri = URI.parse("#{API_URL}/auth")
     http = Net::HTTP.new(uri.host, uri.port)
     http.use_ssl = true
     # set verb

data/lib/foreman_teamdynamix/version.rb

@@ -1,3 +1,3 @@
 module ForemanTeamdynamix
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_teamdynamix
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Nipendar Tyagi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-16 00:00:00.000000000 Z
+date: 2018-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface