foreman_teamdynamix 2.0.3 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bd0004bd162ddf6c9bf3ed6b128fa36087c12201d507a12e4f2a9030d154a70
-  data.tar.gz: 6624ed1dd1186c419afd646b203668fe65a6f7490bf04697c1e0aa4de130b663
+  metadata.gz: 9447f4fafefc51ad87b10340ee0052183a3df64aacfcee1cb4735c2a4d918b96
+  data.tar.gz: 5e4332b9a7ff0254c98261b58c18d4f686eba8d6ac780be964eb0e46e45f8e52
 SHA512:
-  metadata.gz: 36a98af7c69a9f0891dbfb2bf46522034caa7785029110256fb8079e4675d911d65ebd8747efa3b30d7f6513656ee0e8bef1e4fa29074fe5fa917040febb00bc
-  data.tar.gz: 4ee608d64ac6f046bb4301d9b9ee49109c28e8973483884bca0ca1cb3a798fca9b4d9e40b73f855c5def5d0c5cd45154b2c5cbada0f0a5c497d77461ac2823ab
+  metadata.gz: cd5e99aadeb49cd4ca4c9929fd6849452defb19321885d160227ba0809b5e5ecfecbc780fe62844a0fb73c082e3a58628b38ff791826281eaf95bb6fad421a44
+  data.tar.gz: 97aab05ff0bf96d4152114351d30a9128bf68270944a713ecd52ee22762261c75d0cad41ac2eb9522851ef6d57ffee4c844ef85020767e7767d9637181cfaa01

data/README.md

@@ -89,7 +89,7 @@ rake teamdynamix:sync:hosts
 ```
 Scans the hosts and sync them with TeamDynamix.
 * If host has teamdynamix_asset_uid, update the corresponding TeamDynamix asset.
-* If host name matches the asset SerialNumber, update the host and the corresponding TeamDynamix asset.
+* If host facts[serialnumber] matches the asset SerialNumber, update the host and the corresponding TeamDynamix asset.
 * If host has no matching asset, create an asset in TeamDynamix with configured fields.
 
 ## Test mode

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

@@ -32,7 +32,7 @@ module ForemanTeamdynamix
     def asset_uri(td_pane_fields)
       if td_pane_fields[:url]
         uri = "#{td_pane_fields[:url]}/#{@asset['AppID']}/Assets/AssetDet?AssetID=#{@asset['ID']}"
-        [[_('URI'), link_to(@asset['SerialNumber'], uri, target: '_blank', rel: 'noopener')]]
+        [[_('URI'), link_to(@asset['Name'], uri, target: '_blank', rel: 'noopener')]]
       else
         []
       end

data/app/models/concerns/foreman_teamdynamix/host_extensions.rb

@@ -19,8 +19,8 @@ module ForemanTeamdynamix
     def teamdynamix_asset(search = false)
       @teamdynamix_asset ||= td_api.get_asset(teamdynamix_asset_uid)
 
-      if search && !@teamdynamix_asset
-        assets = td_api.search_asset(SerialLike: name)
+      if search && !@teamdynamix_asset && facts['serialnumber'].present?
+        assets = td_api.search_asset(SerialLike: facts['serialnumber'])
         if assets.length == 1
           @teamdynamix_asset = td_api.get_asset(assets.first['ID'])
           self.teamdynamix_asset_uid = teamdynamix_asset['ID']

data/app/services/teamdynamix_api.rb

@@ -110,15 +110,15 @@ class TeamdynamixApi
   def create_asset_payload(host)
     ensure_configured_create_params
     default_attrs = { 'AppID' => APP_ID,
-                      'SerialNumber' => host.name,
-                      'Name' => host.fqdn }
+                      'SerialNumber' => host.facts['serialnumber'],
+                      'Name' => host.name }
     evaluate_attributes(API_CONFIG[:create], host, default_attrs)
   end
 
   def update_asset_payload(host)
     default_attrs = { 'AppID' => APP_ID,
-                      'SerialNumber' => host.name,
-                      'Name' => host.fqdn }
+                      'SerialNumber' => host.facts['serialnumber'],
+                      'Name' => host.name }
     evaluate_attributes(API_CONFIG[:create], host, host.teamdynamix_asset.merge(default_attrs))
   end
 

data/lib/foreman_teamdynamix/version.rb

@@ -1,3 +1,3 @@
 module ForemanTeamdynamix
-  VERSION = '2.0.3'.freeze
+  VERSION = '2.1.1'.freeze
 end

data/test/sample_asset.json

@@ -15,7 +15,7 @@
   "LocationRoomID": 0,
   "LocationRoomName": "None",
   "Tag": null,
-  "SerialNumber": "delete.foreman_teamdynamix.com",
+  "SerialNumber": "0123456789",
   "Name": "delete.foreman_teamdynamix.com",
   "PurchaseCost": 0,
   "AcquisitionDate": "0001-01-01T05:00:00Z",

data/test/services/teamdynamix_api_test.rb

@@ -13,6 +13,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
   end
   let(:sample_asset) { FakeTeamdynamixApi.new.get_asset }
   let(:sample_asset_id) { sample_asset['ID'].to_s }
+  let(:serial_number) { '0123456789' }
   let(:host_name) { 'delete.foreman_teamdynamix.com' }
   let(:get_asset_path) { "#{api_url}/#{app_id}/assets/#{sample_asset_id}" }
   let(:create_status_id) { 641 }
@@ -23,7 +24,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
   let(:create_path) { "#{api_url}/#{app_id}/assets" }
   let(:create_payload) do
     { AppID: app_id,
-      SerialNumber: host_name,
+      SerialNumber: serial_number,
       Name: host_name,
       StatusID: create_status_id,
       Attributes: custom_attributes }
@@ -54,7 +55,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
       end
       it 'successfully creates an asset and return it' do
         asset = subject.update_asset(host)
-        assert_equal(asset['SerialNumber'], host.name)
+        assert_equal(asset['SerialNumber'], host.facts['serialnumber'])
         assert_equal(asset['AppID'].to_s, app_id.to_s)
         assert_equal(asset['StatusID'], create_status_id)
       end
@@ -101,7 +102,7 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
       it 'successfully creates an asset and return it' do
         asset = subject.create_asset(host)
         assert_not_nil(asset['ID'])
-        assert_equal(asset['SerialNumber'], host.name)
+        assert_equal(asset['SerialNumber'], host.facts['serialnumber'])
         assert_equal(asset['AppID'].to_s, app_id.to_s)
         assert_equal(asset['StatusID'], create_status_id)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_teamdynamix
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.1.1
 platform: ruby
 authors:
 - Nipendar Tyagi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-30 00:00:00.000000000 Z
+date: 2023-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface