mms-api 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10eb7918ba86096f3366a7e0a9b8ca3781dd38f8
-  data.tar.gz: daf1d6f4626bfa00ce6667d4359aa9d7c1c74140
+  metadata.gz: 30140add1019a1eeefbbad55e5cacd2589c76157
+  data.tar.gz: b79a0a425bd350be7a362a456f10c61a1f01e489
 SHA512:
-  metadata.gz: 1dd9fa0687862b3acc79f35e73af8134a1fed99ab34ff912890c557317eba6795e87756d73109d96ea754ed7434ccfe577e9076f4429ca25a5c1151f80d88adb
-  data.tar.gz: 25f0494ed23cefde64390d21f68e75be344c7aec859880db34c8ab1d4db16e60e7e153434388debc41e461e633798a8e4413422c6bfba13643dd50e3ef569cbc
+  metadata.gz: 69506c6a389147b341450ca1f86a276b6bc81ea8bf1282eec1dbf301c6c9e25e1a348fa52f703e12fb66d8b3a3f629e348311a7c08fe934e08127deaa3c711e9
+  data.tar.gz: ad0578f5dd4bb9e6b0902197b9e258906c6b4b64912a854dd5d7b88bdd2de41cf71804870371f49fd82281aebd0861b26071a7a15f52a7637456983f3af68628

data/bin/mms-api

@@ -24,16 +24,16 @@ optparse = OptionParser.new do |opts|
     options[:apikey] = k
   end
 
+  options[:name] = '.*'
+  opts.on("-n", "--name <string>", "Resource name using regexp") do |n|
+    options[:name] = n
+  end
+
   options[:limit] = 5
   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
@@ -73,11 +73,10 @@ end
 
 begin
   ARGV.shift
-  ARGV.push options[:page]
-  ARGV.push options[:limit]
-
   agent = MMS::Agent.new(options[:username], options[:apikey])
+
   results = agent.send action.sub('-', '_'), *ARGV
+  results.select! { |resource| !resource.name.match(Regexp.new(options[:name])).nil? }
 
   rows = []
   case action
@@ -92,9 +91,9 @@ begin
         rows << [cluster.group.name, cluster.name, cluster.shard_name, cluster.replicaset_name, cluster.type_name, cluster.last_heartbeat]
       end
     when 'snapshots'
-      heading = ['Group', 'Cluster', 'SnapshotId', 'Complete', 'Created increment', 'Created date', 'Expires']
+      heading = ['Group', 'Cluster', 'SnapshotId', 'Complete', 'Created increment', 'Created date (Name)', 'Expires']
       results_sorted = results.sort_by { |snapshot| snapshot.created_date }.reverse
-      results_sorted.each do |snapshot|
+      results_sorted.first(options[:limit]).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
@@ -106,9 +105,9 @@ begin
         rows << :separator
       end
     when 'restorejobs', 'restorejobs-create'
-      heading = ['RestoreId', 'SnapshotId / Cluster / Group', 'Created', 'Status', 'Point in time', 'Delivery', 'Restore status']
+      heading = ['RestoreId', 'SnapshotId / Cluster / Group', 'Created (Name)', 'Status', 'Point in time', 'Delivery', 'Restore status']
       results_sorted = results.sort_by { |job| job.created }.reverse
-      results_sorted.each do |job|
+      results_sorted.first(options[:limit]).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}]
@@ -123,6 +122,6 @@ begin
   puts table
 
 rescue => e
-  puts "Cannot create restore job `#{e.message}`"
+  puts "Error: `#{e.message}`"
   exit 1
 end

data/lib/mms/agent.rb

@@ -7,24 +7,43 @@ module MMS
     end
 
     def groups
-      MMS::Resource::Group.load_list
+      group_list = []
+      MMS::Client.instance.get('/groups').each do |group|
+        group_list.push MMS::Resource::Group.new group['id'], group
+      end
+      group_list
     end
 
     def clusters
-      MMS::Resource::Group.get_clusters
+      cluster_list = []
+      groups.each do |group|
+        cluster_list.concat group.clusters
+      end
+      cluster_list
     end
 
-    def snapshots(page = 1, limit = 10)
-      MMS::Resource::Cluster.get_snapshots page, limit
+    def snapshots
+      snapshot_list = []
+      clusters.each do |cluster|
+        snapshot_list.concat cluster.snapshots
+      end
+      snapshot_list
     end
 
-    def restorejobs(page = 1, limit = 10)
-      MMS::Resource::Cluster.get_restore_jobs page, limit
+    def restorejobs
+      restorejob_list = []
+      clusters.each do |cluster|
+        restorejob_list.concat cluster.restorejobs
+      end
+      restorejob_list
     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
+    def restorejobs_create(group_id, cluster_id, snapshot_id)
+      findGroup(group_id).cluster(cluster_id).snapshot(snapshot_id).create_restorejob
+    end
+
+    def findGroup(id)
+      MMS::Resource::Group.new id
     end
   end
 end

data/lib/mms/resource/cluster.rb

@@ -15,52 +15,28 @@ module MMS
       super id, data
     end
 
-    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?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
+    def snapshot(id)
+      MMS::Resource::Snapshot.new id, self.id, self.group.id
     end
 
-    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?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
+    def snapshots(page = 1, limit = 1000)
+      snapshot_list = []
+      MMS::Client.instance.get('/groups/' + @group.id + '/clusters/' + @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
-      job_list
+      snapshot_list
     end
 
-    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
-
-      if jobs.nil?
-        raise "Cannot create job from snapshot `#{id}`"
-      end
-
+    def restorejobs(page = 1, limit = 1000)
       job_list = []
-      # work around due to bug in MMS API; cannot read restoreJob using provided info.
-      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|
-          begin
-            job_list.push MMS::Resource::RestoreJob.new(restorejob.id, restorejob.cluster.id, restorejob.cluster.group.id)
-          rescue => e
-            puts "load error #{e.message}"
-          end
-        end
+      MMS::Client.instance.get('/groups/' + @group.id + '/clusters/' + @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
       job_list
     end
 
     def _load(id)
-      MMS::Client.instance.get('/groups/' + @group.id + '/clusters/' + id.to_s)
+      MMS::Client.instance.get '/groups/' + @group.id + '/clusters/' + id.to_s
     end
 
     def _from_hash(data)

data/lib/mms/resource/group.rb

@@ -12,30 +12,20 @@ module MMS
       super id, data
     end
 
-    def self.get_clusters
+    def clusters(page = 1, limit = 1000)
       cluster_list = []
-      load_list.each do |group|
-        MMS::Client.instance.get('/groups/' + group.id + '/clusters').each do |cluster|
-          cluster_list.push MMS::Resource::Cluster.new(cluster['id'], cluster['groupId'], cluster)
-        end
+      MMS::Client.instance.get('/groups/' + @id + '/clusters?pageNum=' + page.to_s + '&itemsPerPage=' + limit.to_s).each do |cluster|
+        cluster_list.push MMS::Resource::Cluster.new(cluster['id'], cluster['groupId'], cluster)
       end
       cluster_list
     end
 
-    def get_cluster(id)
-      MMS::Resource::Cluster.new(id, self.id)
-    end
-
-    def self.load_list
-      group_list = []
-      MMS::Client.instance.get('/groups').each do |group|
-        group_list.push MMS::Resource::Group.new(group['id'], group)
-      end
-      group_list
+    def cluster(id)
+      MMS::Resource::Cluster.new id, self.id
     end
 
     def _load(id)
-      MMS::Client.instance.get('/groups/' + id.to_s)
+      MMS::Client.instance.get '/groups/' + id.to_s
     end
 
     def _from_hash(data)

data/lib/mms/resource/restore_job.rb

@@ -20,7 +20,7 @@ module MMS
     end
 
     def _load(id)
-      MMS::Client.instance.get('/groups/' + @cluster.group.id + '/clusters/' + @cluster.id + '/restoreJobs/' + id.to_s)
+      MMS::Client.instance.get '/groups/' + @cluster.group.id + '/clusters/' + @cluster.id + '/restoreJobs/' + id.to_s
     end
 
     def _from_hash(data)
@@ -31,6 +31,7 @@ module MMS
       @delivery_method_name = data['delivery']['methodName']
       @delivery_status_name = data['delivery']['statusName']
       @delivery_url = data['delivery']['url']
+      @name = @created
     end
   end
 end

data/lib/mms/resource/snapshot.rb

@@ -18,7 +18,32 @@ module MMS
     end
 
     def _load(id)
-      MMS::Client.instance.get('/groups/' + @cluster.group.id + '/clusters/' + @cluster.id + '/snapshots/' + id.to_s)
+      MMS::Client.instance.get '/groups/' + @cluster.group.id + '/clusters/' + @cluster.id + '/snapshots/' + id.to_s
+    end
+
+    def create_restorejob
+      data = {:snapshotId => @id}
+      jobs = MMS::Client.instance.post '/groups/' + @cluster.group.id + '/clusters/' + @cluster.id + '/restoreJobs', data
+
+      if jobs.nil?
+        raise "Cannot create job from snapshot `#{self.id}`"
+      end
+
+      job_list = []
+      # work around due to bug in MMS API; cannot read restoreJob using provided info.
+      restore_jobs = @cluster.restorejobs
+
+      jobs.each do |job|
+        _list = restore_jobs.select {|restorejob| restorejob.id == job['id'] }
+        _list.each do |restorejob|
+          begin
+            job_list.push MMS::Resource::RestoreJob.new(restorejob.id, restorejob.cluster.id, restorejob.cluster.group.id)
+          rescue => e
+            puts "load error #{e.message}"
+          end
+        end
+      end
+      job_list
     end
 
     def _from_hash(data)
@@ -27,6 +52,7 @@ module MMS
       @created_increment = data['created']['increment']
       @expires = data['expires']
       @parts = data['parts']
+      @name = @created_date
     end
   end
 end

data/lib/mms/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mms-api
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Cargo Media
@@ -19,7 +19,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -33,7 +33,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: