foreman_teamdynamix 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa4a042eea23067c0031d158c3d6dd365cc8ed8
-  data.tar.gz: a6f95a35f5b7bd3649ca709ba6e916d3b7f68233
+  metadata.gz: 15fdcc09436a8ad3ca8f0f0f3ebcfa6772d39e18
+  data.tar.gz: 2f9cfc30bf6e5bb244f8073dfe89c6249eeb146b
 SHA512:
-  metadata.gz: 7f2135377a4998f4d0fa5bc2701d9222745705115129b6ffdea3315c8be2a46037818c9c0380958ca708837ef276e694137f832657730d753211b8ac5d0925b8
-  data.tar.gz: 33a553f5ad86b40db58a0a2eb78dc4b79283d90eaa950ed11a3c75dbaf14b1a633b11eec85b59a7c3dd9c59c0c33f1d38f9bf1c4ceb114a29d5c93e301b56ca1
+  metadata.gz: c2c46411f760a877fe86ff0f298a16d24c282d15d1a57cc3f970abe71edf863d9be5b92e9445cb0d731513d96cb857d09da74ee56bbd856a97d07a9cff51f666
+  data.tar.gz: ce827278475838d58e25d4f591a9dfc9319dce24c101fd910d91c85997b3dab6d8a0e60ad5c8fb81fad9cd43084b46b7aae47170a7f940ffb670d7a800018d41

data/README.md

@@ -83,7 +83,7 @@ Add the teamdynamix config to <foreman_repo>/config/settings.yaml
 rake teamdynamix:sync:hosts
 ```
 Scans the hosts and sync them with TeamDynamix.
-* If host has teamdynamix_asset_id, update the corresponding TeamDynamix asset.
+* 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 has no matching asset, create an asset in TeamDynamix with configured fields.
 

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

@@ -11,9 +11,9 @@ module ForemanTeamdynamix
 
     def teamdynamix_fields
       td_pane_fields = SETTINGS[:teamdynamix][:fields] || DEFAULT_TD_PANE_FIELDS
-      return [[_('Asset'), 'None Associated']] unless @host.teamdynamix_asset_id
+      return [[_('Asset'), 'None Associated']] unless @host.teamdynamix_asset_uid
 
-      get_teamdynamix_asset(@host.teamdynamix_asset_id)
+      get_teamdynamix_asset(@host.teamdynamix_asset_uid)
 
       # always display a link to the asset
       fields = [asset_uri]

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

@@ -9,7 +9,7 @@ module ForemanTeamdynamix
     included do
       before_create :create_teamdynamix_asset
       before_destroy :retire_teamdynamix_asset
-      validates :teamdynamix_asset_id, uniqueness: { :allow_blank => true }
+      validates :teamdynamix_asset_uid, uniqueness: { :allow_blank => true }
     end
 
     private
@@ -20,11 +20,11 @@ module ForemanTeamdynamix
 
       if assets.empty?
         asset = td_api.create_asset(self)
-        self.teamdynamix_asset_id = asset['ID']
+        self.teamdynamix_asset_uid = asset['ID']
       elsif assets.length > 1
         raise 'Found more than 1 existing asset'
       else
-        self.teamdynamix_asset_id = assets.first['ID']
+        self.teamdynamix_asset_uid = assets.first['ID']
         td_api.update_asset(self)
       end
     rescue StandardError => e
@@ -33,7 +33,7 @@ module ForemanTeamdynamix
     end
 
     def retire_teamdynamix_asset
-      td_api.retire_asset(teamdynamix_asset_id) if teamdynamix_asset_id
+      td_api.retire_asset(teamdynamix_asset_uid) if teamdynamix_asset_uid
     rescue StandardError => e
       errors.add(:base, _("Could not retire the asset for the host in TeamDynamix: #{e.message}"))
       false

data/app/services/teamdynamix_api.rb

@@ -36,7 +36,7 @@ class TeamdynamixApi
   end
 
   def update_asset(host)
-    uri = URI.parse(API_URL + "/#{APP_ID}/assets/#{host.teamdynamix_asset_id}")
+    uri = URI.parse(API_URL + "/#{APP_ID}/assets/#{host.teamdynamix_asset_uid}")
     rest(:post, uri, update_asset_payload(host))
   end
 
@@ -138,7 +138,7 @@ class TeamdynamixApi
   end
 
   def update_asset_payload(host)
-    payload = { ID: host.teamdynamix_asset_id }
+    payload = { ID: host.teamdynamix_asset_uid }
     payload.merge(create_asset_payload(host))
   end
 

data/db/migrate/20171228033228_add_teamdynamix_asset_id_to_hosts.foreman_teamdynamix.rb

@@ -1,5 +1,5 @@
-class AddTeamdynamixAssetIdToHosts < ActiveRecord::Migration
+class AddTeamdynamixAssetUidToHosts < ActiveRecord::Migration
   def change
-    add_column :hosts, :teamdynamix_asset_id, :string
+    add_column :hosts, :teamdynamix_asset_uid, :string
   end
 end

data/lib/foreman_teamdynamix/version.rb

@@ -1,3 +1,3 @@
 module ForemanTeamdynamix
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

data/lib/tasks/teamdynamix.rake

@@ -21,20 +21,20 @@ namespace :teamdynamix do
 
       Host.all.each do |h|
         # if asset exists, update it
-        if td_api.asset_exist?(h.teamdynamix_asset_id)
+        if td_api.asset_exist?(h.teamdynamix_asset_uid)
           td_api.update_asset(h)
           update_from_asset_id += 1
         else
           assets = td_api.search_asset(SerialLike: h.name)
           if assets.empty?
             asset = td_api.create_asset(h)
-            h.teamdynamix_asset_id = asset['ID']
+            h.teamdynamix_asset_uid = asset['ID']
             errors.push("Could not save host: #{h.name} (#{h.id})") unless h.save
             creates += 1
           elsif assets.length > 1
             errors.push("Could not sync: Found more than 1 asset for #{h.name} (#{h.id})")
           else
-            h.teamdynamix_asset_id = assets.first['ID']
+            h.teamdynamix_asset_uid = assets.first['ID']
             td_api.update_asset(h)
             errors.push("Could not save host: #{h.name} (#{h.id})") unless h.save
             updates_from_serial_matching += 1

data/test/models/host_extensions_test.rb

@@ -16,8 +16,8 @@ class HostExtensionsTests < ActiveSupport::TestCase
       assert_send([td_api, :create_asset, host])
     end
 
-    it 'sets host#teamdynamix_asset_id' do
-      assert_not_nil(host.teamdynamix_asset_id)
+    it 'sets host#teamdynamix_asset_uid' do
+      assert_not_nil(host.teamdynamix_asset_uid)
     end
   end
 
@@ -31,7 +31,7 @@ class HostExtensionsTests < ActiveSupport::TestCase
     end
 
     it 'calls Teamdynamix API to retire an asset' do
-      assert_send([td_api, :retire_asset, host.teamdynamix_asset_id])
+      assert_send([td_api, :retire_asset, host.teamdynamix_asset_uid])
     end
   end
 end

data/test/services/teamdynamix_api_test.rb

@@ -36,9 +36,9 @@ class TeamdynamixApiTest < ActiveSupport::TestCase
 
   describe '#update_asset' do
     let(:update_path) { get_asset_path }
-    let(:update_payload) { { ID: host.teamdynamix_asset_id }.merge!(create_payload) }
+    let(:update_payload) { { ID: host.teamdynamix_asset_uid }.merge!(create_payload) }
     before do
-      host.teamdynamix_asset_id = sample_asset_id
+      host.teamdynamix_asset_uid = sample_asset_id
       SETTINGS[:teamdynamix][:api][:create] = { StatusID: create_status_id,
                                                 Attributes: custom_attributes }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_teamdynamix
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nipendar Tyagi