mms-api 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39a0d0fc86adfb6147e58bfac07066c584a94ae2
-  data.tar.gz: 12291221088f7da5d90156e2b020e02b100c2f51
+  metadata.gz: 10eb7918ba86096f3366a7e0a9b8ca3781dd38f8
+  data.tar.gz: daf1d6f4626bfa00ce6667d4359aa9d7c1c74140
 SHA512:
-  metadata.gz: 7b0e56c1eaa825b8675c9864d111cd7bef8b2ff7f5dad9d0e999c07bbe0534e575ca76a5d2634b5695c8a15b2de7b3cb724e34742f3c1146cc85b18e2b22d997
-  data.tar.gz: adfaf6a8ace795944c64f4aa48f15b7e0c4d84f028ef4f13f36f4e34a8607dd21fa150cff32ce282a364be7c595bcc80ef8a21900996ed00ff4672445b3fc134
+  metadata.gz: 1dd9fa0687862b3acc79f35e73af8134a1fed99ab34ff912890c557317eba6795e87756d73109d96ea754ed7434ccfe577e9076f4429ca25a5c1151f80d88adb
+  data.tar.gz: 25f0494ed23cefde64390d21f68e75be344c7aec859880db34c8ab1d4db16e60e7e153434388debc41e461e633798a8e4413422c6bfba13643dd50e3ef569cbc

data/bin/mms-api

@@ -25,10 +25,15 @@ optparse = OptionParser.new do |opts|
   end
 
   options[:limit] = 5
-  opts.on("-l", "--limit <string>", "Limit for result lines") do |l|
+  opts.on("-l", "--limit <string>", "Limit for result items") do |l|
     options[:limit] = l.to_i
   end
 
+  options[:page] = 1
+  opts.on("-p", "--page <string>", "Page number for listing") do |p|
+    options[:page] = p.to_i
+  end
+
   opts.on("-v", "--version", "Version") do |v|
     puts "#{name} v#{version}"
     exit
@@ -67,8 +72,11 @@ rescue => e
 end
 
 begin
-  agent = MMS::Agent.new(options[:username], options[:apikey])
   ARGV.shift
+  ARGV.push options[:page]
+  ARGV.push options[:limit]
+
+  agent = MMS::Agent.new(options[:username], options[:apikey])
   results = agent.send action.sub('-', '_'), *ARGV
 
   rows = []
@@ -86,7 +94,7 @@ begin
     when 'snapshots'
       heading = ['Group', 'Cluster', 'SnapshotId', 'Complete', 'Created increment', 'Created date', 'Expires']
       results_sorted = results.sort_by { |snapshot| snapshot.created_date }.reverse
-      results_sorted.first(options[:limit]).each do |snapshot|
+      results_sorted.each do |snapshot|
         rows << [snapshot.cluster.group.name, snapshot.cluster.name, snapshot.id, snapshot.complete, snapshot.created_increment, snapshot.created_date, snapshot.expires]
         rows << :separator
         part_count = 0
@@ -100,7 +108,7 @@ begin
     when 'restorejobs', 'restorejobs-create'
       heading = ['RestoreId', 'SnapshotId / Cluster / Group', 'Created', 'Status', 'Point in time', 'Delivery', 'Restore status']
       results_sorted = results.sort_by { |job| job.created }.reverse
-      results_sorted.first(options[:limit]).each do |job|
+      results_sorted.each do |job|
         rows << [job.id, job.snapshot_id, job.created, job.status_name, job.point_in_time, job.delivery_method_name, job.delivery_status_name]
         rows << ['', "#{job.cluster.name} (#{job.cluster.id})", {:value => '', :colspan => 5}]
         rows << ['', job.cluster.group.name, {:value => '', :colspan => 5}]
@@ -115,5 +123,6 @@ begin
   puts table
 
 rescue => e
+  puts "Cannot create restore job `#{e.message}`"
   exit 1
 end

data/lib/mms/agent.rb

@@ -14,21 +14,17 @@ module MMS
       MMS::Resource::Group.get_clusters
     end
 
-    def snapshots
-      MMS::Resource::Cluster.get_snapshots
+    def snapshots(page = 1, limit = 10)
+      MMS::Resource::Cluster.get_snapshots page, limit
     end
 
-    def restorejobs
-      MMS::Resource::Cluster.get_restore_jobs
+    def restorejobs(page = 1, limit = 10)
+      MMS::Resource::Cluster.get_restore_jobs page, limit
     end
 
-    def restorejobs_create(group_id, cluster_id, snapshot_id)
-      begin
-        cluster = MMS::Resource::Cluster.new cluster_id, group_id
-        cluster.create_restorejob_from_snapshot snapshot_id
-      rescue => e
-        raise "Cannot create restore job `#{e.message}`"
-      end
+    def restorejobs_create(group_id, cluster_id, snapshot_id, page = 1, limit = 10)
+      cluster = MMS::Resource::Cluster.new cluster_id, group_id
+      cluster.create_restorejob_from_snapshot snapshot_id, page, limit
     end
   end
 end

data/lib/mms/resource/cluster.rb

@@ -15,27 +15,27 @@ module MMS
       super id, data
     end
 
-    def self.get_snapshots
+    def self.get_snapshots(page = 1, limit = 10)
       snapshot_list = []
       MMS::Resource::Group.get_clusters.each do |cluster|
-        MMS::Client.instance.get('/groups/' + cluster.group.id + '/clusters/' + cluster.id + '/snapshots').each do |snapshot|
+        MMS::Client.instance.get('/groups/' + cluster.group.id + '/clusters/' + cluster.id + '/snapshots?pageNum=' + page.to_s + '&itemsPerPage=' + limit.to_s).each do |snapshot|
           snapshot_list.push MMS::Resource::Snapshot.new(snapshot['id'], snapshot['clusterId'], snapshot['groupId'], snapshot)
         end
       end
       snapshot_list
     end
 
-    def self.get_restore_jobs
+    def self.get_restore_jobs(page = 1, limit = 10)
       job_list = []
       MMS::Resource::Group.get_clusters.each do |cluster|
-        MMS::Client.instance.get('/groups/' + cluster.group.id + '/clusters/' + cluster.id + '/restoreJobs').each do |job|
+        MMS::Client.instance.get('/groups/' + cluster.group.id + '/clusters/' + cluster.id + '/restoreJobs?pageNum=' + page.to_s + '&itemsPerPage=' + limit.to_s).each do |job|
           job_list.push MMS::Resource::RestoreJob.new(job['id'], job['clusterId'], job['groupId'], job)
         end
       end
       job_list
     end
 
-    def create_restorejob_from_snapshot(id)
+    def create_restorejob_from_snapshot(id, page = 1, limit = 10)
       data = {:snapshotId => id}
       jobs = MMS::Client.instance.post '/groups/' + @group.id + '/clusters/' + @id + '/restoreJobs', data
 
@@ -45,7 +45,7 @@ module MMS
 
       job_list = []
       # work around due to bug in MMS API; cannot read restoreJob using provided info.
-      restore_jobs = MMS::Resource::Cluster.get_restore_jobs
+      restore_jobs = MMS::Resource::Cluster.get_restore_jobs page, limit
       jobs.each do |job|
         _list = restore_jobs.select {|restorejob| restorejob.id == job['id'] }
         _list.each do |restorejob|

data/lib/mms/version.rb

@@ -1,3 +1,3 @@
 module MMS
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mms-api
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Cargo Media
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-26 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http-digest_auth
@@ -88,7 +88,7 @@ files:
 - lib/mms/resource/restore_job.rb
 - lib/mms/resource/snapshot.rb
 - lib/mms/version.rb
-homepage: https://github.com/cargomedia/mms
+homepage: https://github.com/cargomedia/mms-api
 licenses:
 - MIT
 metadata: {}