megam_api 1.8.2 → 1.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fe322a12b43de3a7f578b59e1f3cc468945006a
-  data.tar.gz: 075ccc88dab62d0122caa2b0a2fef03f0ac96e85
+  metadata.gz: e946570e46430d98c50ce13295049342e172b7fb
+  data.tar.gz: 6058140fe707dc542bfcfa63fe23d677799fc296
 SHA512:
-  metadata.gz: a4f91f4b249a4be36fe3d585eecceb0b716786548453cc8487a151c2b71027399cd8fce52e22cfc74c9aac66b674f6a27fd6bf3c7cde669e2c7fc688cd3aa304
-  data.tar.gz: 2bac046921d8cc0efece334d4596a6c55293f57e41af1cc67efe8e1a995918236b2097cf1de8bd15e21f7a7d0b8e71f99436299010c7c17aa51d378f043fddcc
+  metadata.gz: d3caabbdc2a2279965c43f4ca0489eefdb5cd661b58aa7418407250e1d00f3f06f35f32f93a646ea3cafdd7e10f20063232e897d6d7199a6c37f0cb7d09f8697
+  data.tar.gz: bb4a08331a0a5dae94a9bf38f6e5f9b8bb5816360528808b6d380bf0fd132c89b58e1ea95f6f2c173c18b611f6f327ef9fbba332629dee42b95146c413954c4b

data/lib/megam/api.rb

@@ -49,10 +49,9 @@ require 'megam/core/log'
 require 'megam/core/json_compat'
 require 'megam/core/error'
 require 'megam/core/account'
+require 'megam/core/account_collection'
 require 'megam/core/request'
 require 'megam/core/request_collection'
-require 'megam/core/license'
-require 'megam/core/license_collection'
 require 'megam/core/sshkey'
 require 'megam/core/sshkey_collection'
 require 'megam/core/eventsall'

data/lib/megam/api/accounts.rb

@@ -1,7 +1,6 @@
 module Megam
   class API
     # GET /accounts
-    #Yet to be tested
     def get_accounts(email)
       @options = {:path => "/accounts/#{email}",
         :body => ''}.merge(@options)
@@ -24,7 +23,7 @@ module Megam
         :body     => @options[:body]
         )
     end
-    
+
     # The body content needs to be a json.
     def post_accounts(new_account)
       @options = {path: '/accounts/content',
@@ -70,5 +69,17 @@ module Megam
       )
     end
 
+    # ADMIN: LIST /accounts
+    def list_accounts
+      @options = {:path => "/accounts",
+        :body => ''}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+
   end
-end
+end

data/lib/megam/api/version.rb

@@ -1,7 +1,7 @@
 module Megam
   class API
 
-    VERSION = "1.8.2"
+    VERSION = "1.8.4"
 
   end
 end

data/lib/megam/core/account.rb

@@ -28,7 +28,7 @@ module Megam
             @suspend = {}
             @dates = {}
             @some_msg = {}
-            
+
             super({ email: o[:email], api_key: o[:api_key],
                     host: o[:host], password_hash: o[:password_hash], org_id: o[:org_id] })
         end
@@ -154,7 +154,8 @@ module Megam
         def login
             megam_rest.login(to_hash)
         end
-        
+
+
         def self.create(o)
             acct = from_hash(o)
             acct.create
@@ -169,6 +170,15 @@ module Megam
             acct.megam_rest.get_accounts(o[:email])
         end
 
+        def self.list(o)
+            acct = from_hash(o)
+            acct.list
+        end
+
+        def list
+            megam_rest.list_accounts
+        end
+
         def self.update(o)
             acct = from_hash(o)
             acct.update

data/lib/megam/core/account_collection.rb

@@ -0,0 +1,122 @@
+module Megam
+    class AccountCollection
+        include Enumerable
+
+        attr_reader :iterator
+        def initialize
+            @accounts = Array.new
+            @accounts_by_name = Hash.new
+            @insert_after_idx = nil
+        end
+
+        def all_accounts
+            @accounts
+        end
+
+        def [](index)
+            @accounts[index]
+        end
+
+        def []=(index, arg)
+            is_account_hash(arg)
+            @accounts[index] = arg
+            @accounts_by_name[arg[:email]] = index
+        end
+
+        def <<(*args)
+            args.flatten.each do |a|
+                is_account_hash(a)
+                @accounts << a
+                @accounts_by_name[a[:email]] = @accounts.length - 1
+            end
+            self
+        end
+
+        # 'push' is an alias method to <<
+        alias_method :push, :<<
+
+        def insert(accounts)
+            is_account_hash(accounts)
+            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
+                @accounts.insert(@insert_after_idx + 1, accounts)
+                # update name -> location mappings and register new node
+                @accounts_by_name.each_key do |key|
+                    @accounts_by_name[key] += 1 if @accounts_by_name[key] > @insert_after_idx
+                end
+                @accounts_by_name[accounts[:email]] = @insert_after_idx + 1
+                @insert_after_idx += 1
+            else
+                @accounts << accounts
+                @accounts_by_name[accounts[:email]] = @accounts.length - 1
+            end
+        end
+
+        def each
+            @accounts.each do |accounts|
+                yield accounts
+            end
+        end
+
+        def each_index
+            @accounts.each_index do |i|
+                yield i
+            end
+        end
+
+        def empty?
+            @accounts.empty?
+        end
+
+        def lookup(accounts)
+            lookup_by = nil
+            if accounts.kind_of?(Hash)
+                lookup_by = accounts[:email]
+            elsif accounts.kind_of?(String)
+                lookup_by = accounts
+            else
+                raise ArgumentError, "Must pass a Megam::Account or String to lookup"
+            end
+            res = @accounts_by_name[lookup_by]
+            unless res
+                raise ArgumentError, "Cannot find a node matching #{lookup_by} (did you define it first?)"
+            end
+            @accounts[res]
+        end
+
+        def to_s
+            @accounts.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 |accounts_list|
+                accounts_array = accounts_list.kind_of?(Array) ? accounts_list : [ accounts_list ]
+                accounts_array.each do |accounts|
+                    collection.insert(accounts)
+
+                end
+            end
+            collection
+        end
+
+        private
+
+        def is_account_hash(arg)
+            unless arg.kind_of?(Hash)
+                raise ArgumentError, "Members must be a Hash"
+            end
+            true
+        end
+    end
+end

data/lib/megam/core/json_compat.rb

@@ -12,6 +12,7 @@ module Megam
         JSON_CLAZ = 'json_claz'.freeze
 
         MEGAM_ACCOUNT                         = 'Megam::Account'.freeze
+        MEGAM_ACCOUNTCOLLECTION               = 'Megam::AccountCollection'.freeze
         MEGAM_ASSEMBLIES                      = 'Megam::Assemblies'.freeze
         MEGAM_ASSEMBLIESCOLLECTION            = 'Megam::AssembliesCollection'.freeze
         MEGAM_ASSEMBLY                        = 'Megam::Assembly'.freeze
@@ -39,8 +40,6 @@ module Megam
         MEGAM_SNAPSHOTSCOLLECTION             = 'Megam::SnapshotsCollection'.freeze
         MEGAM_DISKS                           = 'Megam::Disks'.freeze
         MEGAM_DISKSCOLLECTION                 = 'Megam::DisksCollection'.freeze
-        MEGAM_LICENSE                         = 'Megam::License'.freeze
-        MEGAM_LICENSECOLLECTION               = 'Megam::LicenseCollection'.freeze
         MEGAM_SSHKEY                          = 'Megam::SshKey'.freeze
         MEGAM_SSHKEYCOLLECTION                = 'Megam::SshKeyCollection'.freeze
         MEGAM_EVENTSALL                       = 'Megam::EventsAll'.freeze
@@ -65,7 +64,7 @@ module Megam
                 begin
                     FFI_Yajl::Parser.parse(source, opts)
                 rescue FFI_Yajl::ParseError => e
-                    raise JSON::ParseError, e.message
+                    raise StandardError, e.message
                 end
             end
 
@@ -144,6 +143,8 @@ module Megam
                     Megam::Error
                 when MEGAM_ACCOUNT
                     Megam::Account
+                when MEGAM_ACCOUNTCOLLECTION
+                    Megam::AccountCollection
                 when MEGAM_ASSEMBLIES
                     Megam::Assemblies
                 when MEGAM_ASSEMBLIESCOLLECTION
@@ -168,8 +169,6 @@ module Megam
                     Megam::EventsVm
                 when MEGAM_EVENTSVMCOLLECTION
                     Megam::EventsVmCollection
-                when MEGAM_LICENSECOLLECTION
-                    Megam::LicenseCollection
                 when MEGAM_EVENTSALL
                     Megam::EventsAll
                 when MEGAM_EVENTSALLCOLLECTION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.4
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Vinodhini V, Rathish VBR, Rajesh
@@ -153,7 +153,6 @@ files:
 - lib/megam/api/eventscontainer.rb
 - lib/megam/api/eventsstorage.rb
 - lib/megam/api/eventsvm.rb
-- lib/megam/api/license.rb
 - lib/megam/api/marketplaces.rb
 - lib/megam/api/organizations.rb
 - lib/megam/api/promos.rb
@@ -164,6 +163,7 @@ files:
 - lib/megam/api/subscriptions.rb
 - lib/megam/api/version.rb
 - lib/megam/core/account.rb
+- lib/megam/core/account_collection.rb
 - lib/megam/core/addons.rb
 - lib/megam/core/addons_collection.rb
 - lib/megam/core/assemblies.rb
@@ -195,8 +195,6 @@ files:
 - lib/megam/core/eventsvm_collection.rb
 - lib/megam/core/json_compat.rb
 - lib/megam/core/konipai.rb
-- lib/megam/core/license-collection.rb
-- lib/megam/core/license.rb
 - lib/megam/core/log.rb
 - lib/megam/core/marketplace.rb
 - lib/megam/core/marketplace_collection.rb
@@ -277,4 +275,30 @@ rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam Vertice
-test_files: []
+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_disks.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

data/lib/megam/api/license.rb

@@ -1,35 +0,0 @@
-module Megam
-  class API
-    def get_licenses
-      @options = {:path => '/license',:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def get_license(license_name)
-      @options = {:path => "/license/#{license_name}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-    def post_license(new_license)
-      @options = {:path => '/license/content',
-        :body => Megam::JSONCompat.to_json(new_license)}.merge(@options)
-
-      request(
-        :expects  => 201,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-  end
-end

data/lib/megam/core/license-collection.rb

@@ -1,122 +0,0 @@
-module Megam
-    class LicenseCollection
-        include Enumerable
-
-        attr_reader :iterator
-
-        def initialize
-            @license = Array.new
-            @license_by_name = Hash.new
-            @insert_after_idx = nil
-        end
-
-        def all_license
-            @license
-        end
-
-        def [](index)
-            @license[index]
-        end
-
-        def []=(index, arg)
-            is_megam_license(arg)
-            @license[index] = arg
-            @license_by_name[arg.name] = index
-        end
-
-        def <<(*args)
-            args.flatten.each do |a|
-                is_megam_license(a)
-                @license << a
-                @license_by_name[a.name] =@license.length - 1
-            end
-            self
-        end
-
-        # 'push' is an alias method to <<
-        alias_method :push, :<<
-
-        def insert(license)
-            is_megam_license(license)
-            if @insert_after_idx
-                # in the middle of executing a run, so any license inserted now should
-                # be placed after the most recent addition done by the currently executing
-                # license
-                @license.insert(@insert_after_idx + 1, license)
-                # update name -> location mappings and register new license
-                @license_by_name.each_key do |key|
-                    @license_by_name[key] += 1 if@license_by_name[key] > @insert_after_idx
-                end
-                @license_by_name[license.name] = @insert_after_idx + 1
-                @insert_after_idx += 1
-            else
-                @license << license
-                @license_by_name[license.name] =@license.length - 1
-            end
-        end
-
-        def each
-            @license.each do |license|
-                yield license
-            end
-        end
-
-        def each_index
-            @license.each_index do |i|
-                yield i
-            end
-        end
-
-        def empty?
-            @license.empty?
-        end
-
-        def lookup(license)
-            lookup_by = nil
-            if license.kind_of?(Megam::License)
-                lookup_by = license.name
-            elsif license.kind_of?(String)
-                lookup_by = license
-            else
-                raise ArgumentError, "Must pass a Megam::license or String to lookup"
-            end
-            res =@license_by_name[lookup_by]
-            unless res
-                raise ArgumentError, "Cannot find a license matching #{lookup_by} (did you define it first?)"
-            end
-            @license[res]
-        end
-
-        def to_s
-            @license.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 |license_list|
-                license_array = license_list.kind_of?(Array) ? license_list : [ license_list ]
-                license_array.each do |license|
-                    collection.insert(license)
-                end
-            end
-            collection
-        end
-
-        private
-
-        def is_megam_license(arg)
-            unless arg.kind_of?(Megam::License)
-                raise ArgumentError, "Members must be Megam::License's"
-            end
-            true
-        end
-    end
-end

data/lib/megam/core/license.rb

@@ -1,173 +0,0 @@
-module Megam
-    class License < Megam::RestAdapter
-        def initialize(o)
-            @id = nil
-            @name = nil
-            @org_id = nil
-            @privatekey=nil
-            @publickey=nil
-            @created_at = nil
-            @some_msg = {}
-            super(o)
-        end
-
-        def license
-            self
-        end
-
-        def id(arg=nil)
-            if arg != nil
-                @id = arg
-            else
-                @id
-            end
-        end
-
-        def name(arg=nil)
-            if arg != nil
-                @name = arg
-            else
-                @name
-            end
-        end
-
-        def org_id(arg=nil)
-            if arg != nil
-                @org_id= arg
-            else
-                @org_id
-            end
-        end
-
-        def privatekey(arg=nil)
-            if arg != nil
-                @privatekey = arg
-            else
-                @privatekey
-            end
-        end
-
-        def publickey(arg=nil)
-            if arg != nil
-                @publickey = arg
-            else
-                @publickey
-            end
-        end
-
-
-        def created_at(arg=nil)
-            if arg != nil
-                @created_at = arg
-            else
-                @created_at
-            end
-        end
-
-        def some_msg(arg=nil)
-            if arg != nil
-                @some_msg = arg
-            else
-                @some_msg
-            end
-        end
-
-        def error?
-            crocked  = true if (some_msg.has_key?(:msg_type) && some_msg[:msg_type] == "error")
-        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["name"] = name
-            index_hash["org_id"] = org_id
-            index_hash["privatekey"] = privatekey
-            index_hash["publickey"] = publickey
-            index_hash["created_at"] = created_at
-            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,
-                "name" => name,
-                "org_id" => org_id,
-                "privatekey" => privatekey,
-                "publickey" => publickey,
-                "created_at" => created_at
-            }
-            result
-        end
-
-        #
-        def self.json_create(o)
-            license = new({})
-            license.id(o["id"]) if o.has_key?("id")
-            license.name(o["name"]) if o.has_key?("name")
-            license.privatekey(o["privatekey"]) if o.has_key?("privatekey")
-            license.publickey(o["publickey"]) if o.has_key?("publickey")
-            license.created_at(o["created_at"]) if o.has_key?("created_at")
-            #success or error
-            license.some_msg[:code] = o["code"] if o.has_key?("code")
-            license.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-            license.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-            license.some_msg[:links] = o["links"] if o.has_key?("links")
-            license
-        end
-
-        def self.from_hash(o)
-            license = self.new(o)
-            license.from_hash(o)
-            license
-        end
-
-        def from_hash(o)
-            @id        = o[:id] if o.has_key?(:id)
-            @name = o[:name] if o.has_key?(:name)
-            @org_id = o[:org_id] if o.has_key?(:org_id)
-            @privatekey = o[:privatekey] if o.has_key?(:privatekey)
-            @publickey = o[:publickey] if o.has_key?(:publickey)
-            @created_at   = o[:created_at] if o.has_key?(:created_at)
-            self
-        end
-
-        def self.create(params)
-            acct = from_hash(params)
-            acct.create
-        end
-
-        # Create the predef via the REST API
-        def create
-            megam_rest.post_license(to_hash)
-        end
-
-        # Load all license -
-        # returns a LicensesCollection
-        # don't return self. check if the Megam::LicenseCollection is returned.
-        def self.list(params)
-            license = self.new(params)
-            license.megam_rest.get_license
-        end
-
-        # Show a particular License by name,
-        # Megam::License
-        def self.show(params)
-            pre = self.new(params)
-            pre.megam_rest.get_license(params["name"])
-        end
-
-        def to_s
-            Megam::Stuff.styled_hash(to_hash)
-            #"---> Megam::Account:[error=#{error?}]\n"+
-        end
-
-    end
-end