megam_api 1.7.6 → 1.7.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3c52c4f78b283c1fbff1d8a4e93fb1b1d0f784
-  data.tar.gz: 28dd116ddff3c7a628b25178fa1653e4020478cd
+  metadata.gz: e688fbe4d9c65ce6d84c379b41be88be58c7465a
+  data.tar.gz: afca3ba773c8004115c796df39fdf440594225fc
 SHA512:
-  metadata.gz: 1d04b9f0debdbf8811036273166fd88c43194e4a6dddf66c17e62e5493e3ceb5913514288347b668f40acabb5b7c7248e61862158648ff8e998a27b3402c7d08
-  data.tar.gz: 67aca452c58052b19c09a74f1d1a2146b94b220f17574a6a2c93f91909c9e3b933c182069a8db9611ad02309c8fcce44b9331b688f6c5fc6a04d1cb1ba677a6b
+  metadata.gz: 2a56e9fdf4d5d752466c1824bc917e853e675180f3f1f9d61c4be5b831fcb903b7b34eb3c538f352783692cc0919deb22d7f3dfbd9f8ef4c70b455e9f9f2d4dd
+  data.tar.gz: 46ab486c5ff99f3c0705c995d7f2deed5077e94ad0e9592e039a6cbf746727fad28be2e0fbb1adc4fe1772f81ed8bff52137bbcd991b1bd71321c040e4a7da63

data/lib/megam/api.rb

@@ -23,7 +23,6 @@ require 'megam/api/promos'
 require 'megam/api/requests'
 require 'megam/api/sensors'
 require 'megam/api/sshkeys'
-require 'megam/api/eventsall'
 require 'megam/api/eventsvm'
 require 'megam/api/eventscontainer'
 require 'megam/api/eventsbilling'
@@ -53,9 +52,7 @@ require 'megam/core/request'
 require 'megam/core/request_collection'
 require 'megam/core/sshkey'
 require 'megam/core/sshkey_collection'
-require 'megam/core/eventsall'
 require 'megam/core/eventsvm'
-require 'megam/core/eventsall_collection'
 require 'megam/core/eventsvm_collection'
 require 'megam/core/eventscontainer'
 require 'megam/core/eventscontainer_collection'
@@ -99,6 +96,7 @@ module Megam
         attr_accessor :text
         attr_accessor :email, :api_key, :password_hash, :org_id
         attr_accessor :api_url, :api_version
+        attr_accessor :master_key
         attr_reader   :last_response
 
         API_VERSION2      = '/v2'.freeze
@@ -108,6 +106,7 @@ module Megam
         X_Megam_OTTAI     = 'X-Megam-OTTAI'.freeze
         X_Megam_ORG       = 'X-Megam-ORG'.freeze
         X_Megam_PUTTUSAVI = 'X-Megam-PUTTUSAVI'.freeze
+        X_Megam_MASTERKEY = 'X-Megam-MASTERKEY'.freeze
 
         HEADERS = {
             'Accept'          => 'application/json',
@@ -191,10 +190,11 @@ module Megam
         private
 
         def assign_credentials
-            @api_key       = @options.delete(:api_key) || ENV['MEGAM_API_KEY']
-            @email         = @options.delete(:email)
+            @api_key       = @options.delete(:api_key) || ENV['VERTICE_API_KEY']
+            @email         = @options.delete(:email)   || ENV['VERTICE_EMAIL']
             @password_hash = @options.delete(:password_hash)
             @org_id        = @options.delete(:org_id)
+            @master_key    = @options.delete(:master_key) || ENV['VERTICE_MASTER_KEY']
         end
 
         def ensure_host_is_flattened
@@ -216,7 +216,7 @@ module Megam
         end
 
         def ensure_authkeys
-            if !api_combo_missing? && !pw_combo_missing?
+            if !api_combo_missing? && !pw_combo_missing? && !masterkey_combo_missing?
                 fail Megam::API::Errors::AuthKeysMissing
             end
         end
@@ -225,15 +225,16 @@ module Megam
             (!@email.nil? && !@api_key.nil?)
         end
 
-
-
         def pw_combo_missing?
             (!@email.nil? && !@password_hash.nil?)
         end
 
+        def masterkey_combo_missing?
+            (!@email.nil? && !@master_key.nil?)
+        end
+
         def turn_off_ssl_verify
            Excon.defaults[:ssl_verify_peer] = false   unless @api_url.include?("https")
-
         end
 
         def just_color_debug(path)
@@ -258,6 +259,8 @@ module Megam
 
 
             build_header_puttusavi
+
+            build_header_masterkey
         end
 
         def encode_header
@@ -273,8 +276,8 @@ module Megam
                 hash = OpenSSL::HMAC.hexdigest(digest, Base64.strict_decode64(@password_hash), movingFactor)
             elsif api_combo_missing?
                 hash = OpenSSL::HMAC.hexdigest(digest, @api_key, movingFactor)
-            else
-                hash = OpenSSL::HMAC.hexdigest(digest, "", movingFactor)
+            elsif master_key_combo_missing?
+                hash = OpenSSL::HMAC.hexdigest(digest, @master_key, movingFactor)
             end
 
             { hmac: (@email + ':' + hash), date: current_date }
@@ -286,5 +289,11 @@ module Megam
           end
         end
 
+        def build_header_masterkey
+          if masterkey_combo_missing? && !is_passthru?
+               @options[:headers] = @options[:headers].merge(X_Megam_MASTERKEY => "true")
+          end
+        end
+
     end
 end

data/lib/megam/api/version.rb

@@ -1,5 +1,5 @@
 module Megam
   class API
-    VERSION = "1.7.6"
+    VERSION = "1.7.8"
   end
 end

data/lib/megam/core/json_compat.rb

@@ -6,7 +6,7 @@ require "json"
 
 module Megam
     class JSONCompat
-
+        
         JSON_MAX_NESTING = 1000
 
         JSON_CLAZ = 'json_claz'.freeze
@@ -41,8 +41,6 @@ module Megam
         MEGAM_DISKSCOLLECTION                 = 'Megam::DisksCollection'.freeze
         MEGAM_SSHKEY                          = 'Megam::SshKey'.freeze
         MEGAM_SSHKEYCOLLECTION                = 'Megam::SshKeyCollection'.freeze
-        MEGAM_EVENTSALL                       = 'Megam::EventsAll'.freeze
-        MEGAM_EVENTSALLCOLLECTION             = 'Megam::EventsAllCollection'.freeze
         MEGAM_EVENTSVM                        = 'Megam::EventsVm'.freeze
         MEGAM_EVENTSVMCOLLECTION              = 'Megam::EventsVmCollection'.freeze
         MEGAM_EVENTSCONTAINER                 = 'Megam::EventsContainer'.freeze
@@ -166,10 +164,6 @@ module Megam
                     Megam::EventsVm
                 when MEGAM_EVENTSVMCOLLECTION
                     Megam::EventsVmCollection
-                when MEGAM_EVENTSALL
-                    Megam::EventsAll
-                when MEGAM_EVENTSALLCOLLECTION
-                    Megam::EventsAllCollection
                 when MEGAM_EVENTSCONTAINER
                     Megam::EventsContainer
                 when MEGAM_EVENTSCONTAINERCOLLECTION

data/lib/megam/core/rest_adapter.rb

@@ -6,18 +6,20 @@ module Megam
         # the name :password is used as attr_accessor in accounts,
         # hence we use gpassword
         attr_reader :password_hash
+        attr_reader :master_key
         attr_reader :org_id
         attr_reader :headers
 
 
         ## clean up this module later.
         def initialize(o)
-            @email = o[:email]
-            @api_key = o[:api_key] || nil
-            @host = o[:host]
-            @password_hash = o[:password_hash] || nil
-            @org_id = o[:org_id]
-            @headers = o[:headers]
+            @email            = o[:email]
+            @api_key          = o[:api_key] || nil
+            @master_key       = o[:master_key] || nil
+            @host             = o[:host]
+            @password_hash    = o[:password_hash] || nil
+            @org_id           = o[:org_id]
+            @headers          = o[:headers]
         end
 
         # Build a megam api client
@@ -30,6 +32,7 @@ module Megam
               :api_key => api_key,
               :org_id => org_id,
               :password_hash => password_hash,
+              :master_key => master_key,
               :host => host
             }
             if headers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.8
 platform: ruby
 authors:
 - Rajthilak, Kishorekumar Neelamegam, Ranjitha R, Vinodhini V, Rathish VBR, Rajesh
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2016-09-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -148,7 +148,6 @@ files:
 - lib/megam/api/disks.rb
 - lib/megam/api/domains.rb
 - lib/megam/api/errors.rb
-- lib/megam/api/eventsall.rb
 - lib/megam/api/eventsbilling.rb
 - lib/megam/api/eventscontainer.rb
 - lib/megam/api/eventsstorage.rb
@@ -182,8 +181,6 @@ files:
 - lib/megam/core/domain_collection.rb
 - lib/megam/core/domains.rb
 - lib/megam/core/error.rb
-- lib/megam/core/eventsall.rb
-- lib/megam/core/eventsall_collection.rb
 - lib/megam/core/eventsbilling.rb
 - lib/megam/core/eventsbilling_collection.rb
 - lib/megam/core/eventscontainer.rb
@@ -274,4 +271,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/eventsall.rb

@@ -1,36 +0,0 @@
-module Megam
-  class API
-    # GET /nodes
-    def list_eventsall(limit)
-      @options = {:path => "/eventsvm/#{limit}",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-
-
-    def get_eventsall(limit, new_events)
-      @options = {:path => "/eventsall/show/#{limit}",
-        :body => Megam::JSONCompat.to_json(new_events)}.merge(@options)
-      request(
-        :expects  => 200,
-        :method   => :post,
-        :body     => @options[:body]
-      )
-    end
-
-
-    def index_eventsall
-      @options = {:path => "/eventsall",:body => ""}.merge(@options)
-
-      request(
-        :expects  => 200,
-        :method   => :get,
-        :body     => @options[:body]
-      )
-    end
-  end
-end

data/lib/megam/core/eventsall.rb

@@ -1,186 +0,0 @@
-module Megam
-    class EventsAll < Megam::RestAdapter
-        def initialize(o)
-            @account_id = nil
-            @assembly_id = nil
-            @event_type = nil
-            @data = []
-            @created_at = nil
-	          @id = nil
-            @limit = nil
-            @some_msg = {}
-            super(o)
-        end
-
-        def eventsall
-            self
-        end
-
-        def account_id(arg=nil)
-            if arg != nil
-                @account_id = arg
-            else
-                @account_id
-            end
-        end
-
-	def id(arg=nil)
-            if arg != nil
-                @id = arg
-            else
-                @id
-            end
-        end
-
-        def assembly_id(arg=nil)
-            if arg != nil
-                @assembly_id = arg
-            else
-                @assembly_id
-            end
-        end
-
-        def event_type(arg=nil)
-            if arg != nil
-                @event_type = arg
-            else
-                @event_type
-            end
-        end
-
-
-        def data(arg=[])
-            if arg != []
-                @data = arg
-            else
-                @data
-            end
-        end
-
-        def limit(arg=[])
-            if arg != []
-                @limit = arg
-            else
-                @limit
-            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["account_id"] = account_id
-            index_hash["assembly_id"] = assembly_id
-            index_hash["event_type"] = event_type
-            index_hash["data"] = data
-            index_hash["limit"] = limit
-            index_hash["created_at"] = created_at
-	          index_hash["id"] = id
-            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 = {
-                "account_id" => account_id,
-                "assembly_id" => assembly_id,
-                "event_type" => event_type,
-                "data" => data,
-                "limit"  => limit,
-                "created_at" => created_at,
-		            "id" => id
-            }
-            result
-        end
-
-        def self.json_create(o)
-            evt = new({})
-            evt.account_id(o["account_id"]) if o.has_key?("account_id")
-    	      evt.id(o["id"]) if o.has_key?("id")
-            evt.assembly_id(o["assembly_id"]) if o.has_key?("assembly_id")
-            evt.event_type(o["event_type"]) if o.has_key?("event_type") #this will be an array? can hash store array?
-            evt.data(o["data"]) if o.has_key?("data")
-            evt.limit(o["limit"]) if o.has_key?("limit")
-            evt.created_at(o["created_at"]) if o.has_key?("created_at")
-            evt.some_msg[:code] = o["code"] if o.has_key?("code")
-            evt.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
-            evt.some_msg[:msg]= o["msg"] if o.has_key?("msg")
-            evt.some_msg[:links] = o["links"] if o.has_key?("links")
-            evt
-        end
-
-        def self.from_hash(o)
-            evt = self.new(o)
-            evt.from_hash(o)
-            evt
-        end
-
-        def from_hash(o)
-            @account_id       = o[:account_id] if o.has_key?(:account_id)
-            @assembly_id      = o[:assembly_id] if o.has_key?(:assembly_id)
-            @event_type       = o[:event_type] if o.has_key?(:event_type)
-            @data             = o[:data] if o.has_key?(:data)
-            @limit            = o[:limit] if o.has_key?(:limit)
-            @created_at       = o[:created_at] if o.has_key?(:created_at)
-	          @id               = o[:id] if o.has_key?(:id)
-            self
-        end
-
-        def self.create(params)
-            evt = from_hash(params)
-            evt.create
-        end
-
-        # Create the node via the REST API
-        def create
-            megam_rest.post_events(to_hash)
-        end
-
-        def self.show(o)
-            evt = from_hash(o)
-            evt.megam_rest.get_eventsall(o[:limit], evt.from_hash(o).for_json)
-        end
-
-        def self.list(params)
-            asm = self.new(params)
-            asm.megam_rest.list_eventsall(params[:limit])
-        end
-
-        def self.index(params)
-            asm = self.new(params)
-            asm.megam_rest.index_eventsall
-        end
-
-        def to_s
-            Megam::Stuff.styled_hash(to_hash)
-        end
-
-    end
-end

data/lib/megam/core/eventsall_collection.rb

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