inv and acc queues

Author: terrywbrady

src-colladmin/Gemfile

@@ -12,7 +12,7 @@ gem 'aws-sdk-lambda'
 gem 'aws-sdk-s3'
 gem 'aws-sdk-ssm'
 gem 'csv'
-gem 'mrt-zk', git: 'https://github.com/CDLUC3/mrt-zk.git', tag: '1.0.3.g'
+gem 'mrt-zk', git: 'https://github.com/CDLUC3/mrt-zk.git', tag: '1.0.3.k'
 gem 'rest-client'
 gem 'rubocop'
 gem 'uc3-ssm', '0.3.10', git: 'https://github.com/CDLUC3/uc3-ssm.git', branch: 'main'

src-colladmin/Gemfile.lock

@@ -1,7 +1,7 @@
 GIT
   remote: https://github.com/CDLUC3/mrt-zk.git
-  revision: 9dd3b3e45de97160d2c6331c4152a5e1ab03f83f
-  tag: 1.0.3.g
+  revision: 562b8017b32c10473d5dd3986eb4c2243bc064e4
+  tag: 1.0.3.k
   specs:
     mrt-zk (1.0.1)
       zk (~> 1.10.0)

src-colladmin/actions/access_queue_action.rb

@@ -1,14 +1,27 @@
 # frozen_string_literal: true
 
-require_relative 'forward_to_ingest_action'
+require_relative 'zookeeper_action'
 require_relative '../lib/acc_queue'
 
 # Collection Admin Task class - see config/actions.yml for description
-class AccessQueueAction < ForwardToIngestAction
+class AccessQueueAction < ZookeeperListAction
   def initialize(config, action, path, myparams)
     super(config, action, path, myparams, 'admin/queues-acc')
   end
 
+  def perform_action
+    jobs = []
+    if ZookeeperListAction.migration_m3?
+      jobs = MerrittZK::Access.list_jobs(@zk)
+    else
+      jobs = MerrittZK::LegacyAccessJob.list_jobs(@zk)
+    end
+    jobs.each do |po|
+      register_item(AccQueueEntry.new(po))
+    end
+    convert_json_to_table('')
+  end
+
   def get_title
     'List Access Queues'
   end
@@ -21,11 +34,6 @@ def table_types
     AccQueueEntry.table_types
   end
 
-  def table_rows(body)
-    queue_list = AccQueueList.new(get_ingest_server, body)
-    queue_list.to_table
-  end
-
   def has_table
     true
   end

src-colladmin/actions/inventory_queue_action.rb

@@ -1,14 +1,22 @@
 # frozen_string_literal: true
 
-require_relative 'forward_to_ingest_action'
+require_relative 'zookeeper_action'
 require_relative '../lib/inv_queue'
 
 # Collection Admin Task class - see config/actions.yml for description
-class InventoryQueueAction < InventoryQueueZookeeperAction
+class InventoryQueueAction < ZookeeperListAction
   def initialize(config, action, path, myparams)
     super(config, action, path, myparams, 'admin/queues-inv')
   end
 
+  def perform_action
+    jobs = ZookeeperListAction.migration_m1? ? [] : MerrittZK::LegacyInventoryJob.list_jobs(@zk)
+    jobs.each do |po|
+      register_item(InvQueueEntry.new(po))
+    end
+    convert_json_to_table('')
+  end
+
   def get_title
     'List Inventory Queues'
   end

src-colladmin/actions/zookeeper_action.rb

@@ -38,28 +38,27 @@ def initialize(config, action, path, myparams, _filters)
     @filters = {}
     @zk = ZK.new(get_zookeeper_conn)
     @items = ZkList.new
+    migration_level
   end
 
   def migration_level
-    return :m1 if @zk.exists?('/migration/m1')
+    return unless $migration.nil?
 
-    :none
+    $migration = []
+    $migration << :m1 if @zk.exists?('/migration/m1')
+    $migration << :m3 if @zk.exists?('/migration/m3')
   end
 
-  def migration_m1?
-    migration_level == :m1
-  end
+  def self.migration_m1?
+    return false if $migration.nil?
 
-  def zk_path
-    '/tbd'
+    $migration.include?(:m1)
   end
 
-  def status_vals
-    []
-  end
+  def self.migration_m3?
+    return false if $migration.nil?
 
-  def is_json
-    false
+    $migration.include?(:m3)
   end
 
   attr_reader :items
@@ -120,17 +119,15 @@ class ZkReleaseM1Action < ZookeeperAction
 
 ## Legacy Queue manipulation action using new mrt-zk
 class LegacyZkAction < ZookeeperAction
-  def status_vals
+  def legacy_status_vals
     MerrittZK::LegacyItem::STATUS_VALS
   end
 
   def prefix
     'na'
   end
 
-  def qpath
-    @qpath
-  end
+  attr_reader :qpath
 
   def bytes
     data = @zk.get(qpath)
@@ -148,7 +145,7 @@ def orig_stat
   def orig_stat_name
     return if orig_stat.nil?
 
-    status_vals[orig_stat]
+    legacy_status_vals[orig_stat]
   end
 
   def write_status(status)
@@ -158,7 +155,7 @@ def write_status(status)
   end
 
   def set_status(status)
-    i = status_vals.find_index(status)
+    i = legacy_status_vals.find_index(status)
     return if i.nil?
 
     orig_name = orig_stat_name
@@ -223,48 +220,11 @@ def check_status(status)
 
 ## Class for reading the legacy Merritt Ingest Queue
 class IngestQueueZookeeperAction < ZookeeperListAction
-  def zk_path
-    '/ingest'
-  end
-
-  def status_vals
-    MerrittZK::LegacyItem::STATUS_VALS
-  end
-
-  def is_json
-    true
-  end
-
   def perform_action
-    $migration = migration_level if migration_m1?
-    jobs = migration_m1? ? MerrittZK::Job.list_jobs(@zk) : MerrittZK::LegacyIngestJob.list_jobs(@zk)
+    jobs = ZookeeperListAction.migration_m1? ? MerrittZK::Job.list_jobs(@zk) : MerrittZK::LegacyIngestJob.list_jobs(@zk)
     jobs.each do |po|
       register_item(QueueEntry.new(po))
     end
     convert_json_to_table('')
   end
 end
-
-## Class for reading the legacy Merritt Inventory Queue
-class InventoryQueueZookeeperAction < ZookeeperListAction
-  def zk_path
-    '/mrt.inventory.full'
-  end
-
-  def status_vals
-    MerrittZK::LegacyItem::STATUS_VALS
-  end
-
-  def is_json
-    true
-  end
-
-  def perform_action
-    $migration = migration_level if migration_m1?
-    jobs = migration_m1? ? [] : MerrittZK::LegacyInventoryJob.list_jobs(@zk)
-    jobs.each do |po|
-      register_item(InvQueueEntry.new(po))
-    end
-    convert_json_to_table('')
-  end
-end

src-colladmin/lib/acc_queue.rb

@@ -14,35 +14,35 @@ def initialize(json)
     super()
     add_property(
       :queueNode,
-      MerrittJsonProperty.new('Queue Node').lookup_value(json, 'que', 'queueNode')
+      MerrittJsonProperty.new('Queue Node').lookup_value(json, '', :queueNode)
     )
     add_property(
       :token,
-      MerrittJsonProperty.new('Token').lookup_value(json, 'que', 'token')
+      MerrittJsonProperty.new('Token').lookup_value(json, '', :token)
     )
     add_property(
       :bytes,
-      MerrittJsonProperty.new('Bytes').lookup_value(json, 'que', 'cloudContentByte')
+      MerrittJsonProperty.new('Bytes').lookup_value(json, '', :'cloud-content-byte')
     )
     add_property(
       :node,
-      MerrittJsonProperty.new('Node').lookup_value(json, 'que', 'deliveryNode')
+      MerrittJsonProperty.new('Node').lookup_value(json, '', :'delivery-node')
     )
     add_property(
       :status_code,
-      MerrittJsonProperty.new('Status Code').lookup_value(json, 'que', 'queueStatus')
+      MerrittJsonProperty.new('Status Code').lookup_value(json, '', :queueStatus)
     )
     add_property(
       :date,
-      MerrittJsonProperty.new('Date').lookup_time_value(json, 'que', 'date')
+      MerrittJsonProperty.new('Date').lookup_time_value(json, '', :date)
     )
     add_property(
       :qstatus,
-      MerrittJsonProperty.new('QStatus').lookup_value(json, 'que', 'status')
+      MerrittJsonProperty.new('QStatus').lookup_value(json, '', :status)
     )
     add_property(
       :queueId,
-      MerrittJsonProperty.new('Queue ID').lookup_value(json, 'que', 'iD')
+      MerrittJsonProperty.new('Queue ID').lookup_value(json, '', :id)
     )
     qs = get_value(:qstatus, '')
     qt = get_value(:date, '')
@@ -71,11 +71,11 @@ def initialize(json)
     )
     add_property(
       :qdelete,
-      MerrittJsonProperty.new('Queue Del', get_queue_path(requeue: false))
+      MerrittJsonProperty.new('Queue Del', get_del_queue_path_m1)
     )
     add_property(
       :requeue,
-      MerrittJsonProperty.new('Requeue', get_queue_path(requeue: true))
+      MerrittJsonProperty.new('Requeue', get_requeue_path_m1)
     )
   end
 
@@ -93,8 +93,13 @@ def self.table_types
       type = 'name' if sym == :token
       type = 'bytes' if sym == :bytes
       type = 'datetime' if sym == :date
-      type = 'qdelete' if sym == :qdelete
-      type = 'requeue' if sym == :requeue
+      if ZookeeperListAction.migration_m3?
+        type = 'qdelete-mrtzk' if sym == :qdelete
+        type = 'requeue-mrtzk' if sym == :requeue
+      else
+        type = 'qdelete-legacy' if sym == :qdelete
+        type = 'requeue-legacy' if sym == :requeue
+      end
       arr.append(type)
     end
     arr

src-colladmin/lib/inv_queue.rb

@@ -80,7 +80,7 @@ def self.table_types
       type = ''
       type = 'status' if sym == :status
       type = 'datetime' if sym == :date
-      if $migration == :m1
+      if ZookeeperListAction.migration_m1?
         type = 'qdelete-mrtzk' if sym == :qdelete
         type = 'requeue-mrtzk' if sym == :requeue
       else

src-colladmin/lib/queue.rb

@@ -128,7 +128,7 @@ def self.table_types
       type = 'qjob' if sym == :job
       type = 'status' if sym == :status
       type = 'datetime' if sym == :date
-      if $migration == :m1
+      if ZookeeperListAction.migration_m1?
         type = 'qdelete-mrtzk' if sym == :qdelete
         type = 'requeue-mrtzk' if sym == :requeue
         type = 'hold-mrtzk' if sym == :hold
@@ -192,7 +192,7 @@ def date
   end
 
   def get_queue_node
-    $migration == :m1 ? '/jobs' : '/ingest'
+    ZookeeperListAction.migration_m1? ? '/jobs' : '/ingest'
   end
 end
 

src-testdriver/Gemfile.lock

@@ -56,7 +56,7 @@ GEM
     rspec-expectations (3.13.0)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.0)
+    rspec-mocks (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-support (3.13.1)