megam_api 0.11 → 0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b596f43aff236e1f432583c681e9207d351b9fac
-  data.tar.gz: 2244e795603cb0752b936777810e781edea5011c
+  metadata.gz: 1e565c5f554f3b29604419c0f51758171a97444a
+  data.tar.gz: 8c915ad1bb5d1ff93225e5816a2c27b97dbc9f00
 SHA512:
-  metadata.gz: cb6ed13dfb045eb9135737559d1b8e655aef6e2c7ef891ce16f778ccda137dd63d8178d05a4d8a7de4313195786862afbc59dd5ef4c125b369e9b3ae0fa388c3
-  data.tar.gz: 78ed5f63995b668796d052c9be4f0611aea7e1b26a9f513a07da1ef8141626ca497e64caa8aba43062234158bb2416039ce397cb8d392b769286568408a2d550
+  metadata.gz: 8fc940ba8296de0aacfbab4df73d2c5cd5c9e15e80f0c47f4de6cac11e8bd9638255fa765fd835b1471acebac84ea6698e9a03b07d141296dfef3a2cf4cea7fa
+  data.tar.gz: b22382100b343abc033e667ab8659f6a125ce6f3f8d4c6bd23ba637fe2edc4e3bd0171cb9c305ca595f6b7427ca53add134957bb2a7d22a564a4ac775d8e3de6

data/lib/megam/api.rb

@@ -29,6 +29,7 @@ require "megam/api/cloud_tools"
 require "megam/api/cloud_tool_settings"
 require "megam/api/sshkeys"
 require "megam/api/marketplaces"
+require "megam/api/marketplace_addons"
 require "megam/core/server_api"
 require "megam/core/config"
 require "megam/core/stuff"
@@ -69,6 +70,8 @@ require "megam/core/sshkey"
 require "megam/core/sshkey_collection"
 require "megam/core/marketplace"
 require "megam/core/marketplace_collection"
+require "megam/core/marketplace_addon"
+require "megam/core/marketplace_addon_collection"
 
 #we may nuke logs out of the api
 #require "megam/api/logs"
@@ -128,8 +131,8 @@ module Megam
         Megam::Log.debug("> #{pkey}: #{pvalue}")
       end
 
-      begin
-        response = connection.request(params, &block)
+      begin            
+        response = connection.request(params, &block)        
       rescue Excon::Errors::HTTPStatusError => error
         klass = case error.response.status
 

data/lib/megam/api/marketplace_addons.rb

@@ -0,0 +1,27 @@
+module Megam
+  class API
+
+#=begin
+    def get_addons(node_name)
+      @options = {:path => "/marketplaceaddons/#{node_name}",:body => ""}.merge(@options)
+
+      request(
+        :expects  => 200,
+        :method   => :get,
+        :body     => @options[:body]
+      )
+    end
+#=end
+    def post_addon(new_addon)
+      @options = {:path => '/marketplaceaddons/content',
+        :body => Megam::JSONCompat.to_json(new_addon)}.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 = "0.11"
+    VERSION = "0.12"
   end
 end

data/lib/megam/core/json_compat.rb

@@ -25,7 +25,7 @@ module Megam
     MEGAM_AUTH                    = "Megam::Auth".freeze
     MEGAM_ERROR                   = "Megam::Error".freeze
     MEGAM_ACCOUNT                 = "Megam::Account".freeze
-    MEGAM_NODE                    = "Megam::Node".freeze        
+    MEGAM_NODE                    = "Megam::Node".freeze
     MEGAM_NODECOLLECTION          = "Megam::NodeCollection".freeze
     MEGAM_APPDEFNS                = "Megam::AppDefns".freeze
     MEGAM_APPREQUEST              = "Megam::AppRequest".freeze
@@ -55,7 +55,8 @@ module Megam
     MEGAM_SSHKEYCOLLECTION        = "Megam::SshKeyCollection".freeze
     MEGAM_MARKETPLACE             = "Megam::MarketPlace".freeze
     MEGAM_MARKETPLACECOLLECTION   = "Megam::MarketPlaceCollection".freeze
-    
+    MEGAM_MARKETPLACEADDON             = "Megam::MarketPlaceAddons".freeze
+    MEGAM_MARKETPLACEADDONCOLLECTION   = "Megam::MarketPlaceAddonsCollection".freeze
     class <<self
       # Increase the max nesting for JSON, which defaults
       # to 19, and isn't enough for some (for example, a Node within a Node)
@@ -64,12 +65,12 @@ module Megam
         if opts.nil? || !opts.has_key?(:max_nesting)
           opts = opts.nil? ? Hash.new : opts.clone
           opts[:max_nesting] = JSON_MAX_NESTING
-        end
+        end       
         opts
       end
 
       # Just call the JSON gem's parse method with a modified :max_nesting field
-      def from_json(source, opts = {})
+      def from_json(source, opts = {})       
         obj = ::Yajl::Parser.parse(source)
         # JSON gem requires top level object to be a Hash or Array (otherwise
         # you get the "must contain two octets" error). Yajl doesn't impose the
@@ -114,7 +115,7 @@ module Megam
         json_hash
       end
 
-      def to_json(obj, opts = nil)
+      def to_json(obj, opts = nil)      
         obj.to_json(opts_add_max_nesting(opts))
       end
 
@@ -192,6 +193,10 @@ module Megam
           Megam::MarketPlace
         when MEGAM_MARKETPLACECOLLECTION
           Megam::MarketPlaceCollection
+        when MEGAM_MARKETPLACEADDON
+          Megam::MarketPlaceAddons
+        when MEGAM_MARKETPLACEADDONCOLLECTION
+          Megam::MarketPlaceAddonsCollection
         else
         raise JSON::ParserError, "Unsupported `json_class` type '#{json_class}'"
         end

data/lib/megam/core/marketplace_addon.rb

@@ -0,0 +1,195 @@
+# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module Megam
+  class MarketPlaceAddons< Megam::ServerAPI
+    
+    def initialize(email=nil, api_key=nil)
+      @id = nil
+      @node_id = nil
+      @node_name = nil
+      @marketplace_id = nil
+      @config = {}
+      @config_id = nil
+      @created_at = nil
+      @some_msg = {}
+      super(email,api_key)
+    end
+    
+    def market_place_addons
+      self
+    end
+    
+
+    def id(arg=nil)
+      if arg != nil
+        @id = arg
+      else
+      @id
+      end
+    end
+
+    def node_id(arg=nil)
+      if arg != nil
+        @node_id = arg
+      else
+      @node_id
+      end
+    end
+
+    def node_name(arg=nil)
+      if arg != nil
+        @node_name = arg
+      else
+      @node_name
+      end
+    end
+
+    def marketplace_id(arg=nil)
+      if arg != nil
+        @marketplace_id = arg
+      else
+      @marketplace_id
+      end
+    end
+
+    def config_id(arg=nil)
+      if arg != nil
+        @config_id = arg
+      else
+      @config_id
+      end
+    end
+
+    def config(arg=nil)
+      if arg != nil
+        @config = arg
+      else
+      @config
+      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["node_id"] = node_id
+      index_hash["node_name"] = node_name
+      index_hash["marketplace_id"] = marketplace_id
+      index_hash["config"] = config
+      index_hash["config_id"] = config_id
+      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,
+        "node_id" => node_id,
+        "node_name" => node_name,
+        "marketplace_id" => marketplace_id,
+        "config" => config,
+        "config_id" => config_id,
+        "created_at" => created_at
+      }     
+      result
+    end
+
+
+    def self.json_create(o)
+      addon = new
+      addon.id(o["id"]) if o.has_key?("id")
+      addon.node_id(o["node_id"]) if o.has_key?("node_id")
+      addon.node_name(o["node_name"]) if o.has_key?("node_name")
+      addon.marketplace_id(o["marketplace_id"]) if o.has_key?("marketplace_id")
+      addon.config(o["config"]) if o.has_key?("config")
+      addon.config_id(o["config_id"]) if o.has_key?("config_id")
+      addon.created_at(o["created_at"]) if o.has_key?("created_at")        
+
+      addon.some_msg[:code] = o["code"] if o.has_key?("code")
+      addon.some_msg[:msg_type] = o["msg_type"] if o.has_key?("msg_type")
+      addon.some_msg[:msg]= o["msg"] if o.has_key?("msg")
+      addon.some_msg[:links] = o["links"] if o.has_key?("links")
+
+      addon
+    end
+
+    def self.from_hash(o,tmp_email=nil, tmp_api_key=nil)
+      addon = self.new(tmp_email, tmp_api_key)
+      addon.from_hash(o)
+      addon
+    end
+
+    def from_hash(o)
+      @id        = o["id"] if o.has_key?("id")
+      @node_id        = o["node_id"] if o.has_key?("node_id")
+      @node_name = o["node_name"] if o.has_key?("node_name")
+      @marketplace_id   = o["marketplace_id"] if o.has_key?("marketplace_id")
+      @config   = o["config"] if o.has_key?("config")
+      @config_id  = o["config_id"] if o.has_key?("config_id")
+      @created_at        = o["created_at"] if o.has_key?("created_at")
+      self
+    end
+
+    def self.create(o,tmp_email=nil, tmp_api_key=nil)
+      acct = from_hash(o,tmp_email, tmp_api_key)
+      acct.create
+    end
+
+    # Create the addon via the REST API
+    def create
+      megam_rest.post_addon(to_hash)
+    end
+
+    # Load a account by email_p
+    def self.list(node_name,tmp_email=nil, tmp_api_key=nil)
+      addon = self.new(tmp_email, tmp_api_key)
+      addon.megam_rest.get_addons(node_name)
+      #self
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/lib/megam/core/marketplace_addon_collection.rb

@@ -0,0 +1,148 @@
+# Copyright:: Copyright (c) 2012, 2013 Megam Systems
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+module Megam
+  class MarketPlaceAddonsCollection
+    include Enumerable
+
+    
+    attr_reader :iterator
+    def initialize
+      @addons = Array.new
+      @addons_by_name = Hash.new
+      @insert_after_idx = nil
+    end
+
+    def all_addons
+      @addons
+    end
+
+    def [](index)
+      @addons[index]
+    end
+
+    def []=(index, arg)
+      is_megam_addon(arg)
+      @addons[index] = arg
+      @addons_by_name[arg.id] = index
+    end
+
+    def <<(*args)
+      args.flatten.each do |a|
+        is_megam_addon(a)
+        @addons << a
+        @addons_by_name[a.id] = @addons.length - 1
+      end
+      self
+    end
+
+    # 'push' is an alias method to <<
+    alias_method :push, :<<
+
+    def insert(addon)
+      is_megam_addon(addon)
+      if @insert_after_idx
+        # in the middle of executing a run, so any addons inserted now should
+        # be placed after the most recent addition done by the currently executing
+        # addons
+        @addons.insert(@insert_after_idx + 1, addon)
+        # update name -> location mappings and register new addons
+        @addons_by_name.each_key do |key|
+        @addons_by_name[key] += 1 if @addons_by_name[key] > @insert_after_idx
+        end
+        @addons_by_name[addon.id] = @insert_after_idx + 1
+        @insert_after_idx += 1
+      else
+      @addons << addon
+      @addons_by_name[addon.id] = @addons.length - 1 
+      end
+    end
+
+    def each
+      @addons.each do |addon|
+        yield addon
+      end
+    end
+
+    def each_index
+      @addons.each_index do |i|
+        yield i
+      end
+    end
+
+    def empty?
+      @addons.empty?
+    end
+
+    def lookup(addon)
+      lookup_by = nil
+      if addon.kind_of?(Megam::MarketPlaceAddons)
+      lookup_by = addon.id
+      elsif addon.kind_of?(String)
+      lookup_by = addon
+      else
+        raise ArgumentError, "Must pass a Megam::MarketPlaceAddons or String to lookup"
+      end
+      res = @addons_by_name[lookup_by]
+      unless res
+        raise ArgumentError, "Cannot find a appreq matching #{lookup_by} (did you define it first?)"
+      end
+      @addons[res]
+    end
+    
+     # Transform the ruby obj ->  to a Hash
+    def to_hash
+      index_hash = Hash.new
+      self.each do |addon|
+        index_hash[addon.id] = addon.to_s
+      end
+      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 self.json_create(o)
+      collection = self.new()
+      o["results"].each do |addons_list|
+       addons_array = addons_list.kind_of?(Array) ? addons_list : [ addons_list ]
+        addons_array.each do |addon|
+          collection.insert(addon)
+        end
+      end
+      collection
+    end
+
+    private
+
+    
+    
+    def is_megam_addon(arg)
+      unless arg.kind_of?(Megam::MarketPlaceAddons)
+        raise ArgumentError, "Members must be Megam::MarketPlaceAddons"
+      end
+      true
+    end
+
+    def to_s
+      Megam::Stuff.styled_hash(to_hash)
+    end
+
+  end
+end

data/test/test_marketplaceaddons.rb

@@ -0,0 +1,41 @@
+require File.expand_path("#{File.dirname(__FILE__)}/test_helper")
+
+class TestApps < MiniTest::Unit::TestCase
+#=begin
+def test_post_addon
+@com = {
+"disaster"=>{
+"locations"=>"locations",
+"fromhost"=>"appsample1.megam.co",
+"tohosts"=>"appsample2.megam.co;appsample3.megam.co"
+},
+"loadbalancing"=>{
+"haproxyhost"=>"",
+"loadbalancehost"=>""
+},
+"autoscaling"=>{
+"cputhreshold"=>"",
+"memorythreshold"=>"",
+"noofinstances"=>""
+},
+"monitoring"=>{
+"agent"=>"op5"
+}
+}
+
+tmp_hash = {
+"node_id" => "NOD450939631320432640",
+"node_name" => "appsample1.megam.co",
+"marketplace_id" => "APP",
+"config" => @com
+}
+response = megams.post_addon(tmp_hash)
+assert_equal(201, response.status)
+end
+#=end
+
+ # def test_get_nodes
+ #   response = megams.get_addons("appsample1.megam.co")
+  #  assert_equal(200, response.status)
+ # end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: megam_api
 version: !ruby/object:Gem::Version
-  version: '0.11'
+  version: '0.12'
 platform: ruby
 authors:
 - Kishorekumar Neelamegam, Thomas Alrin, Subash Sethurajan, Rajthilak
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon
@@ -138,6 +138,7 @@ files:
 - lib/megam/api/errors.rb
 - lib/megam/api/login.rb
 - lib/megam/api/logs.rb
+- lib/megam/api/marketplace_addons.rb
 - lib/megam/api/marketplaces.rb
 - lib/megam/api/nodes.rb
 - lib/megam/api/predef_clouds.rb
@@ -171,6 +172,8 @@ files:
 - lib/megam/core/json_compat.rb
 - lib/megam/core/log.rb
 - lib/megam/core/marketplace.rb
+- lib/megam/core/marketplace_addon.rb
+- lib/megam/core/marketplace_addon_collection.rb
 - lib/megam/core/marketplace_collection.rb
 - lib/megam/core/monologger.rb
 - lib/megam/core/node.rb
@@ -199,6 +202,7 @@ files:
 - test/test_helper.rb
 - test/test_login.rb
 - test/test_logs.rb
+- test/test_marketplaceaddons.rb
 - test/test_marketplaces.rb
 - test/test_nodes.rb
 - test/test_predefclouds.rb
@@ -225,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby Client for the Megam Cloud