From 81c18488a8ea3ba2699fcf0fc3711103e4635354 Mon Sep 17 00:00:00 2001 From: Zahi Akiva Date: Tue, 18 Jul 2017 16:13:10 +0300 Subject: [PATCH] Use archived? instead of ems_id.nil? --- app/models/container.rb | 2 +- app/models/container_group.rb | 2 +- app/models/container_image.rb | 2 +- app/models/container_project.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/container.rb b/app/models/container.rb index 9da3eab8b0f..e74b143559a 100644 --- a/app/models/container.rb +++ b/app/models/container.rb @@ -45,7 +45,7 @@ def perf_rollup_parents(_interval_name = nil) end def disconnect_inv - return if ems_id.nil? + return if archived? _log.info "Disconnecting Container [#{name}] id [#{id}] from EMS " self.deleted_on = Time.now.utc save diff --git a/app/models/container_group.rb b/app/models/container_group.rb index d15b20ec519..36100ffc0bc 100644 --- a/app/models/container_group.rb +++ b/app/models/container_group.rb @@ -79,7 +79,7 @@ def perf_rollup_parents(interval_name = nil) end def disconnect_inv - return if ems_id.nil? + return if archived? _log.info "Disconnecting Pod [#{name}] id [#{id}] from EMS [#{ext_management_system.name}]" \ "id [#{ext_management_system.id}] " self.containers.each(&:disconnect_inv) diff --git a/app/models/container_image.rb b/app/models/container_image.rb index 5eb12c53873..322e1d5ff85 100644 --- a/app/models/container_image.rb +++ b/app/models/container_image.rb @@ -89,7 +89,7 @@ def openscap_failed_rules_summary end def disconnect_inv - return if ems_id.nil? + return if archived? _log.info "Disconnecting Image [#{name}] id [#{id}] from EMS [#{ext_management_system.name}]" \ "id [#{ext_management_system.id}] " self.container_image_registry = nil diff --git a/app/models/container_project.rb b/app/models/container_project.rb index b4db064108b..c6f826296fb 100644 --- a/app/models/container_project.rb +++ b/app/models/container_project.rb @@ -61,7 +61,7 @@ def perf_rollup_parents(interval_name = nil) end def disconnect_inv - return if ems_id.nil? + return if archived? _log.info "Disconnecting Container Project [#{name}] id [#{id}] from EMS [#{ext_management_system.name}]" \ "id [#{ext_management_system.id}] " self.deleted_on = Time.now.utc