megam_api 1.6.7 → 1.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 776f06fd527678942056d9b9fefee5d3876d28c0
-  data.tar.gz: 4a56fb364e4d4748f7032da252a405909e03eb12
+  metadata.gz: acf9806f47fab932ce69e0db128474d8c9f0f182
+  data.tar.gz: dbfc46c378ac00c0170b56e11e7aef94e079a422
 SHA512:
-  metadata.gz: c347483a08676ee3b306742abcfa1e70759575e4359ce45d2c6ee972f3ede97e368ba2d7007c4e9de0b49f3350fdbdc949936e77a41f1d69d558d78c120eb217
-  data.tar.gz: d2ffdd3759f0c2b6e15cf44c8dfc5d1ac133c3b96f586b7e028148a133b56e0511229fd5371688d4fe26a4550ae27a4b11630b733221f0c42dbedbba4ba72e6d
+  metadata.gz: 955ae148705c0df26622687a41681c7874eed2cb4a10b0c4e8e471c136f513513e9a04a635dee6ee1d7a21a75769f44f06bd05bf7ba125759a476f936161ab70
+  data.tar.gz: 03965dbfff7f7d7dd4fdb3e3f680f92b5a14b1fe4a0eb983fbda81bc014ff2908072740073d73badadde7150c7374d52fcdd5c0e882c35527289a734053248b3

data/lib/megam/api.rb

@@ -28,6 +28,7 @@ require 'megam/api/eventscontainer'
 require 'megam/api/eventsbilling'
 require 'megam/api/eventsstorage'
 require 'megam/api/snapshots'
+require 'megam/api/disks'
 require 'megam/api/subscriptions'
 require 'megam/api/addons'
 require 'megam/api/version'
@@ -76,6 +77,8 @@ require 'megam/core/sensors'
 require 'megam/core/sensors_collection'
 require 'megam/core/snapshots'
 require 'megam/core/snapshots_collection'
+require 'megam/core/disks'
+require 'megam/core/disks_collection'
 require 'megam/core/balances_collection'
 require 'megam/core/balances'
 require 'megam/core/billedhistories_collection'
@@ -256,11 +259,11 @@ module Megam
             current_date = Time.now.strftime('%Y-%m-%d %H:%M')
 
             data = "#{current_date}" + "\n" + "#{cmd_parms[:path]}" + "\n" + "#{body_base64}"
-           
+
             digest  = OpenSSL::Digest.new('sha1')
-           
+
             movingFactor = data
-            
+
             if !(@password_hash.nil?) && @api_key.nil?
                 hash = OpenSSL::HMAC.hexdigest(digest, Base64.strict_decode64(@password_hash), movingFactor)
             elsif !(@api_key.nil?)
@@ -273,4 +276,3 @@ module Megam
         end
     end
 end
-

data/lib/megam/api/disks.rb

@@ -0,0 +1,34 @@
+module Megam
+  class API
+    # GET /nodes
+    def list_disks
+      @options = {:path => "/disks",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
+    def get_disks(asm_id)
+      @options = {:path => "/disks/#{asm_id}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+    def post_disks(new_dsk)
+      @options = {:path => '/disks/content',
+        :body => Megam::JSONCompat.to_json(new_dsk)}.merge(@options)
+      request(
+        :expects  => 201,
+        :method   => :post,
+        :body     => @options[:body]
+      )
+    end
+
+  end
+end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "1.6.7"
+    VERSION = "1.6.8"
   end
 end

data/lib/megam/core/addons.rb

@@ -123,8 +123,8 @@ module Megam
             adn
         end
 
-        def self.from_hash(o,tmp_email=nil, tmp_api_key=nil, tmp_host=nil)
-            adn = self.new(tmp_email, tmp_api_key, tmp_host)
+        def self.from_hash(o)
+            adn = self.new(o)
             adn.from_hash(o)
             adn
         end

data/lib/megam/core/disks.rb

@@ -0,0 +1,194 @@
+module Megam
+    class Disks < Megam::RestAdapter
+        def initialize(o)
+            @id = nil
+            @account_id = nil
+            @asm_id = nil
+            @org_id = nil
+            @disk_id= nil
+            @size= nil
+            @status= nil
+            @created_at = nil
+            @some_msg = {}
+            super(o)
+        end
+
+        def disks
+            self
+        end
+        def id(arg=nil)
+            if arg != nil
+                @id = arg
+            else
+                @id
+            end
+        end
+
+        def account_id(arg=nil)
+            if arg != nil
+                @account_id = arg
+            else
+                @account_id
+            end
+        end
+
+        def asm_id(arg=nil)
+            if arg != nil
+                @asm_id = arg
+            else
+                @asm_id
+            end
+        end
+
+        def org_id(arg=nil)
+            if arg != nil
+                @org_id = arg
+            else
+                @org_id
+            end
+        end
+
+        def disk_id(arg=nil)
+            if arg != nil
+                @disk_id = arg
+            else
+                @disk_id
+            end
+        end
+
+        def status(arg=nil)
+            if arg != nil
+                @status = arg
+            else
+                @status
+            end
+        end
+
+        def size(arg=nil)
+            if arg != nil
+                @size = arg
+            else
+                @size
+            end
+        end
+
+        def created_at(arg=nil)
+            if arg != nil
+                @created_at = arg
+            else
+                @created_at
+            end
+        end
+
+        def error?
+            crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
+        end
+
+
+        def some_msg(arg=nil)
+            if arg != nil
+                @some_msg = arg
+            else
+                @some_msg
+            end
+        end
+
+
+        # Transform the ruby obj ->  to a Hash
+        def to_hash
+            index_hash = Hash.new
+            index_hash["json_claz"] = self.class.name
+            index_hash["id"] = id
+            index_hash["account_id"] = account_id
+            index_hash["asm_id"] = asm_id
+            index_hash["org_id"] = org_id
+            index_hash["disk_id"] = disk_id
+            index_hash["size"] = size
+            index_hash["status"] = status
+            index_hash["created_at"] = created_at
+            index_hash["some_msg"] = some_msg
+            index_hash
+        end
+
+        # Serialize this object as a hash: called from JsonCompat.
+        # Verify if this called from JsonCompat during testing.
+        def to_json(*a)
+            for_json.to_json(*a)
+        end
+
+        def for_json
+            result = {
+              "id" => id,
+                "account_id" => account_id,
+                "asm_id" => asm_id,
+                "org_id" => org_id,
+                "disk_id" => disk_id,
+                "size" => size,
+                "status" => status,
+                "created_at" => created_at
+            }
+            result
+        end
+
+        def self.json_create(o)
+            sps = new({})
+            sps.id(o["id"]) if o.has_key?("id")
+            sps.account_id(o["account_id"]) if o.has_key?("account_id")
+            sps.asm_id(o["asm_id"]) if o.has_key?("asm_id")
+            sps.org_id(o["org_id"]) if o.has_key?("org_id") #this will be an array? can hash store array?
+            sps.disk_id(o["disk_id"]) if o.has_key?("disk_id")
+            sps.size(o["size"]) if o.has_key?("size")
+            sps.status(o["status"]) if o.has_key?("status")
+            sps.created_at(o["created_at"]) if o.has_key?("created_at")
+            sps.some_msg[:code] = o["code"] if o.has_key?("code")
+            sps.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+            sps.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+            sps.some_msg[:links] = o["links"] if o.has_key?("links")
+            sps
+        end
+
+        def self.from_hash(o)
+            dks = self.new(o)
+            dks.from_hash(o)
+            dks
+        end
+
+        def from_hash(o)
+            @id       = o[:id] if o.has_key?(:id)
+            @account_id       = o[:account_id] if o.has_key?(:account_id)
+            @asm_id        = o[:asm_id] if o.has_key?(:asm_id)
+            @org_id        = o[:org_id] if o.has_key?(:org_id)
+            @disk_id       = o[:disk_id] if o.has_key?(:disk_id)
+            @size            = o[:size] if o.has_key?(:size)
+            @status          = o[:status] if o.has_key?(:status)
+            @created_at      = o[:created_at] if o.has_key?(:created_at)
+            self
+        end
+
+        def self.create(params)
+            dks = from_hash(params)
+            dks.create
+        end
+
+        # Create the node via the REST API
+        def create
+            megam_rest.post_disks(to_hash)
+        end
+
+        # Load a account by email_p
+        def self.show(o)
+            dks = self.new(o)
+            dks.megam_rest.get_disks(o[:id])
+        end
+
+        def self.list(params)
+            dks = self.new(params)
+            dks.megam_rest.list_disks
+        end
+
+        def to_s
+            Megam::Stuff.styled_hash(to_hash)
+        end
+
+    end
+end

data/lib/megam/core/disks_collection.rb

@@ -0,0 +1,122 @@
+module Megam
+  class DisksCollection
+    include Enumerable
+
+    attr_reader :iterator
+    def initialize
+      @disks = Array.new
+      @disks_by_name = Hash.new
+      @insert_after_idx = nil
+    end
+
+    def all_disks
+      @disks
+    end
+
+    def [](index)
+      @disks[index]
+    end
+
+    def []=(index, arg)
+      is_megam_disks(arg)
+      @disks[index] = arg
+      @disks_by_name[arg.account_id] = index
+    end
+
+    def <<(*args)
+      args.flatten.each do |a|
+        is_megam_events(a)
+        @disks << a
+        @disks_by_name[a.account_id] = @disks.length - 1
+      end
+      self
+    end
+
+    # 'push' is an alias method to <<
+    alias_method :push, :<<
+
+    def insert(disks)
+      is_megam_disks(disks)
+      if @insert_after_idx
+        # in the middle of executing a run, so any nodes inserted now should
+        # be placed after the most recent addition done by the currently executing
+        # node
+        @disks.insert(@insert_after_idx + 1, disks)
+        # update name -> location mappings and register new node
+        @disks_by_name.each_key do |key|
+        @disks_by_name[key] += 1 if @disks_by_name[key] > @insert_after_idx
+        end
+        @disks_by_name[disks.account_id] = @insert_after_idx + 1
+        @insert_after_idx += 1
+      else
+      @disks << disks
+      @disks_by_name[disks.account_id] = @disks.length - 1
+      end
+    end
+
+    def each
+      @disks.each do |disks|
+        yield disks
+      end
+    end
+
+    def each_index
+      @disks.each_index do |i|
+        yield i
+      end
+    end
+
+    def empty?
+      @disks.empty?
+    end
+
+    def lookup(disks)
+      lookup_by = nil
+      if events.kind_of?(Megam::Disks)
+      lookup_by = disks.account_id
+    elsif disks.kind_of?(String)
+      lookup_by = disks
+      else
+        raise ArgumentError, "Must pass a Megam::Disks or String to lookup"
+      end
+      res = @disks_by_name[lookup_by]
+      unless res
+        raise ArgumentError, "Cannot find a node matching #{lookup_by} (did you define it first?)"
+      end
+      @disks[res]
+    end
+
+    def to_s
+        @disks.join(", ")
+    end
+
+    def for_json
+        to_a.map { |item| item.to_s }
+    end
+
+    def to_json(*a)
+        Megam::JSONCompat.to_json(for_json, *a)
+    end
+
+    def self.json_create(o)
+      collection = self.new()
+      o["results"].each do |disks_list|
+        disks_array = disks_list.kind_of?(Array) ? disks_list : [ disks_list ]
+        disks_array.each do |disks|
+          collection.insert(disks)
+
+        end
+      end
+      collection
+    end
+
+    private
+
+    def is_megam_disks(arg)
+      unless arg.kind_of?(Megam::Disks)
+        raise ArgumentError, "Members must be Megam::Disks's"
+      end
+      true
+    end
+  end
+end

data/lib/megam/core/json_compat.rb

@@ -38,6 +38,8 @@ module Megam
         MEGAM_SENSORSCOLLECTION               = 'Megam::SensorsCollection'.freeze
         MEGAM_SNAPSHOTS                       = 'Megam::Snapshots'.freeze
         MEGAM_SNAPSHOTSCOLLECTION             = 'Megam::SnapshotsCollection'.freeze
+        MEGAM_DISKS                           = 'Megam::Disks'.freeze
+        MEGAM_DISKSCOLLECTION                 = 'Megam::DisksCollection'.freeze
         MEGAM_SSHKEY                          = 'Megam::SshKey'.freeze
         MEGAM_SSHKEYCOLLECTION                = 'Megam::SshKeyCollection'.freeze
         MEGAM_EVENTSVM                        = 'Megam::EventsVm'.freeze
@@ -211,6 +213,10 @@ module Megam
                     Megam::Subscriptions
                 when MEGAM_SUBSCRIPTIONSCOLLECTION
                     Megam::SubscriptionsCollection
+                when MEGAM_DISKS
+                    Megam::Disks
+                when MEGAM_DISKSCOLLECTION
+                    Megam::DisksCollection
                 when MEGAM_ADDONS
                     Megam::Addons
                 when MEGAM_ADDONSCOLLECTION

data/lib/megam/core/snapshots.rb

@@ -6,6 +6,7 @@ module Megam
             @asm_id = nil
             @org_id = nil
             @name= nil
+            @status=nil
             @created_at = nil
             @some_msg = {}
             super(o)
@@ -54,6 +55,14 @@ module Megam
             end
         end
 
+        def status(arg=nil)
+            if arg != nil
+                @status = arg
+            else
+                @status
+            end
+        end
+
         def created_at(arg=nil)
             if arg != nil
                 @created_at = arg
@@ -85,6 +94,7 @@ module Megam
             index_hash["asm_id"] = asm_id
             index_hash["org_id"] = org_id
             index_hash["name"] = name
+            index_hash["status"] = status
             index_hash["created_at"] = created_at
             index_hash["some_msg"] = some_msg
             index_hash
@@ -103,6 +113,7 @@ module Megam
                 "asm_id" => asm_id,
                 "org_id" => org_id,
                 "name" => name,
+                "status" => status,
                 "created_at" => created_at
             }
             result
@@ -115,6 +126,7 @@ module Megam
             sps.asm_id(o["asm_id"]) if o.has_key?("asm_id")
             sps.org_id(o["org_id"]) if o.has_key?("org_id") #this will be an array? can hash store array?
             sps.name(o["name"]) if o.has_key?("name")
+            sps.name(o["status"]) if o.has_key?("status")
             sps.created_at(o["created_at"]) if o.has_key?("created_at")
             sps.some_msg[:code] = o["code"] if o.has_key?("code")
             sps.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
@@ -135,6 +147,7 @@ module Megam
             @asm_id        = o[:asm_id] if o.has_key?(:asm_id)
             @org_id        = o[:org_id] if o.has_key?(:org_id)
             @name            = o[:name] if o.has_key?(:name)
+            @status            = o[:status] if o.has_key?(:status)
             @created_at        = o[:created_at] if o.has_key?(:created_at)
             self
         end

data/test/test_disks.rb

@@ -0,0 +1,25 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class TestApps < MiniTest::Unit::TestCase
+    def test_post_disks
+        tmp_hash = {
+            :account_id => "",
+            :asm_id => "ASM53557642376448625",
+            :org_id => "ORG7879663326321337888",
+            :size => "2GB",
+            :status => "progress",
+
+        }
+
+        response = megams.post_disks(tmp_hash)
+        assert_equal(201, response.status)
+    end
+    def test_get_disks
+        response = megams.get_disks("ASM53557642376448625")
+        assert_equal(200, response.status)
+    end
+    def test_list_disks
+        response = megams.list_disks
+        assert_equal(200, response.status)
+    end
+end

data/test/test_helper.rb

@@ -7,8 +7,8 @@ require 'time'
 
 SANDBOX_HOST_OPTIONS = {
     :scheme => 'http',
-    #:host => 'localhost',
-    :host => 'cloud.det.io',
+    :host => 'localhost',
+    #:host => 'cloud.det.io',
     :nonblock => false,
     :port => 9000
 }
@@ -30,8 +30,8 @@ end
 
 def megams(options={})
     s_options = SANDBOX_HOST_OPTIONS.merge({
-        :email => "test@megam.io",
-        :api_key => "IamAtlas{74}NobdyCanSedfefdeME#07",
+        :email => "rajeshr@megam.io",
+        :api_key => "a0cf83e360845f2639db63e515c94ad35a94cd50",
         :org_id => "ORG123",
         #:password => "bWVnYW0="
     })

data/test/test_snapshots.rb

@@ -8,19 +8,21 @@ class TestApps < MiniTest::Unit::TestCase
             :asm_id => "ASM5355764237644862300",
             :org_id => "ORG7879663326321337888",
             :name => "pop.megambox.com",
+            :status => "progress",
 
         }
 
         response = megams.post_snapshots(tmp_hash)
         assert_equal(201, response.status)
     end
-
+#=begin
     def test_get_snapshots
-        response = megams.get_snapshots("ASM5355764237644862351")
+        response = megams.get_snapshots("ASM5355764237644862300")
         assert_equal(200, response.status)
     end
     def test_list_snapshots
         response = megams.list_snapshots
         assert_equal(200, response.status)
     end
+#=end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 1.6.7
+  version: 1.6.8
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Rajesh Rajagopalan, Thomas Alrin,
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -143,6 +143,7 @@ files:
 - lib/megam/api/billedhistories.rb
 - lib/megam/api/billingtransactions.rb
 - lib/megam/api/components.rb
+- lib/megam/api/disks.rb
 - lib/megam/api/domains.rb
 - lib/megam/api/errors.rb
 - lib/megam/api/eventsbilling.rb
@@ -173,6 +174,8 @@ files:
 - lib/megam/core/billingtransactions_collection.rb
 - lib/megam/core/components.rb
 - lib/megam/core/components_collection.rb
+- lib/megam/core/disks.rb
+- lib/megam/core/disks_collection.rb
 - lib/megam/core/domain_collection.rb
 - lib/megam/core/domains.rb
 - lib/megam/core/error.rb
@@ -227,6 +230,7 @@ files:
 - test/test_billedhistories.rb
 - test/test_billingtranscations.rb
 - test/test_components.rb
+- test/test_disks.rb
 - test/test_domains.rb
 - test/test_eventsbilling.rb
 - test/test_eventscontainer.rb
@@ -265,29 +269,4 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam
-test_files:
-- test/mixins/test_assemblies.rb
-- test/mixins/test_assembly.rb
-- test/mixins/test_component.rb
-- test/test_accounts.rb
-- test/test_addons.rb
-- test/test_assemblies.rb
-- test/test_assembly.rb
-- test/test_balances.rb
-- test/test_billedhistories.rb
-- test/test_billingtranscations.rb
-- test/test_components.rb
-- test/test_domains.rb
-- test/test_eventsbilling.rb
-- test/test_eventscontainer.rb
-- test/test_eventsstorage.rb
-- test/test_eventsvm.rb
-- test/test_helper.rb
-- test/test_marketplaces.rb
-- test/test_organizations.rb
-- test/test_promos.rb
-- test/test_requests.rb
-- test/test_sensors.rb
-- test/test_snapshots.rb
-- test/test_sshkeys.rb
-- test/test_subscriptions.rb
+test_files: []